X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/af7331d31c0ff279be7921e7ae06982fa3b3bf3c..9fcc118b8a630b2e241bece04a9c8df5e7f08976:/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 1a1cd51b..295f9a4a 100644 --- a/src/com/owncloud/android/ui/activity/AccountSelectActivity.java +++ b/src/com/owncloud/android/ui/activity/AccountSelectActivity.java @@ -50,6 +50,7 @@ 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.ui.activity.FileActivity.AccountCreationCallback; import com.owncloud.android.Log_OC; import com.owncloud.android.R; @@ -110,8 +111,11 @@ public class AccountSelectActivity extends SherlockListActivity implements @Override public boolean onCreateOptionsMenu(Menu menu) { - MenuInflater inflater = getSherlock().getMenuInflater(); - inflater.inflate(R.menu.account_picker, menu); + // Show Create Account if Multiaccount is enabled + if (getResources().getBoolean(R.bool.multiaccount_support)) { + MenuInflater inflater = getSherlock().getMenuInflater(); + inflater.inflate(R.menu.account_picker, menu); + } return true; } @@ -133,11 +137,19 @@ public class AccountSelectActivity extends SherlockListActivity implements @Override public boolean onMenuItemSelected(int featureId, MenuItem item) { if (item.getItemId() == R.id.createAccount) { - Intent intent = new Intent( + /*Intent intent = new Intent( android.provider.Settings.ACTION_ADD_ACCOUNT); intent.putExtra("authorities", new String[] { AccountAuthenticator.AUTHORITY }); - startActivity(intent); + startActivity(intent);*/ + AccountManager am = AccountManager.get(getApplicationContext()); + am.addAccount(AccountAuthenticator.ACCOUNT_TYPE, + null, + null, + null, + this, + null, + null); return true; } return false; @@ -202,6 +214,7 @@ public class AccountSelectActivity extends SherlockListActivity implements android.R.layout.simple_list_item_single_choice, new String[] { "NAME" }, new int[] { android.R.id.text1 })); registerForContextMenu(getListView()); + } @Override