mirror/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2025-01-18 21:28:54 +00:00
Code Issues Releases Wiki Activity

Revert "Removed PGP sign key shortcut"

Browse source 
This reverts commit 3e5bcf8305.
This commit is contained in:
M66B 2021-09-02 14:16:55 +02:00
parent 07cc57af87
commit dea9741aa5
1 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -3053,11 +3053,19 @@ public class FragmentCompose extends FragmentBase {
}
}
// Call OpenPGP
Log.i("Executing " + data.getAction());
Log.logExtras(data);
OpenPgpApi api = new OpenPgpApi(context, pgpService.getService());
Intent result = api.executeApi(data, new FileInputStream(input), new FileOutputStream(output));
Intent result;
if (OpenPgpApi.ACTION_GET_SIGN_KEY_ID.equals(data.getAction()) && identity.sign_key != null) {
// Short circuit
result = data;
result.putExtra(OpenPgpApi.RESULT_CODE, OpenPgpApi.RESULT_CODE_SUCCESS);
result.putExtra(OpenPgpApi.EXTRA_SIGN_KEY_ID, identity.sign_key);
} else {
// Call OpenPGP
Log.i("Executing " + data.getAction());
Log.logExtras(data);
OpenPgpApi api = new OpenPgpApi(context, pgpService.getService());
result = api.executeApi(data, new FileInputStream(input), new FileOutputStream(output));
}
// Process result
try {