From 799a05c6eea34933c83c5514513870d2de048a57 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Wed, 1 Jul 2020 15:39:25 +0200
Subject: [PATCH] Added OpenPGP connection debugging

---
 .../faircode/email/FragmentOptionsEncryption.java  | 10 ++++++----
 .../res/layout/fragment_options_encryption.xml     | 14 +++++++++++++-
 2 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/FragmentOptionsEncryption.java b/app/src/main/java/eu/faircode/email/FragmentOptionsEncryption.java
index 50064b81fb..3bddda295e 100644
--- a/app/src/main/java/eu/faircode/email/FragmentOptionsEncryption.java
+++ b/app/src/main/java/eu/faircode/email/FragmentOptionsEncryption.java
@@ -71,6 +71,7 @@ public class FragmentOptionsEncryption extends FragmentBase implements SharedPre
     private SwitchCompat swAutoDecrypt;
 
     private Spinner spOpenPgp;
+    private TextView tvOpenPgpStatus;
     private SwitchCompat swAutocrypt;
     private SwitchCompat swAutocryptMutual;
 
@@ -106,6 +107,7 @@ public class FragmentOptionsEncryption extends FragmentBase implements SharedPre
         swAutoDecrypt = view.findViewById(R.id.swAutoDecrypt);
 
         spOpenPgp = view.findViewById(R.id.spOpenPgp);
+        tvOpenPgpStatus = view.findViewById(R.id.tvOpenPgpStatus);
         swAutocrypt = view.findViewById(R.id.swAutocrypt);
         swAutocryptMutual = view.findViewById(R.id.swAutocryptMutual);
 
@@ -361,19 +363,19 @@ public class FragmentOptionsEncryption extends FragmentBase implements SharedPre
         if (pgpService != null && pgpService.isBound())
             pgpService.unbindFromService();
 
-        Log.i("PGP binding to " + pkg);
+        tvOpenPgpStatus.setText("PGP binding to " + pkg);
         pgpService = new OpenPgpServiceConnection(getContext(), pkg, new OpenPgpServiceConnection.OnBound() {
             @Override
             public void onBound(IOpenPgpService2 service) {
-                Log.i("PGP bound to " + pkg);
+                tvOpenPgpStatus.setText("PGP bound to " + pkg);
             }
 
             @Override
             public void onError(Exception ex) {
                 if ("bindService() returned false!".equals(ex.getMessage()))
-                    Log.i(ex.getMessage());
+                    tvOpenPgpStatus.setText(ex.getMessage());
                 else
-                    Log.e("PGP", ex);
+                    tvOpenPgpStatus.setText(ex.toString());
             }
         });
         pgpService.bindToService();
diff --git a/app/src/main/res/layout/fragment_options_encryption.xml b/app/src/main/res/layout/fragment_options_encryption.xml
index d851de7643..1522122f1e 100644
--- a/app/src/main/res/layout/fragment_options_encryption.xml
+++ b/app/src/main/res/layout/fragment_options_encryption.xml
@@ -98,6 +98,18 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvOpenPgp" />
 
+        <eu.faircode.email.FixedTextView
+            android:id="@+id/tvOpenPgpStatus"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="12dp"
+            android:text="OpenPgp status"
+            android:textAppearance="@style/TextAppearance.AppCompat.Small"
+            android:textStyle="italic"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/spOpenPgp" />
+
         <androidx.appcompat.widget.SwitchCompat
             android:id="@+id/swAutocrypt"
             android:layout_width="0dp"
@@ -107,7 +119,7 @@
             android:text="@string/title_advanced_autocrypt"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/spOpenPgp"
+            app:layout_constraintTop_toBottomOf="@id/tvOpenPgpStatus"
             app:switchPadding="12dp" />
 
         <androidx.appcompat.widget.SwitchCompat