odrling/norn-talk
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

ne pas demander le mot de passe lorsque l'utilisateur retourne d'un scan

Browse source
This commit is contained in:
odrling 2018-01-10 22:16:57 +01:00
parent f06a7a3542
commit 553b768903
2 changed files with 28 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/src/main/java/xyz/johnny/norntalk/ui_components/BaseActivity.kt
View file

@ -28,7 +28,7 @@ abstract class BaseActivity: AppCompatActivity() {
/**
* Activité courante de l'application
*/
private var currentActivity: BaseActivity? = null
var currentActivity: BaseActivity? = null
/**
* Algorithme de hachage utilisé
@ -71,7 +71,7 @@ abstract class BaseActivity: AppCompatActivity() {
override fun onResume() {
// demander le mot de passe si l'utilisateur est sorti de l'application
if (currentActivity == null)
if (currentActivity == null && !NornCaptureActivity.scanning)
if (this.preferences.getString(getString(R.string.password_key), getString(R.string.default_password)) != getString(R.string.default_password))
popUpPasswd(null)
@ -151,7 +151,7 @@ abstract class BaseActivity: AppCompatActivity() {
}
}
} else {
actionOk ={ dialogInterface ->
actionOk = { dialogInterface ->
val password = this.hash(etPasswd.text.toString())
//Enregistrer le mot de passe saisi

26
app/src/main/java/xyz/johnny/norntalk/ui_components/NornCaptureActivity.kt
View file

@ -6,4 +6,28 @@ import com.journeyapps.barcodescanner.CaptureActivity
* Activité pour scanner le QR code.
* Les valeurs du manifest permettent de garder l'orientation actuelle pour scanner le QR code
*/
class NornCaptureActivity : CaptureActivity()
class NornCaptureActivity : CaptureActivity() {
companion object {
/**
* permet de savoir quand l'utilisateur est en train de scanner un QR code
*/
var scanning = false
private set(value) { field = value}
}
override fun onResume() {
super.onResume()
scanning = true
}
override fun onStop() {
super.onStop()
scanning = true
}
}