Testing synchronization cancelation

diff --git a/src/eu/alefzero/owncloud/syncadapter/FileSyncAdapter.java b/src/eu/alefzero/owncloud/syncadapter/FileSyncAdapter.java
index ef7a3d5..fbee3b0 100644 (file)
--- a/src/eu/alefzero/owncloud/syncadapter/FileSyncAdapter.java
+++ b/src/eu/alefzero/owncloud/syncadapter/FileSyncAdapter.java
@@ -265,5 +265,11 @@ public class FileSyncAdapter extends AbstractOwnCloudSyncAdapter {
         }\r
         getContext().sendStickyBroadcast(i);\r
     }\r
         }\r
         getContext().sendStickyBroadcast(i);\r
     }\r

+    \r
+    @Override\r
+    public void onSyncCanceled() {\r
+        Log.d(TAG, "sync is being cancelled !! ************************************************");\r
+        super.onSyncCanceled();\r
+    }\r

 \r
 }\r
 \r
 }\r

diff --git a/src/eu/alefzero/owncloud/ui/activity/AccountSelectActivity.java b/src/eu/alefzero/owncloud/ui/activity/AccountSelectActivity.java
index 5281b9d..8600a47 100644 (file)
--- a/src/eu/alefzero/owncloud/ui/activity/AccountSelectActivity.java
+++ b/src/eu/alefzero/owncloud/ui/activity/AccountSelectActivity.java
@@ -78,6 +78,7 @@ public class AccountSelectActivity extends SherlockListActivity implements
         AccountUtils.setCurrentOwnCloudAccount(this, accountName);
 
         // trigger synchronization when current account is changed
         AccountUtils.setCurrentOwnCloudAccount(this, accountName);
 
         // trigger synchronization when current account is changed

+        ContentResolver.cancelSync(null, "org.owncloud");

         Bundle bundle = new Bundle();
         bundle.putBoolean(ContentResolver.SYNC_EXTRAS_MANUAL, true);
         ContentResolver.requestSync(AccountUtils.getCurrentOwnCloudAccount(this), "org.owncloud", bundle);
         Bundle bundle = new Bundle();
         bundle.putBoolean(ContentResolver.SYNC_EXTRAS_MANUAL, true);
         ContentResolver.requestSync(AccountUtils.getCurrentOwnCloudAccount(this), "org.owncloud", bundle);