From: David A. Velasco <dvelasco@solidgear.es>
Date: Mon, 16 Jul 2012 11:04:38 +0000 (+0200)
Subject: Merge branch 'testing_cancel_sync'
X-Git-Tag: oc-android-1.4.3~272
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/424164206f616fab373db9261b0213ba7d1d7ce8?hp=4f2f33c9bcfce7fb96c149f8e50188372a3ec61b

Merge branch 'testing_cancel_sync'
---

diff --git a/src/eu/alefzero/owncloud/syncadapter/FileSyncAdapter.java b/src/eu/alefzero/owncloud/syncadapter/FileSyncAdapter.java
index ef7a3d5b..fbee3b00 100644
--- 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 {
         }
         getContext().sendStickyBroadcast(i);
     }
+    
+    @Override
+    public void onSyncCanceled() {
+        Log.d(TAG, "sync is being cancelled !! ************************************************");
+        super.onSyncCanceled();
+    }
 
 }
diff --git a/src/eu/alefzero/owncloud/ui/activity/AccountSelectActivity.java b/src/eu/alefzero/owncloud/ui/activity/AccountSelectActivity.java
index 5281b9dd..8600a473 100644
--- 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
+        ContentResolver.cancelSync(null, "org.owncloud");
         Bundle bundle = new Bundle();
         bundle.putBoolean(ContentResolver.SYNC_EXTRAS_MANUAL, true);
         ContentResolver.requestSync(AccountUtils.getCurrentOwnCloudAccount(this), "org.owncloud", bundle);