Merge branch 'setup_multiaccount' into setup_app_name

Conflicts:
	src/com/owncloud/android/ui/activity/AccountSelectActivity.java

diff --combined src/com/owncloud/android/ui/activity/AccountSelectActivity.java
index f5d06dc,64effc4..1b73c86
--- 1/src/com/owncloud/android/ui/activity/AccountSelectActivity.java
--- 2/src/com/owncloud/android/ui/activity/AccountSelectActivity.java
+++ b/src/com/owncloud/android/ui/activity/AccountSelectActivity.java
@@@ -51,7 -51,6 +51,7 @@@ import com.owncloud.android.authenticat
  import com.owncloud.android.authentication.AuthenticatorActivity;
  import com.owncloud.android.authentication.AccountUtils;
  import com.owncloud.android.Log_OC;
 +import com.owncloud.android.MainApp;
  
  import com.owncloud.android.R;
  
@@@ -96,10 -95,10 +96,10 @@@ public class AccountSelectActivity exte
                  /// the account set as default changed since this activity was created 
              
                  // trigger synchronization
 -                ContentResolver.cancelSync(null, AccountAuthenticator.AUTHORITY);
 +                ContentResolver.cancelSync(null, MainApp.getAuthTokenType());
                  Bundle bundle = new Bundle();
                  bundle.putBoolean(ContentResolver.SYNC_EXTRAS_MANUAL, true);
 -                ContentResolver.requestSync(AccountUtils.getCurrentOwnCloudAccount(this), AccountAuthenticator.AUTHORITY, bundle);
 +                ContentResolver.requestSync(AccountUtils.getCurrentOwnCloudAccount(this), MainApp.getAuthTokenType(), bundle);
                  
                  // restart the main activity
                  Intent i = new Intent(this, FileDisplayActivity.class);
@@@ -140,10 -139,10 +140,10 @@@
              /*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, 
@@@ -177,7 -176,7 +177,7 @@@
          
          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) {
@@@ -195,26 -194,54 +195,37 @@@
          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());
-         LinkedList<HashMap<String, String>> ll = new LinkedList<HashMap<String, String>>();
-         for (Account a : accounts) {
-             HashMap<String, String> h = new HashMap<String, String>();
-             h.put("NAME", a.name);
-             h.put("VER",
-                     "ownCloud version: "
-                             + am.getUserData(a,
-                                     AccountAuthenticator.KEY_OC_VERSION));
-             ll.add(h);
++        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, 
+                     this, 
+                     null,                        
+                     null);
          }
+         else {
+             LinkedList<HashMap<String, String>> ll = new LinkedList<HashMap<String, String>>();
+             for (Account a : accounts) {
+                 HashMap<String, String> h = new HashMap<String, String>();
+                 h.put("NAME", a.name);
+                 h.put("VER",
+                         "ownCloud version: "
+                                 + am.getUserData(a,
+                                         AccountAuthenticator.KEY_OC_VERSION));
+                 ll.add(h);
+             }
  
-         setListAdapter(new AccountCheckedSimpleAdepter(this, ll,
-                 android.R.layout.simple_list_item_single_choice,
-                 new String[] { "NAME" }, new int[] { android.R.id.text1 }));
-         registerForContextMenu(getListView());
-         
+             setListAdapter(new AccountCheckedSimpleAdepter(this, ll,
+                     android.R.layout.simple_list_item_single_choice,
+                     new String[] { "NAME" }, new int[] { android.R.id.text1 }));
+             registerForContextMenu(getListView());
+         }
      }
  
      @Override
@@@ -224,7 -251,7 +235,7 @@@
              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);