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

Cleanup

This commit is contained in:
Benoit Marty 2020-10-07 18:08:37 +02:00
parent 29d25c377b
commit a80f1538c7
3 changed files with 1 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
vector/src/main/java/im/vector/app/core/platform/VectorBaseActivity.kt
View File

@ -18,7 +18,6 @@ package im.vector.app.core.platform
import android.app.Activity
import android.content.Context
import android.content.Intent
import android.content.res.Configuration
import android.os.Bundle
import android.os.Parcelable
@ -206,7 +205,7 @@ abstract class VectorBaseActivity : AppCompatActivity(), HasScreenInjector {
})
pinLocker.getLiveState().observeNotNull(this) {
if (this@VectorBaseActivity !is UnlockedActivity && it == PinLocker.State.LOCKED) {
navigator.openPinCode(this, PinMode.AUTH, pinStartForActivityResult)
navigator.openPinCode(this, pinStartForActivityResult, PinMode.AUTH)
}
}
sessionListener = vectorComponent.sessionListener()

5
vector/src/main/java/im/vector/app/features/navigation/DefaultNavigator.kt
View File

@ -310,11 +310,6 @@ class DefaultNavigator @Inject constructor(
activityResultLauncher.launch(intent)
}
override fun openPinCode(activity: Activity, pinMode: PinMode, activityResultLauncher: ActivityResultLauncher<Intent>) {
val intent = PinActivity.newIntent(activity, PinArgs(pinMode))
activityResultLauncher.launch(intent)
}
override fun openMediaViewer(activity: Activity,
roomId: String,
mediaData: AttachmentData,

2
vector/src/main/java/im/vector/app/features/navigation/Navigator.kt
View File

@ -87,8 +87,6 @@ interface Navigator {
activityResultLauncher: ActivityResultLauncher<Intent>,
pinMode: PinMode)
fun openPinCode(activity: Activity, pinMode: PinMode, activityResultLauncher: ActivityResultLauncher<Intent>)
fun openTerms(context: Context,
activityResultLauncher: ActivityResultLauncher<Intent>,
serviceType: TermsService.ServiceType,