projects
/
pub
/
Android
/
ownCloud.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Completing previous commit
[pub/Android/ownCloud.git]
/
src
/
eu
/
alefzero
/
owncloud
/
syncadapter
/
FileSyncService.java
diff --git
a/src/eu/alefzero/owncloud/syncadapter/FileSyncService.java
b/src/eu/alefzero/owncloud/syncadapter/FileSyncService.java
index
e4112d7
..
6c1ed0f
100644
(file)
--- a/
src/eu/alefzero/owncloud/syncadapter/FileSyncService.java
+++ b/
src/eu/alefzero/owncloud/syncadapter/FileSyncService.java
@@
-31,20
+31,13
@@
public class FileSyncService extends Service {
public static final String SYNC_MESSAGE = "eu.alefzero.owncloud.files.ACCOUNT_SYNC";
\r
public static final String IN_PROGRESS = "sync_in_progress";
\r
public static final String ACCOUNT_NAME = "account_name";
\r
public static final String SYNC_MESSAGE = "eu.alefzero.owncloud.files.ACCOUNT_SYNC";
\r
public static final String IN_PROGRESS = "sync_in_progress";
\r
public static final String ACCOUNT_NAME = "account_name";
\r
-
\r
- private static final Object syncAdapterLock = new Object();
\r
- private static AbstractOwnCloudSyncAdapter concretSyncAdapter = null;
\r
+ public static final String SYNC_FOLDER = "eu.alefzero.owncloud.files.SYNC_FOLDER";
\r
\r
/*
\r
* {@inheritDoc}
\r
*/
\r
@Override
\r
public void onCreate() {
\r
\r
/*
\r
* {@inheritDoc}
\r
*/
\r
@Override
\r
public void onCreate() {
\r
- synchronized (syncAdapterLock) {
\r
- if (concretSyncAdapter == null)
\r
- concretSyncAdapter = new FileSyncAdapter(
\r
- getApplicationContext(), true);
\r
- }
\r
}
\r
\r
/*
\r
}
\r
\r
/*
\r
@@
-52,6
+45,6
@@
public class FileSyncService extends Service {
*/
\r
@Override
\r
public IBinder onBind(Intent intent) {
\r
*/
\r
@Override
\r
public IBinder onBind(Intent intent) {
\r
-
return concretSyncAdapter
.getSyncAdapterBinder();
\r
+
return new FileSyncAdapter(getApplicationContext(), true)
.getSyncAdapterBinder();
\r
}
\r
}
\r
}
\r
}
\r