mirror/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2024-12-25 17:27:00 +00:00
Code Issues Releases Wiki Activity

Added fail-safe

Browse source
This commit is contained in:
M66B 2020-04-03 10:45:51 +02:00
parent d8bb432037
commit ca77d6c6c6
1 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
app/src/main/java/eu/faircode/email/FragmentCompose.java
View file

@ -1550,8 +1550,12 @@ public class FragmentCompose extends FragmentBase {
EntityIdentity identity = db.identity().getIdentity(draft.identity); EntityIdentity identity = db.identity().getIdentity(draft.identity);
if (identity != null && identity.sign_key_alias != null) if (identity != null && identity.sign_key_alias != null)
args.putBoolean("selected", try {
KeyChain.getPrivateKey(context, identity.sign_key_alias) != null); PrivateKey key = KeyChain.getPrivateKey(context, identity.sign_key_alias);
args.putBoolean("available", key != null);
} catch (Throwable ex) {
Log.w(ex);
}
return identity; return identity;
} }
@ -1561,7 +1565,8 @@ public class FragmentCompose extends FragmentBase {
if (identity == null) if (identity == null)
return; return;
if (args.getBoolean("selected")) { boolean available = args.getBoolean("available");
if (available) {
args.putString("alias", identity.sign_key_alias); args.putString("alias", identity.sign_key_alias);
onSmime(args, action); onSmime(args, action);
return; return;