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

Don't crash when MessageCompose is started with no account configured

Browse source
This commit is contained in:
M Madison Phillips 2018-08-14 20:55:00 -05:00 committed by cketti
parent 262e0840ba
commit 33e74567c5
1 changed files with 15 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
app/ui/src/main/java/com/fsck/k9/activity/compose/MessageActions.java
View file

@ -7,22 +7,29 @@ import android.os.Parcelable;
import com.fsck.k9.Account;
import com.fsck.k9.Preferences;
import com.fsck.k9.activity.MessageCompose;
import com.fsck.k9.activity.setup.AccountSetupBasics;
import com.fsck.k9.controller.MessageReference;
public class MessageActions {
/**
* Compose a new message using the given account. If account is null the default account
* will be used.
* will be used. If there is no default account set, user will be sent to AccountSetupBasics
* activity.
*/
public static void actionCompose(Context context, Account account) {
String accountUuid = (account == null) ?
Preferences.getPreferences(context).getDefaultAccount().getUuid() :
account.getUuid();
Account defaultAccount = Preferences.getPreferences(context).getDefaultAccount();
if (account == null && defaultAccount == null) {
AccountSetupBasics.actionNewAccount(context);
} else {
String accountUuid = (account == null) ?
defaultAccount.getUuid() :
account.getUuid();
Intent i = new Intent(context, MessageCompose.class);
i.putExtra(MessageCompose.EXTRA_ACCOUNT, accountUuid);
i.setAction(MessageCompose.ACTION_COMPOSE);
context.startActivity(i);
Intent i = new Intent(context, MessageCompose.class);
i.putExtra(MessageCompose.EXTRA_ACCOUNT, accountUuid);
i.setAction(MessageCompose.ACTION_COMPOSE);
context.startActivity(i);
}
}
/**