Shared passwords support

Thank you Codex for the UI

Author: TaeHagen

.dart_tool/build/fcd1995bc647fb959e82ea360c6c2c9a/asset_graph.json

@@ -154,7 +154,7 @@
         <service android:name=".services.credentials.CredentialService"
             android:enabled="true"
             android:exported="true"
-            android:label="iCloud Passwords"
+            android:label="iCloud Keychain"
             android:icon="@mipmap/ic_launcher"
             android:permission="android.permission.BIND_CREDENTIAL_PROVIDER_SERVICE"
             tools:targetApi="upside_down_cake">
@@ -168,7 +168,7 @@
 
         <service
             android:name=".services.credentials.OBAutofillService"
-            android:label="iCloud Passwords"
+            android:label="iCloud Keychain"
             android:exported="true"
             android:permission="android.permission.BIND_AUTOFILL_SERVICE"
             tools:targetApi="27">

android/app/src/main/AndroidManifest.xml

@@ -1,5 +1,6 @@
 package com.bluebubbles.messaging.services.credentials
 
+import android.content.Context
 import android.content.Intent
 import android.os.Build
 import android.os.Bundle
@@ -29,6 +30,7 @@ import java.security.spec.ECGenParameterSpec
 import java.util.UUID
 import org.json.JSONObject
 import uniffi.rust_lib_bluebubbles.SavedPassword
+import androidx.core.content.edit
 
 @RequiresApi(Build.VERSION_CODES.UPSIDE_DOWN_CAKE)
 class CredentialCreateActivity : FragmentActivity() {
@@ -73,6 +75,17 @@ class CredentialCreateActivity : FragmentActivity() {
         }
     }
 
+    private fun updateLastUsed() {
+        val groupId = intent.getStringExtra("group_id")
+        val prefs = getSharedPreferences("credential_usage_stats", Context.MODE_PRIVATE)
+        val now = System.currentTimeMillis()
+        if (groupId == null) {
+            prefs.edit { putLong("usage_last_null", now) }
+        } else {
+            prefs.edit { putLong("usage_last_group_$groupId", now) }
+        }
+    }
+
     fun handleService(service: NativePushState) {
         val request = PendingIntentHandler.retrieveProviderCreateCredentialRequest(intent)
         if (request == null) {
@@ -181,6 +194,8 @@ class CredentialCreateActivity : FragmentActivity() {
                                 return
                             }
 
+                            updateLastUsed()
+
                             // Set the CreateCredentialResponse as the result of the Activity
                             PendingIntentHandler.setCreateCredentialResponse(
                                 result,
@@ -189,7 +204,7 @@ class CredentialCreateActivity : FragmentActivity() {
                             setResult(RESULT_OK, result)
                             finish()
                         }
-                    })
+                    }, intent.getStringExtra("group_id"))
                 }
             })
         } else if (request.callingRequest is CreatePasswordRequest) {
@@ -207,14 +222,17 @@ class CredentialCreateActivity : FragmentActivity() {
                             return
                         }
 
+                        updateLastUsed()
+
                         PendingIntentHandler.setCreateCredentialResponse(
                             result,
                             CreatePasswordResponse()
                         )
                         setResult(RESULT_OK, result)
                         finish()
                     }
-                }
+                },
+                intent.getStringExtra("group_id")
             )
         }
     }

android/app/src/main/kotlin/com/bluebubbles/messaging/services/credentials/CredentialCreateActivity.kt

@@ -32,14 +32,15 @@ import com.bluebubbles.messaging.MainActivity
 import com.bluebubbles.messaging.services.rustpush.APNClient
 import com.bluebubbles.messaging.services.rustpush.APNService
 import org.json.JSONObject
+import uniffi.rust_lib_bluebubbles.AvailableGroupsCallback
 import uniffi.rust_lib_bluebubbles.RetrieveKeysCallback
 import uniffi.rust_lib_bluebubbles.SavedPassword
 import uniffi.rust_lib_bluebubbles.SavedPasskey
 import java.security.MessageDigest
+import java.time.Instant
 
 @RequiresApi(Build.VERSION_CODES.UPSIDE_DOWN_CAKE)
 class CredentialService : CredentialProviderService() {
-    val ICLOUD_ACCOUNT_ID = "OpenBubbles-iCloud"
 
     override fun onBeginCreateCredentialRequest(
         request: BeginCreateCredentialRequest,
@@ -54,18 +55,54 @@ class CredentialService : CredentialProviderService() {
                 return@ensurePrivilegedAllowlistFresh
             }
 
+            val prefs = getSharedPreferences("credential_usage_stats", Context.MODE_PRIVATE)
+
             val intent = Intent(this, CredentialCreateActivity::class.java)
             val pending = PendingIntent.getActivity(this, 0, intent, PendingIntent.FLAG_MUTABLE
                     or PendingIntent.FLAG_UPDATE_CURRENT)
 
-            val createEntries = listOf(
-                CreateEntry(
-                    ICLOUD_ACCOUNT_ID,
-                    pending
+            val client = APNClient(this)
+            client.bind { service: APNService ->
+                val push = service.pushState
+
+                // 1 to always put this first by default
+                val lastUsedNull = prefs.getLong("usage_last_null", 1)
+                val createEntries = mutableListOf(
+                    CreateEntry(
+                        accountName = "Not shared",
+                        pendingIntent = pending,
+                        description = null,
+                        lastUsedTime = if (lastUsedNull > 0) Instant.ofEpochMilli(lastUsedNull) else null
+                    )
                 )
-            )
 
-            callback.onResult(BeginCreateCredentialResponse(createEntries))
+                if (push == null) {
+                    client.destroy()
+                    callback.onResult(BeginCreateCredentialResponse(createEntries))
+                    return@bind
+                }
+
+                push.getAvailableGroups(object : AvailableGroupsCallback {
+                    override fun groups(groups: Map<String, String>) {
+                        createEntries.addAll(groups.asSequence().mapIndexed { idx, group ->
+                            val intent = Intent(this@CredentialService, CredentialCreateActivity::class.java)
+                            intent.putExtra("group_id", group.value)
+                            val pending = PendingIntent.getActivity(this@CredentialService, idx + 1, intent, PendingIntent.FLAG_MUTABLE
+                                    or PendingIntent.FLAG_UPDATE_CURRENT)
+                            
+                            val lastUsed = prefs.getLong("usage_last_group_${group.value}", 0)
+                            CreateEntry(
+                                accountName = group.key,
+                                pendingIntent = pending,
+                                description = "Saving to ${group.key}",
+                                lastUsedTime = if (lastUsed > 0) Instant.ofEpochMilli(lastUsed) else null
+                            )
+                        })
+                        callback.onResult(BeginCreateCredentialResponse(createEntries))
+                    }
+                })
+            }
+
         }
     }
 
@@ -256,4 +293,4 @@ class CredentialService : CredentialProviderService() {
             return "android:apk-key-hash:${Base64.encodeToString(certHash, Base64.NO_WRAP)}"
         }
     }
-}
+}

android/app/src/main/kotlin/com/bluebubbles/messaging/services/credentials/CredentialService.kt

@@ -167,7 +167,7 @@ class OBAutofillService : AutofillService() {
                         }
                         client.destroy()
                     }
-                })
+                }, null)
             }
         }
         callback.onSuccess()