fixed account changed listener

twidere/build.gradle

@@ -35,8 +35,8 @@ android {
         applicationId "org.mariotaku.twidere"
         minSdkVersion 14
         targetSdkVersion 25
-        versionCode 232
+        versionCode 233
-        versionName '3.3.14'
+        versionName '3.3.15'
         multiDexEnabled true
 
         buildConfigField 'boolean', 'LEAK_CANARY_ENABLED', 'Boolean.parseBoolean("true")'

twidere/src/main/kotlin/org/mariotaku/twidere/activity/HomeActivity.kt

@@ -86,7 +86,7 @@ import org.mariotaku.twidere.view.TabPagerIndicator
 
 class HomeActivity : BaseActivity(), OnClickListener, OnPageChangeListener, SupportFragmentCallback, OnLongClickListener, DrawerLayout.DrawerListener {
 
-    private val accountChangeObserver = AccountChangeObserver(this)
+    private val accountUpdatedListener = AccountUpdatedListener(this)
 
     private var selectedAccountToSearch: AccountDetails? = null
     private var tabColumns: Int = 0
@@ -389,7 +389,7 @@ class HomeActivity : BaseActivity(), OnClickListener, OnPageChangeListener, Supp
     override fun onStart() {
         super.onStart()
         multiSelectHandler.dispatchOnStart()
-        AccountManager.get(this).addOnAccountsUpdatedListener(accountChangeObserver, null, false)
+        AccountManager.get(this).addOnAccountsUpdatedListener(accountUpdatedListener, null, false)
         bus.register(this)
 
         readStateManager.registerOnSharedPreferenceChangeListener(readStateChangeListener)
@@ -406,7 +406,7 @@ class HomeActivity : BaseActivity(), OnClickListener, OnPageChangeListener, Supp
         multiSelectHandler.dispatchOnStop()
         readStateManager.unregisterOnSharedPreferenceChangeListener(readStateChangeListener)
         bus.unregister(this)
-        AccountManager.get(this).removeOnAccountsUpdatedListener(accountChangeObserver)
+        AccountManager.get(this).removeOnAccountsUpdatedListener(accountUpdatedListener)
         preferences.edit().putInt(SharedPreferenceConstants.KEY_SAVED_TAB_POSITION, mainPager.currentItem).apply()
 
         super.onStop()
@@ -814,7 +814,7 @@ class HomeActivity : BaseActivity(), OnClickListener, OnPageChangeListener, Supp
         actionsButton.contentDescription = getString(title)
     }
 
-    private class AccountChangeObserver(private val activity: HomeActivity) : OnAccountsUpdateListener {
+    private class AccountUpdatedListener(private val activity: HomeActivity) : OnAccountsUpdateListener {
 
         override fun onAccountsUpdated(accounts: Array<out Account>?) {
             activity.notifyAccountsChanged()

twidere/src/main/kotlin/org/mariotaku/twidere/fragment/CursorActivitiesFragment.kt

@@ -114,23 +114,33 @@ abstract class CursorActivitiesFragment : AbsActivitiesFragment() {
 
     override fun onStart() {
         super.onStart()
+        if (contentObserver == null) {
             contentObserver = object : ContentObserver(Handler()) {
                 override fun onChange(selfChange: Boolean) {
                     reloadActivities()
                 }
             }
+            context.contentResolver.registerContentObserver(Filters.CONTENT_URI, true, contentObserver)
+        }
+        if (accountListener == null) {
             accountListener = OnAccountsUpdateListener { accounts ->
                 reloadActivities()
             }
-        context.contentResolver.registerContentObserver(Filters.CONTENT_URI, true, contentObserver)
             AccountManager.get(context).addOnAccountsUpdatedListener(accountListener, null, false)
+        }
         updateRefreshState()
         reloadActivities()
     }
 
     override fun onStop() {
+        if (contentObserver != null) {
             context.contentResolver.unregisterContentObserver(contentObserver)
+            contentObserver = null
+        }
+        if (accountListener != null) {
             AccountManager.get(context).removeOnAccountsUpdatedListener(accountListener)
+            accountListener = null
+        }
         super.onStop()
     }
 

twidere/src/main/kotlin/org/mariotaku/twidere/fragment/CursorStatusesFragment.kt

@@ -121,23 +121,33 @@ abstract class CursorStatusesFragment : AbsStatusesFragment() {
 
     override fun onStart() {
         super.onStart()
+        if (contentObserver == null) {
             contentObserver = object : ContentObserver(Handler()) {
                 override fun onChange(selfChange: Boolean) {
                     reloadStatuses()
                 }
             }
+            context.contentResolver.registerContentObserver(Filters.CONTENT_URI, true, contentObserver)
+        }
+        if (accountListener == null) {
             accountListener = OnAccountsUpdateListener { accounts ->
                 reloadStatuses()
             }
-        context.contentResolver.registerContentObserver(Filters.CONTENT_URI, true, contentObserver)
             AccountManager.get(context).addOnAccountsUpdatedListener(accountListener, null, false)
+        }
         updateRefreshState()
         reloadStatuses()
     }
 
     override fun onStop() {
+        if (contentObserver != null) {
             context.contentResolver.unregisterContentObserver(contentObserver)
+            contentObserver = null
+        }
+        if (accountListener != null) {
             AccountManager.get(context).removeOnAccountsUpdatedListener(accountListener)
+            accountListener = null
+        }
         super.onStop()
     }
 

twidere/src/main/kotlin/org/mariotaku/twidere/fragment/DirectMessagesFragment.kt

@@ -228,17 +228,22 @@ class DirectMessagesFragment : AbsContentListRecyclerViewFragment<MessageEntries
 
     override fun onStart() {
         super.onStart()
+        if (accountListener == null) {
             accountListener = OnAccountsUpdateListener { accounts ->
 
             }
             AccountManager.get(context).addOnAccountsUpdatedListener(accountListener, null, false)
+        }
         bus.register(this)
         adapter.updateReadState()
     }
 
     override fun onStop() {
         bus.unregister(this)
+        if (accountListener != null) {
             AccountManager.get(context).removeOnAccountsUpdatedListener(accountListener)
+            accountListener = null
+        }
         super.onStop()
     }