X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/673c884752392d27023b0d69385d3d884092070c..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 64effc43..b1ff8453 100644
--- a/src/com/owncloud/android/ui/activity/AccountSelectActivity.java
+++ b/src/com/owncloud/android/ui/activity/AccountSelectActivity.java
@@ -47,13 +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<Boolean> {
 
@@ -94,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, AccountAuthenticator.AUTHORITY);
-                Bundle bundle = new Bundle();
-                bundle.putBoolean(ContentResolver.SYNC_EXTRAS_MANUAL, true);
-                ContentResolver.requestSync(AccountUtils.getCurrentOwnCloudAccount(this), AccountAuthenticator.AUTHORITY, bundle);
-                
                 // restart the main activity
                 Intent i = new Intent(this, FileDisplayActivity.class);
                 i.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
@@ -139,10 +134,10 @@ public class AccountSelectActivity extends SherlockListActivity implements
             /*Intent intent = new Intent(
                     android.provider.Settings.ACTION_ADD_ACCOUNT);
             intent.putExtra("authorities",
-                    new String[] { AccountAuthenticator.AUTHORITY });
+                    new String[] { MainApp.getAuthTokenType() });
             startActivity(intent);*/
             AccountManager am = AccountManager.get(getApplicationContext());
-            am.addAccount(AccountAuthenticator.ACCOUNT_TYPE, 
+            am.addAccount(MainApp.getAccountType(), 
                             null,
                             null, 
                             null, 
@@ -176,7 +171,7 @@ public class AccountSelectActivity extends SherlockListActivity implements
         
         String accountName = map.get("NAME");
         AccountManager am = (AccountManager) getSystemService(ACCOUNT_SERVICE);
-        Account accounts[] = am.getAccountsByType(AccountAuthenticator.ACCOUNT_TYPE);
+        Account accounts[] = am.getAccountsByType(MainApp.getAccountType());
         for (Account a : accounts) {
             if (a.name.equals(accountName)) {
                 if (item.getItemId() == R.id.change_password) {
@@ -194,30 +189,13 @@ public class AccountSelectActivity extends SherlockListActivity implements
         return true;
     }
 
-    @Override
-    public void onContentChanged() {
-        // TODO Auto-generated method stub
-        super.onContentChanged();
-        AccountManager am = (AccountManager) getSystemService(ACCOUNT_SERVICE);
-        if (am.getAccountsByType(AccountAuthenticator.ACCOUNT_TYPE).length == 0) {
-            // Show create account screen
-            am.addAccount(AccountAuthenticator.ACCOUNT_TYPE, 
-                    null,
-                    null, 
-                    null, 
-                    this, 
-                    null,                        
-                    null);
-        }
-    }
-
     private void populateAccountList() {
         AccountManager am = (AccountManager) getSystemService(ACCOUNT_SERVICE);
         Account accounts[] = am
-                .getAccountsByType(AccountAuthenticator.ACCOUNT_TYPE);
-        if (am.getAccountsByType(AccountAuthenticator.ACCOUNT_TYPE).length == 0) {
+                .getAccountsByType(MainApp.getAccountType());
+        if (am.getAccountsByType(MainApp.getAccountType()).length == 0) {
             // Show create account screen if there isn't any account
-            am.addAccount(AccountAuthenticator.ACCOUNT_TYPE, 
+            am.addAccount(MainApp.getAccountType(), 
                     null,
                     null, 
                     null, 
@@ -233,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);
             }
 
@@ -251,7 +229,7 @@ public class AccountSelectActivity extends SherlockListActivity implements
             String accountName = "";
             if (a == null) {
                 Account[] accounts = AccountManager.get(this)
-                        .getAccountsByType(AccountAuthenticator.ACCOUNT_TYPE);
+                        .getAccountsByType(MainApp.getAccountType());
                 if (accounts.length != 0)
                     accountName = accounts[0].name;
                 AccountUtils.setCurrentOwnCloudAccount(this, accountName);