From 064c0ddb823d8c0ce467ece2bff6d31069fb947d Mon Sep 17 00:00:00 2001 From: Alan Evans Date: Tue, 29 Oct 2019 09:59:53 -0400 Subject: [PATCH] Manually restrict to 30 digits to allow pasting containing any number of spaces. --- res/layout/enter_backup_passphrase_dialog.xml | 1 - .../registration/fragments/RestoreBackupFragment.java | 4 ++++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/res/layout/enter_backup_passphrase_dialog.xml b/res/layout/enter_backup_passphrase_dialog.xml index f4f2ccaa43..a4447416ec 100644 --- a/res/layout/enter_backup_passphrase_dialog.xml +++ b/res/layout/enter_backup_passphrase_dialog.xml @@ -16,7 +16,6 @@ android:hint="@string/enter_backup_passphrase_dialog__backup_passphrase" android:imeOptions="actionDone" android:inputType="number" - android:maxLength="35" android:textSize="16sp" /> diff --git a/src/org/thoughtcrime/securesms/registration/fragments/RestoreBackupFragment.java b/src/org/thoughtcrime/securesms/registration/fragments/RestoreBackupFragment.java index 14f031387f..cf7d6004a7 100644 --- a/src/org/thoughtcrime/securesms/registration/fragments/RestoreBackupFragment.java +++ b/src/org/thoughtcrime/securesms/registration/fragments/RestoreBackupFragment.java @@ -302,6 +302,10 @@ public final class RestoreBackupFragment extends BaseRegistrationFragment { for (int i = GROUP_SIZE; i < length; i += GROUP_SIZE) { editable.setSpan(new SpaceSpan(), i - 1, i, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE); } + + if (editable.length() > 30) { + editable.delete(30, editable.length()); + } } @Override