mirrors/SchildiChat-android
1
0
Fork 0
mirror of https://github.com/SchildiChat/SchildiChat-android.git synced 2024-11-27 20:09:27 +03:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source 
Fix switch theme issue
This commit is contained in:
Benoit Marty 2021-01-14 10:39:13 +01:00 committed by GitHub
commit 1103d7c112
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
11 changed files with 28 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGES.md
View file

@ -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 🗣:

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

@ -38,19 +38,16 @@ class CoroutineSequencersTest: MatrixTest {
val jobs = listOf(
GlobalScope.launch(dispatcher) {
sequencer.post { suspendingMethod("#1") }.also {
results.add(it)
}
sequencer.post { suspendingMethod("#1") }
.also { results.add(it) }
},
GlobalScope.launch(dispatcher) {
sequencer.post { suspendingMethod("#2") }.also {
results.add(it)
}
sequencer.post { suspendingMethod("#2") }
.also { results.add(it) }
},
GlobalScope.launch(dispatcher) {
sequencer.post { suspendingMethod("#3") }.also {
results.add(it)
}
sequencer.post { suspendingMethod("#3") }
.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 {
results.add(it)
}
sequencer1.post { suspendingMethod("#1") }
.also { results.add(it) }
},
GlobalScope.launch(dispatcher) {
sequencer2.post { suspendingMethod("#2") }.also {
results.add(it)
}
sequencer2.post { suspendingMethod("#2") }
.also { results.add(it) }
},
GlobalScope.launch(dispatcher) {
sequencer3.post { suspendingMethod("#3") }.also {
results.add(it)
}
sequencer3.post { suspendingMethod("#3") }
.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 {
results.add(it)
}
sequencer.post { suspendingMethod("#1") }
.also { results.add(it) }
},
GlobalScope.launch(dispatcher) {
val result = sequencer.post { suspendingMethod("#2") }.also {
results.add(it)
}
println("Result: $result")
sequencer.post { suspendingMethod("#2") }
.also { results.add(it) }
.also { println("Result: $it") }
},
GlobalScope.launch(dispatcher) {
sequencer.post { suspendingMethod("#3") }.also {
results.add(it)
}
sequencer.post { suspendingMethod("#3") }
.also { results.add(it) }
}
)
// We are canceling the second job

3
vector/src/main/AndroidManifest.xml
View file

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

2
vector/src/main/java/im/vector/app/features/MainActivity.kt
View file

@ -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()
}
}

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

@ -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> {

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

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

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

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

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

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

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

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

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

@ -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) {

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

@ -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) {