Mirrors/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2026-04-19 07:23:47 +02:00
Code Issues Packages Projects Releases Wiki Activity

S/MIME: split sign/encrypt key

Browse Source
This commit is contained in:
M66B
2025-05-29 08:41:38 +02:00
parent c0776edc9f
commit 932d0efc3e
4 changed files with 70 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
app/src/main/java/eu/faircode/email/FragmentCompose.java
View File

@@ -3213,6 +3213,7 @@ public class FragmentCompose extends FragmentBase {
@Override
protected EntityIdentity onExecute(Context context, Bundle args) {
long id = args.getLong("id");
int type = args.getInt("type");
DB db = DB.getInstance(context);
EntityMessage draft = db.message().getMessage(id);
@@ -3220,10 +3221,14 @@ public class FragmentCompose extends FragmentBase {
return null;
EntityIdentity identity = db.identity().getIdentity(draft.identity);
if (identity != null && identity.sign_key_alias != null)
if (identity != null)
try {
PrivateKey key = KeyChain.getPrivateKey(context, identity.sign_key_alias);
args.putBoolean("available", key != null);
String alias = identity.getAlias(type);
if (alias != null) {
args.putString("alias", alias);
PrivateKey key = KeyChain.getPrivateKey(context, alias);
args.putBoolean("available", key != null);
}
} catch (Throwable ex) {
Log.w(ex);
}
@@ -3238,13 +3243,13 @@ public class FragmentCompose extends FragmentBase {
boolean available = args.getBoolean("available");
if (available) {
args.putString("alias", identity.sign_key_alias);
onSmime(args, action, extras);
return;
}
if (interactive)
Helper.selectKeyAlias(getActivity(), getViewLifecycleOwner(), identity.sign_key_alias, new Helper.IKeyAlias() {
if (interactive) {
String alias = args.getString("alias");
Helper.selectKeyAlias(getActivity(), getViewLifecycleOwner(), alias, new Helper.IKeyAlias() {
@Override
public void onSelected(String alias) {
args.putString("alias", alias);
@@ -3269,6 +3274,7 @@ public class FragmentCompose extends FragmentBase {
snackbar.show();
}
});
}
}
@Override
@@ -4463,7 +4469,8 @@ public class FragmentCompose extends FragmentBase {
}
// Store selected alias
db.identity().setIdentitySignKeyAlias(identity.id, alias);
identity.setAlias(alias, type);
db.identity().setIdentitySignKeyAlias(identity.id, identity.sign_key_alias);
// Build content
File sinput = new File(tmp, draft.id + ".smime_sign");