X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/017f9429c8820ae4c9cc3bf96abe21e97a5f2864..d38a69abc1ba78df70fee65fc2434fc80b6be93b:/src/com/owncloud/android/ui/activity/AccountSelectActivity.java diff --git a/src/com/owncloud/android/ui/activity/AccountSelectActivity.java b/src/com/owncloud/android/ui/activity/AccountSelectActivity.java index 1b73c86e..b1ff8453 100644 --- a/src/com/owncloud/android/ui/activity/AccountSelectActivity.java +++ b/src/com/owncloud/android/ui/activity/AccountSelectActivity.java @@ -47,14 +47,14 @@ import com.actionbarsherlock.app.SherlockListActivity; import com.actionbarsherlock.view.Menu; import com.actionbarsherlock.view.MenuInflater; import com.actionbarsherlock.view.MenuItem; -import com.owncloud.android.authentication.AccountAuthenticator; import com.owncloud.android.authentication.AuthenticatorActivity; import com.owncloud.android.authentication.AccountUtils; -import com.owncloud.android.Log_OC; +import com.owncloud.android.oc_framework.accounts.OwnCloudAccount; +import com.owncloud.android.utils.Log_OC; import com.owncloud.android.MainApp; - import com.owncloud.android.R; + public class AccountSelectActivity extends SherlockListActivity implements AccountManagerCallback { @@ -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); @@ -217,7 +211,7 @@ public class AccountSelectActivity extends SherlockListActivity implements h.put("VER", "ownCloud version: " + am.getUserData(a, - AccountAuthenticator.KEY_OC_VERSION)); + OwnCloudAccount.Constants.KEY_OC_VERSION)); ll.add(h); }