From dda23fb484730a8955e470fec7d90d0790656f88 Mon Sep 17 00:00:00 2001
From: Tom Hacohen <tom@stosb.com>
Date: Sat, 5 Jan 2019 12:26:38 +0000
Subject: [PATCH] Don't rely on LOGIN_ACCOUNTS_CHANGED_ACTION

Based on the davdroid commit: 1f7298f947a4878e86fcba0c6722e34b03cb63c6
---
 app/src/main/AndroidManifest.xml              | 14 ------
 .../syncadapter/AccountsChangedReceiver.kt    | 47 -------------------
 .../syncadapter/ui/AccountListFragment.kt     |  5 +-
 3 files changed, 2 insertions(+), 64 deletions(-)
 delete mode 100644 app/src/main/java/com/etesync/syncadapter/AccountsChangedReceiver.kt

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 985eced2..853693c2 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -162,20 +162,6 @@
             android:enabled="true">
         </service>
 
-        <receiver android:name=".AccountsChangedReceiver">
-            <intent-filter>
-                <action android:name="android.accounts.LOGIN_ACCOUNTS_CHANGED"/>
-            </intent-filter>
-        </receiver>
-
-        <receiver android:name=".PackageChangedReceiver">
-            <intent-filter>
-                <action android:name="android.intent.action.PACKAGE_ADDED"/>
-                <action android:name="android.intent.action.PACKAGE_FULLY_REMOVED"/>
-                <data android:scheme="package"/>
-            </intent-filter>
-        </receiver>
-
         <activity
             android:name=".ui.AccountsActivity"
             android:label="@string/app_name"
diff --git a/app/src/main/java/com/etesync/syncadapter/AccountsChangedReceiver.kt b/app/src/main/java/com/etesync/syncadapter/AccountsChangedReceiver.kt
deleted file mode 100644
index 8b7d8a46..00000000
--- a/app/src/main/java/com/etesync/syncadapter/AccountsChangedReceiver.kt
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Copyright © 2013 – 2016 Ricki Hirner (bitfire web engineering).
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the GNU Public License v3.0
- * which accompanies this distribution, and is available at
- * http://www.gnu.org/licenses/gpl.html
- */
-
-package com.etesync.syncadapter
-
-import android.accounts.AccountManager
-import android.accounts.OnAccountsUpdateListener
-import android.content.BroadcastReceiver
-import android.content.Context
-import android.content.Intent
-
-import java.util.LinkedList
-
-class AccountsChangedReceiver : BroadcastReceiver() {
-
-    override fun onReceive(context: Context, intent: Intent) {
-        if (AccountManager.LOGIN_ACCOUNTS_CHANGED_ACTION == intent.action) {
-            val serviceIntent = Intent(context, AccountUpdateService::class.java)
-            serviceIntent.action = AccountUpdateService.ACTION_ACCOUNTS_UPDATED
-            context.startService(serviceIntent)
-
-            for (listener in listeners)
-                listener.onAccountsUpdated(null)
-        }
-    }
-
-    companion object {
-
-        protected val listeners: MutableList<OnAccountsUpdateListener> = LinkedList()
-
-        fun registerListener(listener: OnAccountsUpdateListener, callImmediately: Boolean) {
-            listeners.add(listener)
-            if (callImmediately)
-                listener.onAccountsUpdated(null)
-        }
-
-        fun unregisterListener(listener: OnAccountsUpdateListener) {
-            listeners.remove(listener)
-        }
-    }
-
-}
diff --git a/app/src/main/java/com/etesync/syncadapter/ui/AccountListFragment.kt b/app/src/main/java/com/etesync/syncadapter/ui/AccountListFragment.kt
index 2d6cc98c..c9efef77 100644
--- a/app/src/main/java/com/etesync/syncadapter/ui/AccountListFragment.kt
+++ b/app/src/main/java/com/etesync/syncadapter/ui/AccountListFragment.kt
@@ -26,7 +26,6 @@ import android.widget.AbsListView
 import android.widget.AdapterView
 import android.widget.ArrayAdapter
 import android.widget.TextView
-import com.etesync.syncadapter.AccountsChangedReceiver
 import com.etesync.syncadapter.App
 import com.etesync.syncadapter.R
 
@@ -80,11 +79,11 @@ class AccountListFragment : ListFragment(), LoaderManager.LoaderCallbacks<Array<
         }
 
         override fun onStartLoading() {
-            AccountsChangedReceiver.registerListener(this, true)
+            accountManager.addOnAccountsUpdatedListener(this, null, true)
         }
 
         override fun onStopLoading() {
-            AccountsChangedReceiver.unregisterListener(this)
+            accountManager.removeOnAccountsUpdatedListener(this)
         }
 
         override fun onAccountsUpdated(accounts: Array<Account>) {