From f51b688ff467fbb4c44d69b208682d3a13dc254c Mon Sep 17 00:00:00 2001 From: "David A. Velasco" Date: Fri, 8 Nov 2013 14:01:34 +0100 Subject: [PATCH] Removed requests for synchronization of account when account is changed or created --- .../android/authentication/AuthenticatorActivity.java | 15 --------------- .../android/ui/activity/AccountSelectActivity.java | 6 ------ .../owncloud/android/ui/activity/FileDisplayActivity.java | 2 +- 3 files changed, 1 insertion(+), 22 deletions(-) diff --git a/src/com/owncloud/android/authentication/AuthenticatorActivity.java b/src/com/owncloud/android/authentication/AuthenticatorActivity.java index 8f7fc2c2..faeffd53 100644 --- a/src/com/owncloud/android/authentication/AuthenticatorActivity.java +++ b/src/com/owncloud/android/authentication/AuthenticatorActivity.java @@ -1276,14 +1276,6 @@ implements OnRemoteOperationListener, OnSslValidatorListener, OnFocusChangeList setAccountAuthenticatorResult(intent.getExtras()); setResult(RESULT_OK, intent); - /// immediately request for the synchronization of the new account - Bundle bundle = new Bundle(); - bundle.putBoolean(ContentResolver.SYNC_EXTRAS_MANUAL, true); - ContentResolver.requestSync(mAccount, MainApp.getAuthTokenType(), bundle); - syncAccount(); -// Bundle bundle = new Bundle(); -// bundle.putBoolean(ContentResolver.SYNC_EXTRAS_MANUAL, true); -// ContentResolver.requestSync(mAccount, MainApp.getAuthTokenType(), bundle); return true; } } @@ -1653,13 +1645,6 @@ implements OnRemoteOperationListener, OnSslValidatorListener, OnFocusChangeList mAuthMessage.setVisibility(View.GONE); } - private void syncAccount(){ - /// immediately request for the synchronization of the new account - Bundle bundle = new Bundle(); - bundle.putBoolean(ContentResolver.SYNC_EXTRAS_MANUAL, true); - ContentResolver.requestSync(mAccount, MainApp.getAuthTokenType(), bundle); - } - @Override public boolean onTouchEvent(MotionEvent event) { if (MainApp.getAuthTokenTypeSamlSessionCookie().equals(mAuthTokenType) && diff --git a/src/com/owncloud/android/ui/activity/AccountSelectActivity.java b/src/com/owncloud/android/ui/activity/AccountSelectActivity.java index 80e38f79..716d6dfd 100644 --- a/src/com/owncloud/android/ui/activity/AccountSelectActivity.java +++ b/src/com/owncloud/android/ui/activity/AccountSelectActivity.java @@ -95,12 +95,6 @@ public class AccountSelectActivity extends SherlockListActivity implements (mPreviousAccount != null && !mPreviousAccount.equals(current))) { /// the account set as default changed since this activity was created - // trigger synchronization - ContentResolver.cancelSync(null, MainApp.getAuthTokenType()); - Bundle bundle = new Bundle(); - bundle.putBoolean(ContentResolver.SYNC_EXTRAS_MANUAL, true); - ContentResolver.requestSync(AccountUtils.getCurrentOwnCloudAccount(this), MainApp.getAuthTokenType(), bundle); - // restart the main activity Intent i = new Intent(this, FileDisplayActivity.class); i.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP); diff --git a/src/com/owncloud/android/ui/activity/FileDisplayActivity.java b/src/com/owncloud/android/ui/activity/FileDisplayActivity.java index 0654f1f4..d58de5eb 100644 --- a/src/com/owncloud/android/ui/activity/FileDisplayActivity.java +++ b/src/com/owncloud/android/ui/activity/FileDisplayActivity.java @@ -1238,7 +1238,7 @@ OCFileListFragment.ContainerActivity, FileDetailFragment.ContainerActivity, OnNa @Override public void onSavedCertificate() { - startSynchronization(); + startSyncFolderOperation(getCurrentDir()); } -- 2.11.0