Removing Data Source listeners manually is not really necessary

Criptext · Oct 18, 2019 · d2fb332 · d2fb332
1 parent 6813197
commit d2fb332
Show file tree

Hide file tree

Showing 18 changed files with 51 additions and 144 deletions.
diff --git a/src/main/kotlin/com/criptext/mail/scenes/composer/ComposerController.kt b/src/main/kotlin/com/criptext/mail/scenes/composer/ComposerController.kt
@@ -663,8 +663,6 @@ class ComposerController(private val storage: KeyValueStorage,
 
     override fun onResume(activityMessage: ActivityMessage?): Boolean {
         if(scene.observer == null) scene.observer = this.observer
-        if(dataSource.listener == null) dataSource.listener = this.dataSourceListener
-        if(generalDataSource.listener == null) generalDataSource.listener = this.generalDataSourceListener
         return false
     }
 
@@ -676,14 +674,11 @@ class ComposerController(private val storage: KeyValueStorage,
         cleanup(true)
     }
 
-    private fun cleanup(cleanDataSources: Boolean){
+    private fun cleanup(fullCleanup: Boolean){
         val data = scene.getDataInputByUser()
         updateModelWithInputData(data)
-
-        if(cleanDataSources) {
+        if(fullCleanup) {
             scene.observer = null
-            dataSource.listener = null
-            generalDataSource.listener = null
         }
     }
 

diff --git a/src/main/kotlin/com/criptext/mail/scenes/emaildetail/EmailDetailSceneController.kt b/src/main/kotlin/com/criptext/mail/scenes/emaildetail/EmailDetailSceneController.kt
@@ -884,27 +884,19 @@ class EmailDetailSceneController(private val storage: KeyValueStorage,
     }
 
     override fun onResume(activityMessage: ActivityMessage?): Boolean {
-        if(dataSource.listener == null)
-            dataSource.listener = dataSourceListener
-        if(generalDataSource.listener == null)
-            generalDataSource.listener = remoteChangeDataSourceListener
         websocketEvents.setListener(webSocketEventListener)
         return false
     }
 
     override fun onPause(){
-        cleanup(false)
+        cleanup()
     }
 
     override fun onStop() {
-        cleanup(true)
+        cleanup()
     }
 
-    private fun cleanup(cleanDataSources: Boolean){
-        if(cleanDataSources) {
-            dataSource.listener = null
-            generalDataSource.listener = null
-        }
+    private fun cleanup(){
         websocketEvents.clearListener(webSocketEventListener)
     }
 

diff --git a/src/main/kotlin/com/criptext/mail/scenes/linking/LinkingController.kt b/src/main/kotlin/com/criptext/mail/scenes/linking/LinkingController.kt
@@ -162,22 +162,15 @@ class LinkingController(
 
     override fun onResume(activityMessage: ActivityMessage?): Boolean {
         websocketEvents.setListener(webSocketEventListener)
-        if(dataSource.listener == null) dataSource.listener = dataSourceListener
-        if(generalDataSource.listener == null) generalDataSource.listener = generalDataSourceListener
         return false
     }
 
     override fun onPause() {
-        cleanup(false)
+        cleanup()
     }
 
-    private fun cleanup(cleanDataSources: Boolean){
+    private fun cleanup(){
         websocketEvents.clearListener(webSocketEventListener)
-
-        if(cleanDataSources) {
-            dataSource.listener = null
-            generalDataSource.listener = null
-        }
     }
 
     private fun showSuspendedAccountDialog(){
@@ -364,7 +357,7 @@ class LinkingController(
 
 
     override fun onStop() {
-        cleanup(true)
+        cleanup()
     }
 
     override fun onBackPressed(): Boolean {

diff --git a/src/main/kotlin/com/criptext/mail/scenes/mailbox/MailboxSceneController.kt b/src/main/kotlin/com/criptext/mail/scenes/mailbox/MailboxSceneController.kt
@@ -630,8 +630,6 @@ class MailboxSceneController(private val scene: MailboxScene,
 
     override fun onResume(activityMessage: ActivityMessage?): Boolean {
         websocketEvents.setListener(webSocketEventListener)
-        if(dataSource.listener == null) dataSourceController.setDataSourceListener()
-        if(generalDataSource.listener == null) generalDataSource.listener = removedDeviceDataSourceListener
         return handleActivityMessage(activityMessage)
     }
 
@@ -697,12 +695,10 @@ class MailboxSceneController(private val scene: MailboxScene,
         cleanup(true)
     }
 
-    private fun cleanup(cleanDataSources: Boolean){
+    private fun cleanup(fullCleanup: Boolean){
         websocketEvents.clearListener(webSocketEventListener)
 
-        if(cleanDataSources) {
-            dataSource.listener = null
-            generalDataSource.listener = null
+        if(fullCleanup) {
             feedController.onStop()
         }
     }

diff --git a/src/main/kotlin/com/criptext/mail/scenes/mailbox/emailsource/EmailSourceController.kt b/src/main/kotlin/com/criptext/mail/scenes/mailbox/emailsource/EmailSourceController.kt
@@ -100,7 +100,6 @@ class EmailSourceController(
     }
 
     override fun onResume(activityMessage: ActivityMessage?): Boolean {
-        if(generalDataSource.listener == null) generalDataSource.listener = generalDataSourceListener
         return false
     }
 
@@ -159,18 +158,15 @@ class EmailSourceController(
     }
 
     override fun onPause() {
-        cleanup(false)
+        cleanup()
     }
 
     override fun onStop() {
-        cleanup(true)
+        cleanup()
     }
 
-    private fun cleanup(cleanDataSources: Boolean){
+    private fun cleanup(){
         websocketEvents.clearListener(webSocketEventListener)
-        if(cleanDataSources){
-            generalDataSource.listener = null
-        }
     }
 
     private val webSocketEventListener = object : WebSocketEventListener {

diff --git a/src/main/kotlin/com/criptext/mail/scenes/restorebackup/RestoreBackupController.kt b/src/main/kotlin/com/criptext/mail/scenes/restorebackup/RestoreBackupController.kt
@@ -362,19 +362,15 @@ class RestoreBackupController(
     }
 
     override fun onPause() {
-        cleanup(false)
+        cleanup()
     }
 
     override fun onStop() {
-        cleanup(true)
+        cleanup()
     }
 
-    private fun cleanup(cleanDataSources: Boolean){
+    private fun cleanup(){
         websocketEvents.clearListener(webSocketEventListener)
-        if(cleanDataSources) {
-            generalDataSource.listener = null
-            dataSource.listener = null
-        }
     }
 
     override fun onBackPressed(): Boolean {

diff --git a/src/main/kotlin/com/criptext/mail/scenes/settings/SettingsController.kt b/src/main/kotlin/com/criptext/mail/scenes/settings/SettingsController.kt
@@ -242,8 +242,6 @@ class SettingsController(
     }
 
     override fun onResume(activityMessage: ActivityMessage?): Boolean {
-        if(dataSource.listener == null) dataSource.listener = dataSourceListener
-        if(generalDataSource.listener == null) generalDataSource.listener = generalDataSourceListener
         websocketEvents.setListener(webSocketEventListener)
         return false
     }
@@ -256,19 +254,15 @@ class SettingsController(
     }
 
     override fun onPause() {
-        cleanup(false)
+        cleanup()
     }
 
     override fun onStop() {
-        cleanup(true)
+        cleanup()
     }
 
-    private fun cleanup(cleanDataSources: Boolean){
+    private fun cleanup(){
         websocketEvents.clearListener(webSocketEventListener)
-        if(cleanDataSources){
-            generalDataSource.listener = null
-            dataSource.listener = null
-        }
     }
 
     override fun onBackPressed(): Boolean {

diff --git a/src/main/kotlin/com/criptext/mail/scenes/settings/changepassword/ChangePasswordController.kt b/src/main/kotlin/com/criptext/mail/scenes/settings/changepassword/ChangePasswordController.kt
@@ -158,8 +158,6 @@ class ChangePasswordController(
     }
 
     override fun onResume(activityMessage: ActivityMessage?): Boolean {
-        if(dataSource.listener == null) dataSource.listener = dataSourceListener
-        if(generalDataSource.listener == null) generalDataSource.listener = generalDataSourceListener
         websocketEvents.setListener(webSocketEventListener)
         return false
     }
@@ -290,19 +288,15 @@ class ChangePasswordController(
     }
 
     override fun onPause() {
-        cleanup(false)
+        cleanup()
     }
 
     override fun onStop() {
-        cleanup(true)
+        cleanup()
     }
 
-    private fun cleanup(cleanDataSources: Boolean){
+    private fun cleanup(){
         websocketEvents.clearListener(webSocketEventListener)
-        if(cleanDataSources){
-            dataSource.listener = null
-            generalDataSource.listener = null
-        }
     }
 
     private fun showSuspendedAccountDialog(){

diff --git a/src/main/kotlin/com/criptext/mail/scenes/settings/cloudbackup/CloudBackupController.kt b/src/main/kotlin/com/criptext/mail/scenes/settings/cloudbackup/CloudBackupController.kt
@@ -273,8 +273,6 @@ class CloudBackupController(
     }
 
     override fun onResume(activityMessage: ActivityMessage?): Boolean {
-        if(dataSource.listener == null) dataSource.listener = dataSourceListener
-        if(generalDataSource.listener == null) generalDataSource.listener = generalDataSourceListener
         websocketEvents.setListener(webSocketEventListener)
         return false
     }
@@ -583,19 +581,15 @@ class CloudBackupController(
     }
 
     override fun onPause() {
-        cleanup(false)
+        cleanup()
     }
 
     override fun onStop() {
-        cleanup(true)
+        cleanup()
     }
 
-    private fun cleanup(cleanDataSources: Boolean){
+    private fun cleanup(){
         websocketEvents.clearListener(webSocketEventListener)
-        if(cleanDataSources){
-            dataSource.listener = null
-            generalDataSource.listener = null
-        }
     }
 
     override fun onBackPressed(): Boolean {

diff --git a/src/main/kotlin/com/criptext/mail/scenes/settings/devices/DevicesController.kt b/src/main/kotlin/com/criptext/mail/scenes/settings/devices/DevicesController.kt
@@ -162,8 +162,6 @@ class DevicesController(
     }
 
     override fun onResume(activityMessage: ActivityMessage?): Boolean {
-        if(dataSource.listener == null) dataSource.listener = dataSourceListener
-        if(generalDataSource.listener == null) generalDataSource.listener = generalDataSourceListener
         websocketEvents.setListener(webSocketEventListener)
         return false
     }
@@ -381,20 +379,15 @@ class DevicesController(
     }
 
     override fun onPause() {
-        cleanup(false)
+        cleanup()
     }
 
     override fun onStop() {
-        cleanup(true)
+        cleanup()
     }
 
-    private fun cleanup(cleanDataSources: Boolean){
+    private fun cleanup(){
         websocketEvents.clearListener(webSocketEventListener)
-
-        if(cleanDataSources) {
-            dataSource.listener = null
-            generalDataSource.listener = null
-        }
     }
 
     override fun onBackPressed(): Boolean {

diff --git a/src/main/kotlin/com/criptext/mail/scenes/settings/labels/LabelsController.kt b/src/main/kotlin/com/criptext/mail/scenes/settings/labels/LabelsController.kt
@@ -146,8 +146,6 @@ class LabelsController(
     }
 
     override fun onResume(activityMessage: ActivityMessage?): Boolean {
-        if(dataSource.listener == null) dataSource.listener = dataSourceListener
-        if(generalDataSource.listener == null) generalDataSource.listener = generalDataSourceListener
         websocketEvents.setListener(webSocketEventListener)
         return false
     }
@@ -367,19 +365,15 @@ class LabelsController(
     }
 
     override fun onPause() {
-        cleanup(false)
+        cleanup()
     }
 
     override fun onStop() {
-        cleanup(true)
+        cleanup()
     }
 
-    private fun cleanup(cleanDataSources: Boolean){
+    private fun cleanup(){
         websocketEvents.clearListener(webSocketEventListener)
-        if(cleanDataSources){
-            dataSource.listener = null
-            generalDataSource.listener = null
-        }
     }
 
     override fun onBackPressed(): Boolean {

diff --git a/src/main/kotlin/com/criptext/mail/scenes/settings/pinlock/PinLockController.kt b/src/main/kotlin/com/criptext/mail/scenes/settings/pinlock/PinLockController.kt
@@ -142,7 +142,6 @@ class PinLockController(
     }
 
     override fun onResume(activityMessage: ActivityMessage?): Boolean {
-        if(generalDataSource.listener == null) generalDataSource.listener = generalDataSourceListener
         websocketEvents.setListener(webSocketEventListener)
         return false
     }
@@ -219,18 +218,15 @@ class PinLockController(
     }
 
     override fun onPause() {
-        cleanup(false)
+        cleanup()
     }
 
     override fun onStop() {
-        cleanup(true)
+        cleanup()
     }
 
-    private fun cleanup(cleanDataSources: Boolean){
+    private fun cleanup(){
         websocketEvents.clearListener(webSocketEventListener)
-        if(cleanDataSources){
-            generalDataSource.listener = null
-        }
     }
 
     private val webSocketEventListener = object : WebSocketEventListener {

diff --git a/src/main/kotlin/com/criptext/mail/scenes/settings/privacy/PrivacyController.kt b/src/main/kotlin/com/criptext/mail/scenes/settings/privacy/PrivacyController.kt
@@ -141,7 +141,6 @@ class PrivacyController(
     }
 
     override fun onResume(activityMessage: ActivityMessage?): Boolean {
-        if(generalDataSource.listener == null) generalDataSource.listener = generalDataSourceListener
         websocketEvents.setListener(webSocketEventListener)
         return false
     }
@@ -275,18 +274,15 @@ class PrivacyController(
     }
 
     override fun onPause() {
-        cleanup(false)
+        cleanup()
     }
 
     override fun onStop() {
-        cleanup(true)
+        cleanup()
     }
 
-    private fun cleanup(cleanDataSources: Boolean){
+    private fun cleanup(){
         websocketEvents.clearListener(webSocketEventListener)
-        if(cleanDataSources){
-            generalDataSource.listener = null
-        }
     }
 
     private fun showSuspendedAccountDialog(){