From 16691c2e3dc8f853e6e51d248ca6f4158ed88e73 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Mon, 30 Dec 2019 16:52:47 +0100
Subject: [PATCH] Small improvements

---
 app/src/main/java/eu/faircode/email/FragmentCompose.java | 3 ++-
 app/src/main/res/values/strings.xml                      | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/eu/faircode/email/FragmentCompose.java b/app/src/main/java/eu/faircode/email/FragmentCompose.java
index f7d712b8aa..20c8acfc35 100644
--- a/app/src/main/java/eu/faircode/email/FragmentCompose.java
+++ b/app/src/main/java/eu/faircode/email/FragmentCompose.java
@@ -810,7 +810,7 @@ public class FragmentCompose extends FragmentBase {
     public void onDestroyView() {
         adapter = null;
 
-        if (pgpService != null)
+        if (pgpService != null && pgpService.isBound())
             pgpService.unbindFromService();
 
         super.onDestroyView();
@@ -1894,6 +1894,7 @@ public class FragmentCompose extends FragmentBase {
                     onPgp(intent);
                 } else if (result instanceof PendingIntent)
                     try {
+                        ToastEx.makeText(getContext(), R.string.title_user_interaction, Toast.LENGTH_SHORT).show();
                         PendingIntent pi = (PendingIntent) result;
                         startIntentSenderForResult(
                                 pi.getIntentSender(),
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 1d717eea1b..695ca2c20c 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -737,6 +737,7 @@
     <string name="title_decrypt">Decrypt</string>
     <string name="title_resync">Resync</string>
     <string name="title_no_openpgp">OpenKeychain not found</string>
+    <string name="title_user_interaction">Transferring to OpenKeychain</string>
     <string name="title_not_encrypted">Message is not signed or encrypted</string>
     <string name="title_reset_sign_key">Reset sign key</string>