Make sure to ask for the Security Lock when the user tries to upgrade to LTM.

This commit is contained in:
Severiano Jaramillo 2019-04-25 14:53:02 -05:00
parent 40b7650353
commit 00a8b0546f

View file

@ -9,9 +9,7 @@ import android.util.Log
import android.view.LayoutInflater import android.view.LayoutInflater
import android.view.View import android.view.View
import android.view.ViewGroup import android.view.ViewGroup
import android.view.WindowManager
import androidx.appcompat.widget.Toolbar import androidx.appcompat.widget.Toolbar
import androidx.core.content.ContextCompat
import androidx.lifecycle.ViewModelProviders import androidx.lifecycle.ViewModelProviders
import com.afollestad.materialdialogs.MaterialDialog import com.afollestad.materialdialogs.MaterialDialog
import com.afollestad.materialdialogs.callbacks.onDismiss import com.afollestad.materialdialogs.callbacks.onDismiss
@ -54,6 +52,7 @@ class SettingsFragment : ConnectedFragment(), BaseSecurityLockDialog.OnPINPatter
// Constants used to perform security locked requests // Constants used to perform security locked requests
private const val ACTION_CHANGE_SECURITY_LOCK = 1 private const val ACTION_CHANGE_SECURITY_LOCK = 1
private const val ACTION_SHOW_BRAINKEY = 2 private const val ACTION_SHOW_BRAINKEY = 2
private const val ACTION_UPGRADE_TO_LTM = 3
// Constants used to organize NetworkService requests // Constants used to organize NetworkService requests
private const val RESPONSE_GET_DYNAMIC_GLOBAL_PROPERTIES_NODES = 1 private const val RESPONSE_GET_DYNAMIC_GLOBAL_PROPERTIES_NODES = 1
@ -355,10 +354,10 @@ class SettingsFragment : ConnectedFragment(), BaseSecurityLockDialog.OnPINPatter
} }
override fun onPINPatternEntered(actionIdentifier: Int) { override fun onPINPatternEntered(actionIdentifier: Int) {
if (actionIdentifier == ACTION_CHANGE_SECURITY_LOCK) { when (actionIdentifier) {
showChooseSecurityLockDialog() ACTION_CHANGE_SECURITY_LOCK -> showChooseSecurityLockDialog()
} else if (actionIdentifier == ACTION_SHOW_BRAINKEY) { ACTION_SHOW_BRAINKEY -> getBrainkey()
getBrainkey() ACTION_UPGRADE_TO_LTM -> showUpgradeToLTMDialog()
} }
} }
@ -425,6 +424,11 @@ class SettingsFragment : ConnectedFragment(), BaseSecurityLockDialog.OnPINPatter
getBrainkey() getBrainkey()
} }
private fun onUpgradeToLTMButtonSelected() {
if (!verifySecurityLock(ACTION_UPGRADE_TO_LTM))
showUpgradeToLTMDialog()
}
/** /**
* Obtains the brainKey from the authorities db table for the current user account and if it is not null it passes * Obtains the brainKey from the authorities db table for the current user account and if it is not null it passes
* the brainKey to a method to show it in a nice MaterialDialog * the brainKey to a method to show it in a nice MaterialDialog
@ -467,7 +471,7 @@ class SettingsFragment : ConnectedFragment(), BaseSecurityLockDialog.OnPINPatter
} }
} }
private fun onUpgradeToLTMButtonSelected() { private fun showUpgradeToLTMDialog() {
context?.let { context -> context?.let { context ->
val content = getString(R.string.msg__account_upgrade_dialog, mUserAccount?.name) val content = getString(R.string.msg__account_upgrade_dialog, mUserAccount?.name)
MaterialDialog(context).show { MaterialDialog(context).show {