From ab631cf2ce4485320b412b646499847f271f07b5 Mon Sep 17 00:00:00 2001
From: Jonathan Klee <jonathan.klee@e.email>
Date: Tue, 22 Jul 2025 14:02:30 +0200
Subject: [PATCH] Notify all components listening for account added

We want other components to be able to get notified
when a new account is added in AccountManger.

We moved the permission declaration to AccountManager and
the subscribers who want to get notified should use
the new ADD_ACCOUNT permission.
---
 app/src/main/AndroidManifest.xml                    |  6 ++++--
 .../davdroid/ui/setup/AccountDetailsFragment.kt     | 13 ++++---------
 2 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 7f3af0812..953004319 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -28,8 +28,10 @@
     <!-- android.permission-group.CALENDAR -->
     <uses-permission android:name="android.permission.READ_CALENDAR"/>
     <uses-permission android:name="android.permission.WRITE_CALENDAR"/>
-    <!-- android.permission.eDrive -->
-    <uses-permission android:name="foundation.e.permission.ADD_ACCOUNT"/>
+
+    <!-- permission to use to be notified about account being added -->
+    <permission android:name="foundation.e.accountmanager.permission.ADD_ACCOUNT"
+        android:protectionLevel="signature" />
 
     <!-- android.permission-group.LOCATION -->
     <!-- getting the WiFi name (for "sync in Wifi only") requires
diff --git a/app/src/main/kotlin/at/bitfire/davdroid/ui/setup/AccountDetailsFragment.kt b/app/src/main/kotlin/at/bitfire/davdroid/ui/setup/AccountDetailsFragment.kt
index c00b57ea5..f6157fc45 100644
--- a/app/src/main/kotlin/at/bitfire/davdroid/ui/setup/AccountDetailsFragment.kt
+++ b/app/src/main/kotlin/at/bitfire/davdroid/ui/setup/AccountDetailsFragment.kt
@@ -212,7 +212,7 @@ class AccountDetailsFragment : Fragment() {
                             if (isSsoMigrationRunning) {
                                 handlePostMurenaSsoMigrationOperations()
                             } else {
-                                notifyEdriveWithAccountAdded(name)
+                                notifyListeners(name)
                             }
                         }
                         handlePostAuthOperations()
@@ -240,18 +240,13 @@ class AccountDetailsFragment : Fragment() {
         requireContext().stopService(serviceIntent)
     }
 
-    private fun notifyEdriveWithAccountAdded(name: String) {
-        val intent = Intent("foundation.e.drive.action.ADD_ACCOUNT")
+    private fun notifyListeners(name: String) {
+        val intent = Intent("foundation.e.accountmanager.action.ACCOUNT_ADDED")
         intent.addFlags(Intent.FLAG_INCLUDE_STOPPED_PACKAGES)
-        intent.component =
-            ComponentName(
-                getString(R.string.e_drive_package_name), 
-                "foundation.e.drive.account.receivers.AccountAddedReceiver"
-            )
 
         intent.putExtra(AccountManager.KEY_ACCOUNT_NAME, name)
         intent.putExtra(AccountManager.KEY_ACCOUNT_TYPE, getString(R.string.eelo_account_type))
-        requireActivity().sendBroadcast(intent)
+        requireActivity().sendBroadcast(intent, "foundation.e.accountmanager.permission.ADD_ACCOUNT")
     }
 
 
-- 
GitLab