wbrawner/thunderbird-android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Never start 'Accounts' from 'FolderList'

Browse source
This commit is contained in:
cketti 2019-11-03 17:53:41 +01:00
parent 93fe0b0b54
commit b482e9a0ba
1 changed files with 2 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
app/ui/src/main/java/com/fsck/k9/activity/FolderList.java
View file

@ -287,8 +287,7 @@ public class FolderList extends K9ListActivity {
super.onResume();
if (!account.isAvailable(this)) {
Timber.i("account unavaliabale, not showing folder-list but account-list");
Accounts.listAccounts(this);
Timber.i("Account is unavailable right now: " + account);
finish();
return;
}
@ -311,10 +310,6 @@ public class FolderList extends K9ListActivity {
public boolean onKeyDown(int keyCode, KeyEvent event) {
//Shortcuts that work no matter what is selected
switch (keyCode) {
case KeyEvent.KEYCODE_Q: {
onAccounts();
return true;
}
case KeyEvent.KEYCODE_H: {
Toast toast = Toast.makeText(this, R.string.folder_list_help_key, Toast.LENGTH_LONG);
toast.show();
@ -357,15 +352,10 @@ public class FolderList extends K9ListActivity {
MessagingController.getInstance(getApplication()).listFolders(account, forceRemote, adapter.activityListener);
}
private void onAccounts() {
Accounts.listAccounts(this);
finish();
}
@Override public boolean onOptionsItemSelected(MenuItem item) {
int id = item.getItemId();
if (id == android.R.id.home) {
onAccounts();
onBackPressed();
return true;
} else if (id == R.id.list_folders) {
onRefresh(REFRESH_REMOTE);