require the pattern for disabling password protection

app/src/main/kotlin/com/simplemobiletools/gallery/activities/SettingsActivity.kt

@@ -144,16 +144,11 @@ class SettingsActivity : SimpleActivity() {
     private fun setupPasswordProtection() {
         settings_password_protection.isChecked = config.isPasswordProtectionOn
         settings_password_protection_holder.setOnClickListener {
-            PatternDialog(this) {
+            PatternDialog(this, config.passwordHash) {
-                if (config.isPasswordProtectionOn) {
+                val hasPasswordProtection = config.isPasswordProtectionOn
-                    settings_password_protection.isChecked = false
+                settings_password_protection.isChecked = !hasPasswordProtection
-                    config.isPasswordProtectionOn = false
+                config.isPasswordProtectionOn = !hasPasswordProtection
-                    config.passwordHash = ""
+                config.passwordHash = if (hasPasswordProtection) "" else it
-                } else {
-                    settings_password_protection.isChecked = true
-                    config.isPasswordProtectionOn = true
-                    config.passwordHash = it
-                }
             }
         }
     }

app/src/main/kotlin/com/simplemobiletools/gallery/dialogs/PatternDialog.kt

@@ -13,39 +13,19 @@ import com.simplemobiletools.gallery.activities.SimpleActivity
 import com.simplemobiletools.gallery.extensions.config
 import kotlinx.android.synthetic.main.dialog_pattern.view.*
 
-class PatternDialog(val activity: SimpleActivity, val callback: (hash: String) -> Unit) {
+class PatternDialog(val activity: SimpleActivity, val requiredHash: String, val callback: (hash: String) -> Unit) {
     var dialog: AlertDialog? = null
+    val view = LayoutInflater.from(activity).inflate(R.layout.dialog_pattern, null)
+
+    var hash = requiredHash
 
     init {
-        var hash = ""
-        val view = LayoutInflater.from(activity).inflate(R.layout.dialog_pattern, null)
         view.apply {
             pattern_lock_view.correctStateColor = activity.config.primaryColor
             pattern_lock_view.normalStateColor = activity.config.textColor
             pattern_lock_view.addPatternLockListener(object : PatternLockViewListener {
                 override fun onComplete(pattern: MutableList<PatternLockView.Dot>?) {
-                    if (hash.isEmpty()) {
+                    receivedHash(PatternLockUtils.patternToSha1(pattern_lock_view, pattern))
-                        hash = PatternLockUtils.patternToSha1(pattern_lock_view, pattern)
-                        pattern_lock_view.clearPattern()
-                        pattern_dialog_title.setText(R.string.repeat_pattern)
-                    } else {
-                        val newHash = PatternLockUtils.patternToSha1(pattern_lock_view, pattern)
-                        if (hash == newHash) {
-                            pattern_lock_view.setViewMode(PatternLockView.PatternViewMode.CORRECT)
-                            Handler().postDelayed({
-                                callback(hash)
-                                dialog!!.dismiss()
-                            }, 300)
-                        } else {
-                            pattern_lock_view.setViewMode(PatternLockView.PatternViewMode.WRONG)
-                            activity.toast(R.string.wrong_pattern)
-                            Handler().postDelayed({
-                                hash = ""
-                                pattern_lock_view.clearPattern()
-                                pattern_dialog_title.setText(R.string.select_pattern)
-                            }, 1000)
-                        }
-                    }
                 }
 
                 override fun onCleared() {
@@ -65,4 +45,32 @@ class PatternDialog(val activity: SimpleActivity, val callback: (hash: String) -
             activity.setupDialogStuff(view, this)
         }
     }
+
+    private fun receivedHash(newHash: String) {
+        view.apply {
+            if (hash.isEmpty()) {
+                hash = newHash
+                pattern_lock_view.clearPattern()
+                pattern_dialog_title.setText(R.string.repeat_pattern)
+            } else {
+                if (hash == newHash) {
+                    pattern_lock_view.setViewMode(PatternLockView.PatternViewMode.CORRECT)
+                    Handler().postDelayed({
+                        callback(hash)
+                        dialog!!.dismiss()
+                    }, 300)
+                } else {
+                    pattern_lock_view.setViewMode(PatternLockView.PatternViewMode.WRONG)
+                    activity.toast(R.string.wrong_pattern)
+                    Handler().postDelayed({
+                        pattern_lock_view.clearPattern()
+                        if (requiredHash.isEmpty()) {
+                            hash = ""
+                            pattern_dialog_title.setText(R.string.insert_pattern)
+                        }
+                    }, 1000)
+                }
+            }
+        }
+    }
 }

app/src/main/res/layout/dialog_pattern.xml

@@ -10,7 +10,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:padding="@dimen/activity_margin"
-        android:text="@string/select_pattern"/>
+        android:text="@string/insert_pattern"/>
 
     <com.andrognito.patternlockview.PatternLockView
         android:id="@+id/pattern_lock_view"

app/src/main/res/values-cs/strings.xml

@@ -85,7 +85,7 @@
     <string name="wrong_pin">Wrong PIN</string>
     <string name="repeat_pin">Repeat PIN</string>
     <string name="pattern">Pattern</string>
-    <string name="select_pattern">Select pattern</string>
+    <string name="insert_pattern">Insert pattern</string>
     <string name="wrong_pattern">Wrong pattern</string>
     <string name="repeat_pattern">Repeat pattern</string>
 

app/src/main/res/values-de/strings.xml

@@ -85,7 +85,7 @@
     <string name="wrong_pin">Wrong PIN</string>
     <string name="repeat_pin">Repeat PIN</string>
     <string name="pattern">Pattern</string>
-    <string name="select_pattern">Select pattern</string>
+    <string name="insert_pattern">Insert pattern</string>
     <string name="wrong_pattern">Wrong pattern</string>
     <string name="repeat_pattern">Repeat pattern</string>
 

app/src/main/res/values-es/strings.xml

@@ -85,7 +85,7 @@
     <string name="wrong_pin">Wrong PIN</string>
     <string name="repeat_pin">Repeat PIN</string>
     <string name="pattern">Pattern</string>
-    <string name="select_pattern">Select pattern</string>
+    <string name="insert_pattern">Insert pattern</string>
     <string name="wrong_pattern">Wrong pattern</string>
     <string name="repeat_pattern">Repeat pattern</string>
 

app/src/main/res/values-fr/strings.xml

@@ -85,7 +85,7 @@
     <string name="wrong_pin">Wrong PIN</string>
     <string name="repeat_pin">Repeat PIN</string>
     <string name="pattern">Pattern</string>
-    <string name="select_pattern">Select pattern</string>
+    <string name="insert_pattern">Insert pattern</string>
     <string name="wrong_pattern">Wrong pattern</string>
     <string name="repeat_pattern">Repeat pattern</string>
 

app/src/main/res/values-hu/strings.xml

@@ -85,7 +85,7 @@
     <string name="wrong_pin">Wrong PIN</string>
     <string name="repeat_pin">Repeat PIN</string>
     <string name="pattern">Pattern</string>
-    <string name="select_pattern">Select pattern</string>
+    <string name="insert_pattern">Insert pattern</string>
     <string name="wrong_pattern">Wrong pattern</string>
     <string name="repeat_pattern">Repeat pattern</string>
 

app/src/main/res/values-it/strings.xml

@@ -85,7 +85,7 @@
     <string name="wrong_pin">Wrong PIN</string>
     <string name="repeat_pin">Repeat PIN</string>
     <string name="pattern">Pattern</string>
-    <string name="select_pattern">Select pattern</string>
+    <string name="insert_pattern">Insert pattern</string>
     <string name="wrong_pattern">Wrong pattern</string>
     <string name="repeat_pattern">Repeat pattern</string>
 

app/src/main/res/values-ja/strings.xml

@@ -85,7 +85,7 @@
     <string name="wrong_pin">Wrong PIN</string>
     <string name="repeat_pin">Repeat PIN</string>
     <string name="pattern">Pattern</string>
-    <string name="select_pattern">Select pattern</string>
+    <string name="insert_pattern">Insert pattern</string>
     <string name="wrong_pattern">Wrong pattern</string>
     <string name="repeat_pattern">Repeat pattern</string>
 

app/src/main/res/values-pl/strings.xml

@@ -85,7 +85,7 @@
     <string name="wrong_pin">Wrong PIN</string>
     <string name="repeat_pin">Repeat PIN</string>
     <string name="pattern">Pattern</string>
-    <string name="select_pattern">Select pattern</string>
+    <string name="insert_pattern">Insert pattern</string>
     <string name="wrong_pattern">Wrong pattern</string>
     <string name="repeat_pattern">Repeat pattern</string>
 

app/src/main/res/values-pt-rBR/strings.xml

@@ -85,7 +85,7 @@
     <string name="wrong_pin">Wrong PIN</string>
     <string name="repeat_pin">Repeat PIN</string>
     <string name="pattern">Pattern</string>
-    <string name="select_pattern">Select pattern</string>
+    <string name="insert_pattern">Insert pattern</string>
     <string name="wrong_pattern">Wrong pattern</string>
     <string name="repeat_pattern">Repeat pattern</string>
 

app/src/main/res/values-pt/strings.xml

@@ -85,7 +85,7 @@
     <string name="wrong_pin">Wrong PIN</string>
     <string name="repeat_pin">Repeat PIN</string>
     <string name="pattern">Pattern</string>
-    <string name="select_pattern">Select pattern</string>
+    <string name="insert_pattern">Insert pattern</string>
     <string name="wrong_pattern">Wrong pattern</string>
     <string name="repeat_pattern">Repeat pattern</string>
 

app/src/main/res/values-ru/strings.xml

@@ -85,7 +85,7 @@
     <string name="wrong_pin">Wrong PIN</string>
     <string name="repeat_pin">Repeat PIN</string>
     <string name="pattern">Pattern</string>
-    <string name="select_pattern">Select pattern</string>
+    <string name="insert_pattern">Insert pattern</string>
     <string name="wrong_pattern">Wrong pattern</string>
     <string name="repeat_pattern">Repeat pattern</string>
 

app/src/main/res/values-sk/strings.xml

@@ -85,7 +85,7 @@
     <string name="wrong_pin">Nesprávny PIN</string>
     <string name="repeat_pin">Zopakujte PIN</string>
     <string name="pattern">Vzor</string>
-    <string name="select_pattern">Zvoľte vzor</string>
+    <string name="insert_pattern">Zadajte vzor</string>
     <string name="wrong_pattern">Nesprávny vzor</string>
     <string name="repeat_pattern">Zopakujte vzor</string>
 

app/src/main/res/values-sv/strings.xml

@@ -85,7 +85,7 @@
     <string name="wrong_pin">Wrong PIN</string>
     <string name="repeat_pin">Repeat PIN</string>
     <string name="pattern">Pattern</string>
-    <string name="select_pattern">Select pattern</string>
+    <string name="insert_pattern">Insert pattern</string>
     <string name="wrong_pattern">Wrong pattern</string>
     <string name="repeat_pattern">Repeat pattern</string>
 

app/src/main/res/values-tr/strings.xml

@@ -85,7 +85,7 @@
     <string name="wrong_pin">Wrong PIN</string>
     <string name="repeat_pin">Repeat PIN</string>
     <string name="pattern">Pattern</string>
-    <string name="select_pattern">Select pattern</string>
+    <string name="insert_pattern">Insert pattern</string>
     <string name="wrong_pattern">Wrong pattern</string>
     <string name="repeat_pattern">Repeat pattern</string>
 

app/src/main/res/values-zh-rCN/strings.xml

@@ -85,7 +85,7 @@
     <string name="wrong_pin">Wrong PIN</string>
     <string name="repeat_pin">Repeat PIN</string>
     <string name="pattern">Pattern</string>
-    <string name="select_pattern">Select pattern</string>
+    <string name="insert_pattern">Insert pattern</string>
     <string name="wrong_pattern">Wrong pattern</string>
     <string name="repeat_pattern">Repeat pattern</string>
 

app/src/main/res/values-zh-rTW/strings.xml

@@ -85,7 +85,7 @@
     <string name="wrong_pin">Wrong PIN</string>
     <string name="repeat_pin">Repeat PIN</string>
     <string name="pattern">Pattern</string>
-    <string name="select_pattern">Select pattern</string>
+    <string name="insert_pattern">Insert pattern</string>
     <string name="wrong_pattern">Wrong pattern</string>
     <string name="repeat_pattern">Repeat pattern</string>
 

app/src/main/res/values/strings.xml

@@ -85,7 +85,7 @@
     <string name="wrong_pin">Wrong PIN</string>
     <string name="repeat_pin">Repeat PIN</string>
     <string name="pattern">Pattern</string>
-    <string name="select_pattern">Select pattern</string>
+    <string name="insert_pattern">Insert pattern</string>
     <string name="wrong_pattern">Wrong pattern</string>
     <string name="repeat_pattern">Repeat pattern</string>