From a80f1538c78701726bca740d60cc2ce26e4e45cb Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Wed, 7 Oct 2020 18:08:37 +0200 Subject: [PATCH] Cleanup --- .../java/im/vector/app/core/platform/VectorBaseActivity.kt | 3 +-- .../im/vector/app/features/navigation/DefaultNavigator.kt | 5 ----- .../main/java/im/vector/app/features/navigation/Navigator.kt | 2 -- 3 files changed, 1 insertion(+), 9 deletions(-) diff --git a/vector/src/main/java/im/vector/app/core/platform/VectorBaseActivity.kt b/vector/src/main/java/im/vector/app/core/platform/VectorBaseActivity.kt index a8e070d79c..cdba5b2ef2 100644 --- a/vector/src/main/java/im/vector/app/core/platform/VectorBaseActivity.kt +++ b/vector/src/main/java/im/vector/app/core/platform/VectorBaseActivity.kt @@ -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() diff --git a/vector/src/main/java/im/vector/app/features/navigation/DefaultNavigator.kt b/vector/src/main/java/im/vector/app/features/navigation/DefaultNavigator.kt index 2aaaf0162d..106d804cd3 100644 --- a/vector/src/main/java/im/vector/app/features/navigation/DefaultNavigator.kt +++ b/vector/src/main/java/im/vector/app/features/navigation/DefaultNavigator.kt @@ -310,11 +310,6 @@ class DefaultNavigator @Inject constructor( activityResultLauncher.launch(intent) } - override fun openPinCode(activity: Activity, pinMode: PinMode, activityResultLauncher: ActivityResultLauncher) { - val intent = PinActivity.newIntent(activity, PinArgs(pinMode)) - activityResultLauncher.launch(intent) - } - override fun openMediaViewer(activity: Activity, roomId: String, mediaData: AttachmentData, diff --git a/vector/src/main/java/im/vector/app/features/navigation/Navigator.kt b/vector/src/main/java/im/vector/app/features/navigation/Navigator.kt index 81ff798ac8..05cba654f2 100644 --- a/vector/src/main/java/im/vector/app/features/navigation/Navigator.kt +++ b/vector/src/main/java/im/vector/app/features/navigation/Navigator.kt @@ -87,8 +87,6 @@ interface Navigator { activityResultLauncher: ActivityResultLauncher, pinMode: PinMode) - fun openPinCode(activity: Activity, pinMode: PinMode, activityResultLauncher: ActivityResultLauncher) - fun openTerms(context: Context, activityResultLauncher: ActivityResultLauncher, serviceType: TermsService.ServiceType,