From 93be0d2802cac48d1d40fdea6d381c7130a19d13 Mon Sep 17 00:00:00 2001
From: dev-12 <dev-12@ragdoll.sh>
Date: Wed, 24 Sep 2025 13:07:05 +0530
Subject: [PATCH] bugfix! Ensure proper mail account removal

we send our own custom broadcast which is guarded with permission and
only sent to mail app, system broadcast is not reliable for app that is
not the owner for the account (i.e mail app for sso account which is
owned by account manager).
---
 app/src/main/AndroidManifest.xml                       |  6 ++++++
 .../at/bitfire/davdroid/MailAccountSyncHelper.kt       | 10 +++++++++-
 .../davdroid/receiver/AccountRemovedReceiver.kt        |  2 ++
 3 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 953004319..c379c6af3 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -33,6 +33,12 @@
     <permission android:name="foundation.e.accountmanager.permission.ADD_ACCOUNT"
         android:protectionLevel="signature" />
 
+    <!-- permission for broadcast related to account changes event (added/removed) -->
+    <permission
+        android:name="foundation.e.accountmanager.permission.ACCOUNT_EVENTS"
+        android:protectionLevel="signature"/>
+    <uses-permission android:name="foundation.e.accountmanager.permission.ACCOUNT_EVENTS"/>
+
     <!-- android.permission-group.LOCATION -->
     <!-- getting the WiFi name (for "sync in Wifi only") requires
       - coarse location (Android 8.1)
diff --git a/app/src/main/kotlin/at/bitfire/davdroid/MailAccountSyncHelper.kt b/app/src/main/kotlin/at/bitfire/davdroid/MailAccountSyncHelper.kt
index 07675e657..2a84249a1 100644
--- a/app/src/main/kotlin/at/bitfire/davdroid/MailAccountSyncHelper.kt
+++ b/app/src/main/kotlin/at/bitfire/davdroid/MailAccountSyncHelper.kt
@@ -26,11 +26,19 @@ object MailAccountSyncHelper {
     private const val MAIL_PACKAGE = "foundation.e.mail"
     private const val MAIL_RECEIVER_CLASS = "com.fsck.k9.account.AccountSyncReceiver"
     private const val ACTION_PREFIX = "foundation.e.accountmanager.account."
+    private const val ACCOUNT_EVENTS_PERMISSION = "foundation.e.accountmanager.permission.ACCOUNT_EVENTS"
 
     fun syncMailAccounts(applicationContext: Context?) {
         val intent = getIntent()
         intent.action = ACTION_PREFIX + "create"
-        applicationContext?.sendBroadcast(intent)
+        applicationContext?.sendBroadcast(intent, ACCOUNT_EVENTS_PERMISSION)
+    }
+
+    fun notifyAccountRemoved(context: Context, accountRemovedIntent: Intent) {
+        val intent = getIntent()
+        intent.action = ACTION_PREFIX + "removed"
+        intent.putExtras(accountRemovedIntent)
+        context.sendBroadcast(intent, ACCOUNT_EVENTS_PERMISSION)
     }
 
     private fun getIntent() : Intent {
diff --git a/app/src/main/kotlin/at/bitfire/davdroid/receiver/AccountRemovedReceiver.kt b/app/src/main/kotlin/at/bitfire/davdroid/receiver/AccountRemovedReceiver.kt
index 7409c058d..5ca9c8fb6 100644
--- a/app/src/main/kotlin/at/bitfire/davdroid/receiver/AccountRemovedReceiver.kt
+++ b/app/src/main/kotlin/at/bitfire/davdroid/receiver/AccountRemovedReceiver.kt
@@ -20,6 +20,7 @@ import android.accounts.AccountManager
 import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
+import at.bitfire.davdroid.MailAccountSyncHelper
 import at.bitfire.davdroid.settings.AccountSettings
 import at.bitfire.davdroid.syncadapter.AccountUtils
 import at.bitfire.davdroid.ui.signout.OpenIdEndSessionActivity
@@ -43,6 +44,7 @@ class AccountRemovedReceiver : BroadcastReceiver() {
             context = context,
             accountName = accountName
         )
+        MailAccountSyncHelper.notifyAccountRemoved(context.applicationContext, intent)
     }
 
     private fun clearOidcSession(
-- 
GitLab