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

Revert "Added S/MIME encrypt/decrypt key aliases"

Browse Source 
This reverts commit e1adfaee36.
This commit is contained in:
M66B
2025-05-27 21:02:20 +02:00
parent e1adfaee36
commit 4b19fe54f7
4 changed files with 12 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3222,12 +3222,8 @@ public class FragmentCompose extends FragmentBase {
EntityIdentity identity = db.identity().getIdentity(draft.identity);
if (identity != null && identity.sign_key_alias != null)
try {
Pair<String, String> aliases = identity.getAliases();
if (aliases != null && aliases.first != null) {
args.putString("alias", aliases.first);
PrivateKey key = KeyChain.getPrivateKey(context, aliases.first);
args.putBoolean("available", key != null);
}
PrivateKey key = KeyChain.getPrivateKey(context, identity.sign_key_alias);
args.putBoolean("available", key != null);
} catch (Throwable ex) {
Log.w(ex);
}
@@ -3242,13 +3238,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) {
String alias = args.getString("alias");
Helper.selectKeyAlias(getActivity(), getViewLifecycleOwner(), alias, new Helper.IKeyAlias() {
if (interactive)
Helper.selectKeyAlias(getActivity(), getViewLifecycleOwner(), identity.sign_key_alias, new Helper.IKeyAlias() {
@Override
public void onSelected(String alias) {
args.putString("alias", alias);
@@ -3273,7 +3269,6 @@ public class FragmentCompose extends FragmentBase {
snackbar.show();
}
});
}
}
@Override
@@ -4468,8 +4463,7 @@ public class FragmentCompose extends FragmentBase {
}
// Store selected alias
identity.setAlias(alias, true);
db.identity().setIdentitySignKeyAlias(identity.id, identity.sign_key_alias);
db.identity().setIdentitySignKeyAlias(identity.id, alias);
// Build content
File sinput = new File(tmp, draft.id + ".smime_sign");