|
|
|
@ -3896,7 +3896,6 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
|
|
|
|
|
long id = intent.getLongExtra("id", -1);
|
|
|
|
|
boolean auto = intent.getBooleanExtra("auto", false);
|
|
|
|
|
int type = intent.getIntExtra("type", EntityMessage.ENCRYPT_NONE);
|
|
|
|
|
String recipient = intent.getStringExtra("recipient");
|
|
|
|
|
|
|
|
|
|
final Bundle args = new Bundle();
|
|
|
|
|
args.putLong("id", id);
|
|
|
|
@ -3905,7 +3904,23 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
|
|
|
|
|
if (EntityMessage.SMIME_SIGNONLY.equals(type))
|
|
|
|
|
onSmime(args);
|
|
|
|
|
else if (EntityMessage.SMIME_SIGNENCRYPT.equals(type)) {
|
|
|
|
|
Helper.selectKeyAlias(getActivity(), recipient, new Helper.IKeyAlias() {
|
|
|
|
|
new SimpleTask<EntityIdentity>() {
|
|
|
|
|
@Override
|
|
|
|
|
protected EntityIdentity onExecute(Context context, Bundle args) {
|
|
|
|
|
long id = args.getLong("id");
|
|
|
|
|
|
|
|
|
|
DB db = DB.getInstance(context);
|
|
|
|
|
|
|
|
|
|
EntityMessage message = db.message().getMessage(id);
|
|
|
|
|
if (message == null || message.identity == null)
|
|
|
|
|
return null;
|
|
|
|
|
|
|
|
|
|
return db.identity().getIdentity(message.identity);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
@Override
|
|
|
|
|
protected void onExecuted(Bundle args, EntityIdentity identity) {
|
|
|
|
|
Helper.selectKeyAlias(getActivity(), identity == null ? null : identity.sign_key_alias, new Helper.IKeyAlias() {
|
|
|
|
|
@Override
|
|
|
|
|
public void onSelected(String alias) {
|
|
|
|
|
args.putString("alias", alias);
|
|
|
|
@ -3926,6 +3941,13 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
|
|
|
|
|
snackbar.show();
|
|
|
|
|
}
|
|
|
|
|
});
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
@Override
|
|
|
|
|
protected void onException(Bundle args, Throwable ex) {
|
|
|
|
|
Helper.unexpectedError(getParentFragmentManager(), ex);
|
|
|
|
|
}
|
|
|
|
|
}.execute(this, args, "messages:alias");
|
|
|
|
|
} else {
|
|
|
|
|
if (pgpService.isBound()) {
|
|
|
|
|
Intent data = new Intent();
|
|
|
|
|