filippodb
/
SchildiChat-android
mirror of https://github.com/SchildiChat/SchildiChat-android.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Ensure the Activity is destroyed, it seems that the intent flags are not enough now.

This commit is contained in:
Benoit Marty 2020-11-27 15:15:56 +01:00
parent 9a8f45fc6f
commit 163f4cfaf2
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
vector/src/main/java/im/vector/app/features/MainActivity.kt
View File

@ -62,8 +62,8 @@ data class MainActivityArgs(
) : Parcelable ) : Parcelable
/** /**
* This is the entry point of RiotX * This is the entry point of Element Android
* This Activity, when started with argument, is also doing some cleanup when user disconnects, * This Activity, when started with argument, is also doing some cleanup when user signs out,
* clears cache, is logged out, or is soft logged out * clears cache, is logged out, or is soft logged out
*/ */
class MainActivity : VectorBaseActivity(), UnlockedActivity { class MainActivity : VectorBaseActivity(), UnlockedActivity {
@ -78,6 +78,8 @@ class MainActivity : VectorBaseActivity(), UnlockedActivity {
intent.putExtra(EXTRA_ARGS, args) intent.putExtra(EXTRA_ARGS, args)
activity.startActivity(intent) activity.startActivity(intent)
// Ensure the Activity is destroyed, it seems that the intent flags are not enough now.
activity.finish()
} }
} }

2
vector/src/main/java/im/vector/app/features/home/HomeActivityViewModel.kt
View File

@ -91,7 +91,7 @@ class HomeActivityViewModel @AssistedInject constructor(
val isVerified = it.getOrNull()?.isTrusted() ?: false val isVerified = it.getOrNull()?.isTrusted() ?: false
if (!isVerified && onceTrusted) { if (!isVerified && onceTrusted) {
// cross signing keys have been reset // cross signing keys have been reset
// Tigger a popup to re-verify // Trigger a popup to re-verify
// Note: user can be null in case of logout // Note: user can be null in case of logout
safeActiveSession.getUser(safeActiveSession.myUserId) safeActiveSession.getUser(safeActiveSession.myUserId)
?.toMatrixItem() ?.toMatrixItem()