Update library reference

[pub/Android/ownCloud.git] / 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 64effc4..27ce4d9 100644 (file)
--- a/src/com/owncloud/android/ui/activity/AccountSelectActivity.java
+++ b/src/com/owncloud/android/ui/activity/AccountSelectActivity.java
@@ -27,7 +27,6 @@ import android.accounts.Account;
 import android.accounts.AccountManager;
 import android.accounts.AccountManagerCallback;
 import android.accounts.AccountManagerFuture;
 import android.accounts.AccountManager;
 import android.accounts.AccountManagerCallback;
 import android.accounts.AccountManagerFuture;

-import android.content.ContentResolver;

 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;


@@ -47,13 +46,15 @@ import com.actionbarsherlock.app.SherlockListActivity;
 import com.actionbarsherlock.view.Menu;
 import com.actionbarsherlock.view.MenuInflater;
 import com.actionbarsherlock.view.MenuItem;
 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.authentication.AuthenticatorActivity;
 import com.owncloud.android.authentication.AccountUtils;

-import com.owncloud.android.Log_OC;
-
+import com.owncloud.android.lib.common.accounts.AccountUtils.Constants;
+import com.owncloud.android.utils.DisplayUtils;
+import com.owncloud.android.utils.Log_OC;
+import com.owncloud.android.MainApp;

 import com.owncloud.android.R;
 
 import com.owncloud.android.R;
 

+

 public class AccountSelectActivity extends SherlockListActivity implements
         AccountManagerCallback<Boolean> {
 
 public class AccountSelectActivity extends SherlockListActivity implements
         AccountManagerCallback<Boolean> {
 


@@ -74,9 +75,10 @@ public class AccountSelectActivity extends SherlockListActivity implements
             mPreviousAccount = AccountUtils.getCurrentOwnCloudAccount(this);
         }
         
             mPreviousAccount = AccountUtils.getCurrentOwnCloudAccount(this);
         }
         

-        ActionBar action_bar = getSupportActionBar();
-        action_bar.setDisplayShowTitleEnabled(true);
-        action_bar.setDisplayHomeAsUpEnabled(false);
+        ActionBar actionBar = getSupportActionBar();
+        actionBar.setIcon(DisplayUtils.getSeasonalIconId());
+        actionBar.setDisplayShowTitleEnabled(true);
+        actionBar.setDisplayHomeAsUpEnabled(false);

     }
 
     @Override
     }
 
     @Override


@@ -87,25 +89,19 @@ public class AccountSelectActivity extends SherlockListActivity implements
     
     @Override
     protected void onPause() {
     
     @Override
     protected void onPause() {

-        super.onPause();

         if (this.isFinishing()) {
             Account current = AccountUtils.getCurrentOwnCloudAccount(this);
             if ((mPreviousAccount == null && current != null) || 
                 (mPreviousAccount != null && !mPreviousAccount.equals(current))) {
                 /// the account set as default changed since this activity was created 
             
         if (this.isFinishing()) {
             Account current = AccountUtils.getCurrentOwnCloudAccount(this);
             if ((mPreviousAccount == null && current != null) || 
                 (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);
                 startActivity(i);
             }
         }
                 // restart the main activity
                 Intent i = new Intent(this, FileDisplayActivity.class);
                 i.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
                 startActivity(i);
             }
         }

+        super.onPause();

     }
 
     @Override
     }
 
     @Override


@@ -139,10 +135,10 @@ public class AccountSelectActivity extends SherlockListActivity implements
             /*Intent intent = new Intent(
                     android.provider.Settings.ACTION_ADD_ACCOUNT);
             intent.putExtra("authorities",
             /*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());
             startActivity(intent);*/
             AccountManager am = AccountManager.get(getApplicationContext());

-            am.addAccount(AccountAuthenticator.ACCOUNT_TYPE, 
+            am.addAccount(MainApp.getAccountType(), 

                             null,
                             null, 
                             null, 
                             null,
                             null, 
                             null, 


@@ -176,7 +172,7 @@ public class AccountSelectActivity extends SherlockListActivity implements
         
         String accountName = map.get("NAME");
         AccountManager am = (AccountManager) getSystemService(ACCOUNT_SERVICE);
         
         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) {
         for (Account a : accounts) {
             if (a.name.equals(accountName)) {
                 if (item.getItemId() == R.id.change_password) {


@@ -194,30 +190,13 @@ public class AccountSelectActivity extends SherlockListActivity implements
         return true;
     }
 
         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
     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
             // Show create account screen if there isn't any account

-            am.addAccount(AccountAuthenticator.ACCOUNT_TYPE, 
+            am.addAccount(MainApp.getAccountType(), 

                     null,
                     null, 
                     null, 
                     null,
                     null, 
                     null, 


@@ -233,7 +212,7 @@ public class AccountSelectActivity extends SherlockListActivity implements
                 h.put("VER",
                         "ownCloud version: "
                                 + am.getUserData(a,
                 h.put("VER",
                         "ownCloud version: "
                                 + am.getUserData(a,

-                                        AccountAuthenticator.KEY_OC_VERSION));
+                                        Constants.KEY_OC_VERSION));

                 ll.add(h);
             }
 
                 ll.add(h);
             }
 


@@ -251,7 +230,7 @@ public class AccountSelectActivity extends SherlockListActivity implements
             String accountName = "";
             if (a == null) {
                 Account[] accounts = AccountManager.get(this)
             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);
                 if (accounts.length != 0)
                     accountName = accounts[0].name;
                 AccountUtils.setCurrentOwnCloudAccount(this, accountName);