From 916993fca482da09e60af99c591efb8da9ddcda5 Mon Sep 17 00:00:00 2001 From: M66B Date: Fri, 22 Nov 2019 10:11:32 +0100 Subject: [PATCH] Cancel encryption on no key --- app/src/main/java/eu/faircode/email/FragmentCompose.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/eu/faircode/email/FragmentCompose.java b/app/src/main/java/eu/faircode/email/FragmentCompose.java index 976b334899..1df0612c22 100644 --- a/app/src/main/java/eu/faircode/email/FragmentCompose.java +++ b/app/src/main/java/eu/faircode/email/FragmentCompose.java @@ -53,6 +53,7 @@ import android.os.Build; import android.os.Bundle; import android.os.Handler; import android.os.LocaleList; +import android.os.OperationCanceledException; import android.provider.ContactsContract; import android.provider.MediaStore; import android.text.Html; @@ -1581,7 +1582,7 @@ public class FragmentCompose extends FragmentBase { pgpKeyIds = result.getLongArrayExtra(OpenPgpApi.EXTRA_KEY_IDS); Log.i("Keys=" + pgpKeyIds.length); if (pgpKeyIds.length == 0) - throw new IllegalStateException("Got no key"); + throw new OperationCanceledException("Got no key"); // Get encrypt key if (pgpKeyIds.length == 1) { @@ -1680,7 +1681,9 @@ public class FragmentCompose extends FragmentBase { @Override protected void onException(Bundle args, Throwable ex) { - if (ex instanceof IllegalArgumentException) { + if (ex instanceof OperationCanceledException) + ; // Do nothing + else if (ex instanceof IllegalArgumentException) { Log.i(ex); Snackbar.make(view, ex.getMessage(), Snackbar.LENGTH_LONG).show(); } else