From: masensio Date: Tue, 22 Oct 2013 08:17:09 +0000 (+0200) Subject: OC-1770: When deleting the account, log in screen is not shown X-Git-Tag: oc-android-1.5.5~159^2~5^2 X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/673c884752392d27023b0d69385d3d884092070c?ds=sidebyside OC-1770: When deleting the account, log in screen is not shown --- diff --git a/src/com/owncloud/android/ui/activity/AccountSelectActivity.java b/src/com/owncloud/android/ui/activity/AccountSelectActivity.java index 4e81bb18..64effc43 100644 --- a/src/com/owncloud/android/ui/activity/AccountSelectActivity.java +++ b/src/com/owncloud/android/ui/activity/AccountSelectActivity.java @@ -194,26 +194,54 @@ 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); - LinkedList> ll = new LinkedList>(); - for (Account a : accounts) { - HashMap h = new HashMap(); - h.put("NAME", a.name); - h.put("VER", - "ownCloud version: " - + am.getUserData(a, - AccountAuthenticator.KEY_OC_VERSION)); - ll.add(h); + if (am.getAccountsByType(AccountAuthenticator.ACCOUNT_TYPE).length == 0) { + // Show create account screen if there isn't any account + am.addAccount(AccountAuthenticator.ACCOUNT_TYPE, + null, + null, + null, + this, + null, + null); } + else { + LinkedList> ll = new LinkedList>(); + for (Account a : accounts) { + HashMap h = new HashMap(); + 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