From 8ac020cb38d7033f3793d2321798b944e824e38b Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Sun, 9 Dec 2018 21:04:12 +0100
Subject: [PATCH] Added some logging, cleanup

---
 app/src/main/java/eu/faircode/email/ActivityView.java   | 3 +++
 app/src/main/java/eu/faircode/email/AdapterMessage.java | 3 +--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/ActivityView.java b/app/src/main/java/eu/faircode/email/ActivityView.java
index 560b2cf311..74b29c9741 100644
--- a/app/src/main/java/eu/faircode/email/ActivityView.java
+++ b/app/src/main/java/eu/faircode/email/ActivityView.java
@@ -1373,6 +1373,8 @@ public class ActivityView extends ActivityBilling implements FragmentManager.OnB
                 // Decrypt message
                 OpenPgpApi api = new OpenPgpApi(context, pgpService.getService());
                 Intent result = api.executeApi(data, encrypted, decrypted);
+
+                Log.i(Helper.TAG, "PGP result=" + result.getIntExtra(OpenPgpApi.RESULT_CODE, OpenPgpApi.RESULT_CODE_ERROR));
                 switch (result.getIntExtra(OpenPgpApi.RESULT_CODE, OpenPgpApi.RESULT_CODE_ERROR)) {
                     case OpenPgpApi.RESULT_CODE_SUCCESS:
                         if (inline) {
@@ -1444,6 +1446,7 @@ public class ActivityView extends ActivityBilling implements FragmentManager.OnB
             protected void onLoaded(Bundle args, PendingIntent pi) {
                 if (pi != null)
                     try {
+                        Log.i(Helper.TAG, "PGP executing pi=" + pi);
                         startIntentSenderForResult(
                                 pi.getIntentSender(),
                                 ActivityView.REQUEST_DECRYPT,
diff --git a/app/src/main/java/eu/faircode/email/AdapterMessage.java b/app/src/main/java/eu/faircode/email/AdapterMessage.java
index 388b0eced4..886eb7c2e9 100644
--- a/app/src/main/java/eu/faircode/email/AdapterMessage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java
@@ -1346,8 +1346,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
             LocalBroadcastManager lbm = LocalBroadcastManager.getInstance(context);
             lbm.sendBroadcast(
                     new Intent(ActivityView.ACTION_DECRYPT)
-                            .putExtra("id", data.message.id)
-                            .putExtra("to", ((InternetAddress) data.message.to[0]).getAddress()));
+                            .putExtra("id", data.message.id));
         }
 
         private void onMore(final ActionData data) {