mirror/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2025-02-24 07:01:05 +00:00
Code Issues Releases Wiki Activity

Check number of PGP keys

Browse source
This commit is contained in:
M66B 2020-07-24 11:51:15 +02:00
parent 33d4342d3f
commit 2496eb8dae
2 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -49,7 +49,6 @@ import android.net.Uri;
import android.os.Build;
import android.os.Bundle;
import android.os.Handler;
import android.os.OperationCanceledException;
import android.provider.ContactsContract;
import android.provider.MediaStore;
import android.provider.Settings;
@ -1676,11 +1675,14 @@ public class FragmentCompose extends FragmentBase {
if (recipients.size() == 0)
throw new IllegalArgumentException(getString(R.string.title_to_missing));
pgpUserIds = new String[recipients.size()];
List<String> emails = new ArrayList<>();
for (int i = 0; i < recipients.size(); i++) {
InternetAddress recipient = (InternetAddress) recipients.get(i);
pgpUserIds[i] = recipient.getAddress().toLowerCase();
String email = recipient.getAddress().toLowerCase();
if (!emails.contains(email))
emails.add(email);
}
pgpUserIds = emails.toArray(new String[0]);
Intent intent;
if (EntityMessage.PGP_SIGNONLY.equals(draft.ui_encrypt))
@ -2206,8 +2208,9 @@ public class FragmentCompose extends FragmentBase {
// Sign/encrypt
pgpKeyIds = result.getLongArrayExtra(OpenPgpApi.EXTRA_KEY_IDS);
Log.i("Keys=" + pgpKeyIds.length);
if (pgpKeyIds.length == 0)
throw new OperationCanceledException("Got no key");
if (pgpKeyIds.length != pgpUserIds.length)
throw new IllegalArgumentException(context.getString(R.string.title_key_missing,
TextUtils.join(", ", pgpUserIds)));
if (identity.sign_key != null) {
pgpSignKeyId = identity.sign_key;
@ -2336,9 +2339,7 @@ public class FragmentCompose extends FragmentBase {
@Override
protected void onException(Bundle args, Throwable ex) {
if (ex instanceof OperationCanceledException)
; // Do nothing
else if (ex instanceof IllegalArgumentException
if (ex instanceof IllegalArgumentException
|| ex instanceof GeneralSecurityException /* InvalidKeyException */) {
Log.i(ex);
Snackbar.make(view, ex.getMessage(), Snackbar.LENGTH_LONG)

1
app/src/main/res/values/strings.xml
View file

@ -938,6 +938,7 @@
<string name="title_no_key">No private key</string>
<string name="title_invalid_key">Invalid private key</string>
<string name="title_unknown_key">Private key does not match any encryption keys</string>
<string name="title_key_missing">No key for %1$s</string>
<string name="title_send_reminder_remark">Reminders can be enabled again in the send settings</string>
<string name="title_send_plain_text">Plain text only</string>
<string name="title_send_receipt">Request receipt</string>