aboutsummaryrefslogtreecommitdiffstats
path: root/community/calamares-extensions/0004-mobile-tweak-invalid-chars-msg-related-comments.patch
diff options
context:
space:
mode:
Diffstat (limited to 'community/calamares-extensions/0004-mobile-tweak-invalid-chars-msg-related-comments.patch')
-rw-r--r--community/calamares-extensions/0004-mobile-tweak-invalid-chars-msg-related-comments.patch54
1 files changed, 0 insertions, 54 deletions
diff --git a/community/calamares-extensions/0004-mobile-tweak-invalid-chars-msg-related-comments.patch b/community/calamares-extensions/0004-mobile-tweak-invalid-chars-msg-related-comments.patch
deleted file mode 100644
index a7ecd185563..00000000000
--- a/community/calamares-extensions/0004-mobile-tweak-invalid-chars-msg-related-comments.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From 85586293c8a79884f1b61a2aa2873e9a914adf4f Mon Sep 17 00:00:00 2001
-From: Oliver Smith <ollieparanoid@postmarketos.org>
-Date: Sun, 2 May 2021 15:45:12 +0200
-Subject: [PATCH] [mobile] tweak invalid chars msg/related comments
-
-Change "cannot be typed in at boot time" to "can possibly not be typed
-in after installation" and explain that the same check is now used for
-the user password too.
----
- modules/mobile/mobile.qml | 18 ++++++++++++++----
- 1 file changed, 14 insertions(+), 4 deletions(-)
-
-diff --git a/modules/mobile/mobile.qml b/modules/mobile/mobile.qml
-index 6977061..3397263 100644
---- a/modules/mobile/mobile.qml
-+++ b/modules/mobile/mobile.qml
-@@ -55,8 +55,8 @@ Page
- }
- return ret;
- }())
-- /* Only allow characters, that can be typed in with the initramfs on-screen keyboard
-- * (osk-sdl: see src/keyboard.cpp). FIXME: make configurable, but keep this as default? */
-+ /* Only allow characters, that can be typed in with osk-sdl
-+ * (src/keyboard.cpp). Details in big comment in validatePassword(). */
- property var allowed_chars:
- /* layer 0 */ "abcdefghijklmnopqrstuvwxyz" +
- /* layer 1 */ "ABCDEFGHIJKLMNOPQRSTUVWXYZ" +
-@@ -389,11 +389,21 @@ Page
- if (pass == "")
- return validationFailure(errorText);
-
-+ /* This function gets called for the FDE password and for the user
-+ * password. As of writing, all distributions shipping the mobile
-+ * module are using osk-sdl to type in the FDE password after the
-+ * installation, and another keyboard after booting up, to type in the
-+ * user password. The osk-sdl password has the same keys as
-+ * squeekboard's default layout, and other keyboards should be able to
-+ * type these characters in as well. For now, verify that the password
-+ * only contains characters that can be typed in by osk-sdl. If you
-+ * need this to be more sophisticated, feel free to submit patches to
-+ * make this more configurable. */
- if (!check_chars(pass))
- return validationFailure(errorText,
- "The password must only contain" +
-- " these characters, others cannot be" +
-- " typed in at boot time:\n" +
-+ " these characters, others can possibly" +
-+ " not be typed in after installation:\n" +
- "\n" +
- allowed_chars_multiline());
-
---
-2.26.3
-