mir/Android-Password-Store
2
0
Fork 0
mirror of https://github.com/android-password-store/Android-Password-Store synced 2025-08-29 05:17:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

LaunchActivity: ensure V2 backend setting is respected (#1677)

Browse Source
This commit is contained in:
Harsh Shandilya 2022-01-23 23:25:31 +05:30 committed by GitHub
parent 81c2721883
commit 98010c7ff9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
app/src/main/java/dev/msfjarvis/aps/ui/main/LaunchActivity.kt
View File

@ -10,16 +10,24 @@ import android.os.Handler
import android.os.Looper import android.os.Looper
import androidx.appcompat.app.AppCompatActivity import androidx.appcompat.app.AppCompatActivity
import androidx.core.content.edit import androidx.core.content.edit
import dagger.hilt.android.AndroidEntryPoint
import dev.msfjarvis.aps.ui.crypto.BasePgpActivity import dev.msfjarvis.aps.ui.crypto.BasePgpActivity
import dev.msfjarvis.aps.ui.crypto.DecryptActivity import dev.msfjarvis.aps.ui.crypto.DecryptActivity
import dev.msfjarvis.aps.ui.crypto.DecryptActivityV2
import dev.msfjarvis.aps.ui.passwords.PasswordStore import dev.msfjarvis.aps.ui.passwords.PasswordStore
import dev.msfjarvis.aps.util.auth.BiometricAuthenticator import dev.msfjarvis.aps.util.auth.BiometricAuthenticator
import dev.msfjarvis.aps.util.auth.BiometricAuthenticator.Result import dev.msfjarvis.aps.util.auth.BiometricAuthenticator.Result
import dev.msfjarvis.aps.util.extensions.sharedPrefs import dev.msfjarvis.aps.util.extensions.sharedPrefs
import dev.msfjarvis.aps.util.features.Feature
import dev.msfjarvis.aps.util.features.Features
import dev.msfjarvis.aps.util.settings.PreferenceKeys import dev.msfjarvis.aps.util.settings.PreferenceKeys
import javax.inject.Inject
@AndroidEntryPoint
class LaunchActivity : AppCompatActivity() { class LaunchActivity : AppCompatActivity() {
@Inject lateinit var features: Features
override fun onCreate(savedInstanceState: Bundle?) { override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState) super.onCreate(savedInstanceState)
val prefs = sharedPrefs val prefs = sharedPrefs
@ -44,10 +52,18 @@ class LaunchActivity : AppCompatActivity() {
} }
} }
private fun getDecryptIntent(): Intent {
return if (features.isEnabled(Feature.EnablePGPainlessBackend)) {
Intent(this, DecryptActivityV2::class.java)
} else {
Intent(this, DecryptActivity::class.java)
}
}
private fun startTargetActivity(noAuth: Boolean) { private fun startTargetActivity(noAuth: Boolean) {
val intentToStart = val intentToStart =
if (intent.action == ACTION_DECRYPT_PASS) if (intent.action == ACTION_DECRYPT_PASS)
Intent(this, DecryptActivity::class.java).apply { getDecryptIntent().apply {
putExtra( putExtra(
BasePgpActivity.EXTRA_FILE_PATH, BasePgpActivity.EXTRA_FILE_PATH,
intent.getStringExtra(BasePgpActivity.EXTRA_FILE_PATH) intent.getStringExtra(BasePgpActivity.EXTRA_FILE_PATH)