mirror of
https://github.com/moparisthebest/k-9
synced 2024-08-13 17:03:48 -04:00
When we load up the "Accounts" activity as K-9 starts up, jump straight
to either the FolderList or the MessageList rather than always going through the FolderList
This commit is contained in:
parent
5d34ef2f19
commit
aa4f3535eb
@ -255,7 +255,7 @@ public class Accounts extends K9ListActivity implements OnItemClickListener, OnC
|
|||||||
boolean startup = (boolean)intent.getBooleanExtra(EXTRA_STARTUP, false);
|
boolean startup = (boolean)intent.getBooleanExtra(EXTRA_STARTUP, false);
|
||||||
if (startup && accounts.length == 1)
|
if (startup && accounts.length == 1)
|
||||||
{
|
{
|
||||||
FolderList.actionHandleAccount(this, accounts[0], accounts[0].getAutoExpandFolderName());
|
onOpenAccount(accounts[0], true);
|
||||||
finish();
|
finish();
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
@ -377,9 +377,16 @@ public class Accounts extends K9ListActivity implements OnItemClickListener, OnC
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private void onOpenAccount(Account account)
|
private void onOpenAccount(Account account, boolean startup)
|
||||||
{
|
{
|
||||||
FolderList.actionHandleAccount(this, account, true);
|
if (account.getAutoExpandFolderName() == null)
|
||||||
|
{
|
||||||
|
FolderList.actionHandleAccount(this, account, startup);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
MessageList.actionHandleFolder(this, account, account.getAutoExpandFolderName(), startup);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public void onClick(View view)
|
public void onClick(View view)
|
||||||
@ -471,7 +478,7 @@ public class Accounts extends K9ListActivity implements OnItemClickListener, OnC
|
|||||||
onEditAccount(account);
|
onEditAccount(account);
|
||||||
break;
|
break;
|
||||||
case R.id.open:
|
case R.id.open:
|
||||||
onOpenAccount(account);
|
onOpenAccount(account, false);
|
||||||
break;
|
break;
|
||||||
case R.id.check_mail:
|
case R.id.check_mail:
|
||||||
onCheckMail(account);
|
onCheckMail(account);
|
||||||
@ -508,7 +515,7 @@ public class Accounts extends K9ListActivity implements OnItemClickListener, OnC
|
|||||||
public void onItemClick(AdapterView parent, View view, int position, long id)
|
public void onItemClick(AdapterView parent, View view, int position, long id)
|
||||||
{
|
{
|
||||||
Account account = (Account)parent.getItemAtPosition(position);
|
Account account = (Account)parent.getItemAtPosition(position);
|
||||||
onOpenAccount(account);
|
onOpenAccount(account, false);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
Loading…
Reference in New Issue
Block a user