rei-forks/element-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'feature/hughns/qr_code_login' of https://github.com/vector-im/element-android into feature/hughns/qr_code_login

Browse Source
This commit is contained in:
Hugh Nimmo-Smith 2022-10-19 09:12:18 +01:00
commit 025a89ff0c
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
vector/src/main/java/im/vector/app/features/login/qr/QrCodeLoginActivity.kt
View File

@ -24,6 +24,7 @@ import com.airbnb.mvrx.Mavericks
import com.airbnb.mvrx.viewModel import com.airbnb.mvrx.viewModel
import dagger.hilt.android.AndroidEntryPoint import dagger.hilt.android.AndroidEntryPoint
import im.vector.app.core.extensions.addFragment import im.vector.app.core.extensions.addFragment
import im.vector.app.core.extensions.replaceFragment
import im.vector.app.core.platform.SimpleFragmentActivity import im.vector.app.core.platform.SimpleFragmentActivity
import im.vector.app.features.home.HomeActivity import im.vector.app.features.home.HomeActivity
import im.vector.lib.core.utils.compat.getParcelableCompat import im.vector.lib.core.utils.compat.getParcelableCompat
@ -66,7 +67,7 @@ class QrCodeLoginActivity : SimpleFragmentActivity() {
} }
private fun showInstructionsFragment(qrCodeLoginArgs: QrCodeLoginArgs) { private fun showInstructionsFragment(qrCodeLoginArgs: QrCodeLoginArgs) {
addFragment( replaceFragment(
views.container, views.container,
QrCodeLoginInstructionsFragment::class.java, QrCodeLoginInstructionsFragment::class.java,
qrCodeLoginArgs, qrCodeLoginArgs,

5
vector/src/main/java/im/vector/app/features/login/qr/QrCodeLoginViewModel.kt
View File

@ -59,6 +59,11 @@ class QrCodeLoginViewModel @AssistedInject constructor(
} }
private fun handleTryAgain() { private fun handleTryAgain() {
setState {
copy(
connectionStatus = null
)
}
_viewEvents.post(QrCodeLoginViewEvents.NavigateToInitialScreen) _viewEvents.post(QrCodeLoginViewEvents.NavigateToInitialScreen)
} }