feat(pgp): support delegated OpenPGP providers

app/build.gradle.kts

@@ -91,6 +91,7 @@ dependencies {
   implementation(libs.thirdparty.kotlinResult)
   implementation(libs.thirdparty.logcat)
   implementation(libs.thirdparty.modernAndroidPrefs)
+  implementation(libs.thirdparty.openpgp.api)
   implementation(libs.thirdparty.sshj)
   implementation(libs.thirdparty.bouncycastle.bcprov)
   implementation(libs.thirdparty.bouncycastle.bcutil)

app/lint-baseline.xml

@@ -1,35 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <issues format="6" by="lint 9.2.0" type="baseline" client="gradle" dependencies="false" name="AGP (9.2.0)" variant="all" version="9.2.0">
 
-    <issue
-        id="InvalidPackage"
-        message="Invalid package reference in library; not included in Android: `javax.naming.directory`. Referenced from `org.bouncycastle.cert.dane.fetcher.JndiDANEFetcherFactory`.">
-        <location
-            file="$GRADLE_USER_HOME/caches/modules-2/files-2.1/org.bouncycastle/bcpkix-jdk18on/1.80/5277dfaaef2e92ce1d802499599a0ca7488f86e6/bcpkix-jdk18on-1.80.jar"/>
-    </issue>
-
-    <issue
-        id="InvalidPackage"
-        message="Invalid package reference in library; not included in Android: `javax.naming`. Referenced from `org.bouncycastle.cert.dane.fetcher.JndiDANEFetcherFactory.1`.">
-        <location
-            file="$GRADLE_USER_HOME/caches/modules-2/files-2.1/org.bouncycastle/bcpkix-jdk18on/1.80/5277dfaaef2e92ce1d802499599a0ca7488f86e6/bcpkix-jdk18on-1.80.jar"/>
-    </issue>
-
-    <issue
-        id="InvalidPackage"
-        message="Invalid package reference in org.eclipse.jgit:org.eclipse.jgit; not included in Android: `java.lang.management`. Referenced from `org.eclipse.jgit.util.Monitoring`.">
-        <location
-            file="$GRADLE_USER_HOME/caches/modules-2/files-2.1/org.eclipse.jgit/org.eclipse.jgit/6.2.0.202206071550-r/d59e7ae8528fcc3854acbb307de8443b28a5c945/org.eclipse.jgit-6.2.0.202206071550-r.jar"/>
-    </issue>
-
-    <issue
-        id="InvalidPackage"
-        message="Invalid package reference in org.eclipse.jgit:org.eclipse.jgit; not included in Android: `javax.management`. Referenced from `org.eclipse.jgit.util.Monitoring`.">
-        <location
-            file="$GRADLE_USER_HOME/caches/modules-2/files-2.1/org.eclipse.jgit/org.eclipse.jgit/6.2.0.202206071550-r/d59e7ae8528fcc3854acbb307de8443b28a5c945/org.eclipse.jgit-6.2.0.202206071550-r.jar"/>
-    </issue>
-
-    <issue
+<issue
         id="MissingQuantity"
         message="For locale &quot;it&quot; (Italian) the following quantity should also be defined: `many`"
         errorLine1="  &lt;plurals name=&quot;delete_title&quot;>"

app/src/main/AndroidManifest.xml

@@ -7,6 +7,12 @@
   xmlns:tools="http://schemas.android.com/tools"
   android:installLocation="auto">
 
+  <queries>
+    <intent>
+      <action android:name="org.openintents.openpgp.IOpenPgpService2" />
+    </intent>
+  </queries>
+
   <uses-permission android:name="android.permission.INTERNET" />
   <uses-permission android:name="android.permission.ACCESS_LOCAL_NETWORK" />
   <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />

app/src/main/java/app/passwordstore/data/crypto/CryptoRepository.kt

@@ -46,6 +46,7 @@ constructor(
   private val pgpKeyManager: PGPKeyManager,
   private val pgpCryptoHandler: PGPainlessCryptoHandler,
   private val dispatcherProvider: DispatcherProvider,
+  private val openPgpProviderRepository: OpenPgpProviderRepository,
   @SettingsPreferences private val settings: SharedPreferences,
 ) {
 
@@ -90,7 +91,12 @@ constructor(
   }
 
   fun getEmailFromKeyId(identifier: PGPIdentifier): String? {
-    val key = pgpKeyManager.getKeyById(identifier).get() ?: return null
+    val key =
+      if (openPgpProviderRepository.hasSelectedProvider()) {
+        openPgpProviderRepository.resolvedPublicKeysFor(listOf(identifier))?.firstOrNull()
+      } else {
+        pgpKeyManager.getKeyById(identifier).get()
+      } ?: return null
     val userId = KeyUtils.tryGetUserId(key) ?: return null
     return PGPIdentifier.splitUserId(userId.email)
   }
@@ -116,8 +122,7 @@ constructor(
     encryptedMessage: ByteArrayInputStream,
     message: ByteArrayOutputStream,
   ) = run {
-    if (passphrases.keys.first() == "") { // New passphrase from user input
-      // Test it against the PGP identities of current entry
+    if (passphrases.keys.first() == "") {
       identities.mapUntil({ it.second.isOk }) { id ->
         encryptedMessage.reset()
         message.reset()
@@ -134,7 +139,7 @@ constructor(
         result.getError()?.let { logcat { it.asLog() } }
         Pair(id.toString(), result.map { message })
       }
-    } else { // Get the first working cached passphrase
+    } else {
       passphrases.keys.toList().mapUntil({ it.second.isOk }) { id ->
         encryptedMessage.reset()
         message.reset()
@@ -172,13 +177,25 @@ constructor(
     message: ByteArrayInputStream,
     encryptedMessage: ByteArrayOutputStream,
   ) = run {
-    // get primary key IDs in order to identify and avoid duplicate keys
-    val primaryKeyIds =
-      identities
-        .mapNotNull { getLongKeyIdFromKeyId(it) }
-        .distinct()
-        .mapNotNull { PGPIdentifier.fromString(it) }
-    val keys = primaryKeyIds.map { id -> pgpKeyManager.getKeyById(id) }.filterOk()
+    val keys =
+      if (openPgpProviderRepository.hasSelectedProvider()) {
+        openPgpProviderRepository.resolvedPublicKeysFor(identities).orEmpty()
+      } else {
+        val primaryKeyIds =
+          identities
+            .mapNotNull { getLongKeyIdFromKeyId(it) }
+            .distinct()
+            .mapNotNull { PGPIdentifier.fromString(it) }
+        primaryKeyIds.map { id -> pgpKeyManager.getKeyById(id) }.filterOk()
+      }
+    encryptWithKeys(keys, message, encryptedMessage)
+  }
+
+  private fun encryptWithKeys(
+    keys: List<PGPKey>,
+    message: ByteArrayInputStream,
+    encryptedMessage: ByteArrayOutputStream,
+  ) = run {
     val encryptionOptions =
       PGPEncryptOptions.Builder()
         .withAsciiArmor(settings.getBoolean(PreferenceKeys.ASCII_ARMOR, false))