Fix "Cannot connect to crypto provider"

Initialize `openPgpCallback` before `onSwitchAccount()` is called from the class initializer.
thunderbird · May 22, 2023 · 7edbe54 · 7edbe54
1 parent 726027f
commit 7edbe54
Showing 1 changed file with 18 additions and 19 deletions.
diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/activity/compose/RecipientPresenter.kt b/app/ui/legacy/src/main/java/com/fsck/k9/activity/compose/RecipientPresenter.kt
@@ -90,6 +90,24 @@ class RecipientPresenter(
     private val allRecipients: List<Recipient>
         get() = with(recipientMvpView) { toRecipients + ccRecipients + bccRecipients }
 
+    private val openPgpCallback = object : OpenPgpApiManagerCallback {
+        override fun onOpenPgpProviderStatusChanged() {
+            if (openPgpApiManager.openPgpProviderState == OpenPgpProviderState.UI_REQUIRED) {
+                recipientMvpView.showErrorOpenPgpUserInteractionRequired()
+            }
+            asyncUpdateCryptoStatus()
+        }
+
+        override fun onOpenPgpProviderError(error: OpenPgpProviderError) {
+            when (error) {
+                OpenPgpProviderError.ConnectionLost -> openPgpApiManager.refreshConnection()
+                OpenPgpProviderError.VersionIncompatible -> recipientMvpView.showErrorOpenPgpIncompatible()
+                OpenPgpProviderError.ConnectionFailed -> recipientMvpView.showErrorOpenPgpConnection()
+                else -> recipientMvpView.showErrorOpenPgpConnection()
+            }
+        }
+    }
+
     init {
         recipientMvpView.setPresenter(this)
         recipientMvpView.setLoaderManager(loaderManager)
@@ -723,25 +741,6 @@ class RecipientPresenter(
         }
     }
 
-    private val openPgpCallback = object : OpenPgpApiManagerCallback {
-        override fun onOpenPgpProviderStatusChanged() {
-            if (openPgpApiManager.openPgpProviderState == OpenPgpProviderState.UI_REQUIRED) {
-                recipientMvpView.showErrorOpenPgpUserInteractionRequired()
-            }
-
-            asyncUpdateCryptoStatus()
-        }
-
-        override fun onOpenPgpProviderError(error: OpenPgpProviderError) {
-            when (error) {
-                OpenPgpProviderError.ConnectionLost -> openPgpApiManager.refreshConnection()
-                OpenPgpProviderError.VersionIncompatible -> recipientMvpView.showErrorOpenPgpIncompatible()
-                OpenPgpProviderError.ConnectionFailed -> recipientMvpView.showErrorOpenPgpConnection()
-                else -> recipientMvpView.showErrorOpenPgpConnection()
-            }
-        }
-    }
-
     private fun Array<String>.toAddressArray(): Array<Address> {
         return flatMap { addressString ->
             Address.parseUnencoded(addressString).toList()