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

Store S/MIME key alias in identity

Browse Source
This commit is contained in:
M66B
2019-12-05 20:23:31 +01:00
parent 0d1d7f6ae9
commit 043c33ea41
6 changed files with 2063 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1249,38 +1249,53 @@ public class FragmentCompose extends FragmentBase {
private void onEncrypt(final EntityMessage draft) {
if (EntityMessage.SMIME_SIGNONLY.equals(draft.encrypt) ||
EntityMessage.SMIME_SIGNENCRYPT.equals(draft.encrypt)) {
String sender = null;
if (draft.from != null && draft.from.length > 0)
sender = ((InternetAddress) draft.from[0]).getAddress();
Log.i("Alias sender=" + sender);
Bundle args = new Bundle();
args.putLong("id", draft.id);
args.putInt("type", draft.encrypt);
args.putString("sender", sender);
Helper.selectKeyAlias(getActivity(), sender, new Helper.IKeyAlias() {
new SimpleTask<EntityIdentity>() {
@Override
public void onSelected(String alias) {
args.putString("alias", alias);
onSmime(args);
protected EntityIdentity onExecute(Context context, Bundle args) {
long id = args.getLong("id");
DB db = DB.getInstance(context);
EntityMessage draft = db.message().getMessage(id);
if (draft == null || draft.identity == null)
return null;
return db.identity().getIdentity(draft.identity);
}
@Override
public void onNothingSelected() {
Snackbar snackbar = Snackbar.make(view, R.string.title_no_key, Snackbar.LENGTH_LONG);
final Intent intent = KeyChain.createInstallIntent();
if (intent.resolveActivity(getContext().getPackageManager()) != null)
snackbar.setAction(R.string.title_fix, new View.OnClickListener() {
@Override
public void onClick(View v) {
startActivity(intent);
}
});
snackbar.show();
protected void onExecuted(final Bundle args, EntityIdentity identity) {
Helper.selectKeyAlias(getActivity(), identity.sign_key_alias, new Helper.IKeyAlias() {
@Override
public void onSelected(String alias) {
args.putString("alias", alias);
onSmime(args);
}
@Override
public void onNothingSelected() {
Snackbar snackbar = Snackbar.make(view, R.string.title_no_key, Snackbar.LENGTH_LONG);
final Intent intent = KeyChain.createInstallIntent();
if (intent.resolveActivity(getContext().getPackageManager()) != null)
snackbar.setAction(R.string.title_fix, new View.OnClickListener() {
@Override
public void onClick(View v) {
startActivity(intent);
}
});
snackbar.show();
}
});
}
});
@Override
protected void onException(Bundle args, Throwable ex) {
Helper.unexpectedError(getParentFragmentManager(), ex);
}
}.execute(this, args, "compose:alias");
} else {
if (pgpService.isBound())
try {
@@ -1923,8 +1938,10 @@ public class FragmentCompose extends FragmentBase {
};
bpContent.setContent(imessage.getContent(), imessage.getContentType());
// Store selected alias
if (alias == null)
throw new IllegalArgumentException("Key alias missing");
db.identity().setIdentitySignKeyAlias(identity.id, alias);
// Get private key
PrivateKey privkey = KeyChain.getPrivateKey(context, alias);