Merge pull request #2637 from vector-im/feature/bma/investigation

Fix switch theme issue

CHANGES.md

@@ -19,6 +19,7 @@ Bugfix 🐛:
  - Tapping drawer having more than 1 room in notifications gives "malformed link" error (#2605)
  - Sent image not displayed when opened immediately after sending (#409)
  - Initial sync is not retried correctly when there is some network error. (#2632)
+ - Fix switch theme issue, and white field issue (#2599, #2528)
  - Fix request too large Uri error when joining a room
 
 Translations 🗣:

matrix-sdk-android/src/test/java/org/matrix/android/sdk/internal/task/CoroutineSequencersTest.kt

@@ -38,19 +38,16 @@ class CoroutineSequencersTest: MatrixTest {
 
         val jobs = listOf(
                 GlobalScope.launch(dispatcher) {
-                    sequencer.post { suspendingMethod("#1") }.also {
+                    sequencer.post { suspendingMethod("#1") }
-                        results.add(it)
+                            .also { results.add(it) }
-                    }
                 },
                 GlobalScope.launch(dispatcher) {
-                    sequencer.post { suspendingMethod("#2") }.also {
+                    sequencer.post { suspendingMethod("#2") }
-                        results.add(it)
+                            .also { results.add(it) }
-                    }
                 },
                 GlobalScope.launch(dispatcher) {
-                    sequencer.post { suspendingMethod("#3") }.also {
+                    sequencer.post { suspendingMethod("#3") }
-                        results.add(it)
+                            .also { results.add(it) }
-                    }
                 }
         )
         runBlocking {
@@ -70,19 +67,16 @@ class CoroutineSequencersTest: MatrixTest {
         val results = ArrayList<String>()
         val jobs = listOf(
                 GlobalScope.launch(dispatcher) {
-                    sequencer1.post { suspendingMethod("#1") }.also {
+                    sequencer1.post { suspendingMethod("#1") }
-                        results.add(it)
+                            .also { results.add(it) }
-                    }
                 },
                 GlobalScope.launch(dispatcher) {
-                    sequencer2.post { suspendingMethod("#2") }.also {
+                    sequencer2.post { suspendingMethod("#2") }
-                        results.add(it)
+                            .also { results.add(it) }
-                    }
                 },
                 GlobalScope.launch(dispatcher) {
-                    sequencer3.post { suspendingMethod("#3") }.also {
+                    sequencer3.post { suspendingMethod("#3") }
-                        results.add(it)
+                            .also { results.add(it) }
-                    }
                 }
         )
         runBlocking {
@@ -97,20 +91,17 @@ class CoroutineSequencersTest: MatrixTest {
         val results = ArrayList<String>()
         val jobs = listOf(
                 GlobalScope.launch(dispatcher) {
-                    sequencer.post { suspendingMethod("#1") }.also {
+                    sequencer.post { suspendingMethod("#1") }
-                        results.add(it)
+                            .also { results.add(it) }
-                    }
                 },
                 GlobalScope.launch(dispatcher) {
-                    val result = sequencer.post { suspendingMethod("#2") }.also {
+                    sequencer.post { suspendingMethod("#2") }
-                        results.add(it)
+                            .also { results.add(it) }
-                    }
+                            .also { println("Result: $it") }
-                    println("Result: $result")
                 },
                 GlobalScope.launch(dispatcher) {
-                    sequencer.post { suspendingMethod("#3") }.also {
+                    sequencer.post { suspendingMethod("#3") }
-                        results.add(it)
+                            .also { results.add(it) }
-                    }
                 }
         )
         // We are canceling the second job

vector/src/main/AndroidManifest.xml

@@ -82,8 +82,7 @@
         </activity-alias>
 
         <activity
-            android:name=".features.home.HomeActivity"
+            android:name=".features.home.HomeActivity" />
-            android:launchMode="singleTask" />
         <activity
             android:name=".features.login.LoginActivity"
             android:launchMode="singleTask"

vector/src/main/java/im/vector/app/features/MainActivity.kt

@@ -79,8 +79,6 @@ class MainActivity : VectorBaseActivity<FragmentLoadingBinding>(), UnlockedActiv
 
             intent.putExtra(EXTRA_ARGS, args)
             activity.startActivity(intent)
-            // Ensure all the Activities are destroyed, it seems that the intent flags are not enough now.
-            activity.finishAffinity()
         }
     }
 

vector/src/main/java/im/vector/app/features/crypto/verification/choose/VerificationChooseMethodViewModel.kt

@@ -89,8 +89,8 @@ class VerificationChooseMethodViewModel @AssistedInject constructor(
     }
 
     override fun onCleared() {
-        super.onCleared()
         session.cryptoService().verificationService().removeListener(this)
+        super.onCleared()
     }
 
     companion object : MvRxViewModelFactory<VerificationChooseMethodViewModel, VerificationChooseMethodViewState> {

vector/src/main/java/im/vector/app/features/discovery/DiscoverySettingsViewModel.kt

@@ -93,8 +93,8 @@ class DiscoverySettingsViewModel @AssistedInject constructor(
     }
 
     override fun onCleared() {
-        super.onCleared()
         stopListenToIdentityManager()
+        super.onCleared()
     }
 
     override fun handle(action: DiscoverySettingsAction) {

vector/src/main/java/im/vector/app/features/login/LoginViewModel.kt

@@ -810,9 +810,8 @@ class LoginViewModel @AssistedInject constructor(
     }
 
     override fun onCleared() {
-        super.onCleared()
-
         currentTask?.cancel()
+        super.onCleared()
     }
 
     fun getInitialHomeServerUrl(): String? {

vector/src/main/java/im/vector/app/features/roomdirectory/RoomDirectoryViewModel.kt

@@ -221,7 +221,7 @@ class RoomDirectoryViewModel @AssistedInject constructor(@Assisted initialState:
     }
 
     override fun onCleared() {
-        super.onCleared()
         currentTask?.cancel()
+        super.onCleared()
     }
 }

vector/src/main/java/im/vector/app/features/signout/soft/SoftLogoutViewModel.kt

@@ -232,8 +232,7 @@ class SoftLogoutViewModel @AssistedInject constructor(
     }
 
     override fun onCleared() {
-        super.onCleared()
-
         currentTask?.cancel()
+        super.onCleared()
     }
 }

vector/src/main/java/im/vector/app/features/workers/signout/ServerBackupStatusViewModel.kt

@@ -157,8 +157,8 @@ class ServerBackupStatusViewModel @AssistedInject constructor(@Assisted initialS
     }
 
     override fun onCleared() {
-        super.onCleared()
         session.cryptoService().keysBackupService().removeListener(this)
+        super.onCleared()
     }
 
     override fun onStateChange(newState: KeysBackupState) {

vector/src/main/java/im/vector/app/features/workers/signout/SignoutCheckViewModel.kt

@@ -107,8 +107,8 @@ class SignoutCheckViewModel @AssistedInject constructor(@Assisted initialState:
     }
 
     override fun onCleared() {
-        super.onCleared()
         session.cryptoService().keysBackupService().removeListener(this)
+        super.onCleared()
     }
 
     override fun onStateChange(newState: KeysBackupState) {