From d6b4b19824b6cb4cdd86ad5ec28b65fc8bbeab86 Mon Sep 17 00:00:00 2001
From: SomberNight <somber.night@protonmail.com>
Date: Thu, 19 Dec 2019 20:39:12 +0100
Subject: [PATCH] kivy: allow generic passwords for wallets

---
 electrum/gui/kivy/theming/light/eye1.png      | Bin 0 -> 2910 bytes
 .../gui/kivy/uix/dialogs/password_dialog.py   |  68 +++++++++++++++---
 2 files changed, 60 insertions(+), 8 deletions(-)
 create mode 100644 electrum/gui/kivy/theming/light/eye1.png

diff --git a/electrum/gui/kivy/theming/light/eye1.png b/electrum/gui/kivy/theming/light/eye1.png
new file mode 100644
index 0000000000000000000000000000000000000000..0bded339f0f49f4ebb530dde10d07c60302e4e8f
GIT binary patch
literal 2910
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
IM6N<$g56b-Pyhe`

literal 0
HcmV?d00001

diff --git a/electrum/gui/kivy/uix/dialogs/password_dialog.py b/electrum/gui/kivy/uix/dialogs/password_dialog.py
index da121976f..9f73267e5 100644
--- a/electrum/gui/kivy/uix/dialogs/password_dialog.py
+++ b/electrum/gui/kivy/uix/dialogs/password_dialog.py
@@ -26,15 +26,59 @@ Builder.load_string('''
         orientation: 'vertical'
         Widget:
             size_hint: 1, 0.05
-        Label:
-            font_size: '20dp'
-            text: root.message
-            text_size: self.width, None
-            size: self.texture_size
+        BoxLayout:
+            size_hint: 1, None
+            orientation: 'horizontal'
+            Label:
+                size_hint: 0.70, None
+                font_size: '20dp'
+                text: root.message
+                text_size: self.width, None
+            Label:
+                size_hint: 0.23, None
+                font_size: '9dp'
+                text: _('Generic password')
+            CheckBox:
+                size_hint: 0.07, None
+                id: cb_generic_password
+                on_active:
+                    box_generic_password.visible = self.active
+                    kb.disabled = box_generic_password.visible
+                    textinput_generic_password.focus = box_generic_password.visible
         Widget:
             size_hint: 1, 0.05
+        BoxLayout:
+            orientation: 'horizontal'
+            id: box_generic_password
+            visible: False
+            size_hint_y: 0.05
+            opacity: 1 if self.visible else 0
+            disabled: not self.visible
+            WizardTextInput:
+                id: textinput_generic_password
+                valign: 'center'
+                multiline: False
+                on_text_validate:
+                    popup.on_password(self.text, is_generic=True)
+                password: True
+                size_hint: 0.9, None
+                unfocus_on_touch: False
+            Button:
+                size_hint: 0.1, None
+                valign: 'center'
+                background_normal: 'atlas://electrum/gui/kivy/theming/light/eye1'
+                background_down: self.background_normal
+                height: '50dp'
+                width: '50dp'
+                padding: '5dp', '5dp'
+                on_release:
+                    textinput_generic_password.password = False if textinput_generic_password.password else True
         Label:
-            id: a
+            id: label_pin
+            visible: not box_generic_password.visible
+            size_hint_y: 0.05
+            opacity: 1 if self.visible else 0
+            disabled: not self.visible
             font_size: '50dp'
             text: '*'*len(kb.password) + '-'*(6-len(kb.password))
             size: self.texture_size
@@ -88,11 +132,13 @@ class PasswordDialog(Factory.Popup):
         self.on_success = on_success
         self.on_failure = on_failure
         self.ids.kb.password = ''
+        self.ids.textinput_generic_password.text = ''
         self.success = False
         self.is_change = is_change
         self.pw = None
         self.new_password = None
         self.title = 'Electrum' + ('  -  ' + self.wallet.basename() if self.wallet else '')
+        self.ids.cb_generic_password.active = False
 
     def check_password(self, password):
         if self.is_change > 1:
@@ -126,8 +172,12 @@ class PasswordDialog(Factory.Popup):
             text += c
         kb.password = text
 
-    def on_password(self, pw):
-        if len(pw) == 6:
+    def on_password(self, pw: str, *, is_generic=False):
+        if is_generic:
+            if len(pw) < 6:
+                self.app.show_error(_('Password is too short (min {} characters)').format(6))
+                return
+        if len(pw) >= 6:
             if self.check_password(pw):
                 if self.is_change == 0:
                     self.success = True
@@ -138,11 +188,13 @@ class PasswordDialog(Factory.Popup):
                     self.pw = pw
                     self.message = _('Enter new PIN')
                     self.ids.kb.password = ''
+                    self.ids.textinput_generic_password.text = ''
                     self.is_change = 2
                 elif self.is_change == 2:
                     self.new_password = pw
                     self.message = _('Confirm new PIN')
                     self.ids.kb.password = ''
+                    self.ids.textinput_generic_password.text = ''
                     self.is_change = 3
                 elif self.is_change == 3:
                     self.success = pw == self.new_password