From 5379f64d08ad22e2f7fbc38de9fa79b093c0c7f3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Tue, 8 Mar 2016 15:01:49 +0100
Subject: Revert "Use non-breaking spaces for backup code MaskedEditText"

This reverts commit 0feb4d074ce284bfed17e82a3cbc218209aff14a.

Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/BackupCodeFragment.java
---
 .../org/sufficientlysecure/keychain/ui/BackupCodeFragment.java   | 9 ++-------
 OpenKeychain/src/main/res/layout/backup_code_fragment.xml        | 2 --
 .../src/main/res/layout/passphrase_dialog_backup_code.xml        | 2 --
 3 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/BackupCodeFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/BackupCodeFragment.java
index 47552bf13..f1d9b270d 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/BackupCodeFragment.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/BackupCodeFragment.java
@@ -170,11 +170,7 @@ public class BackupCodeFragment extends CryptoOperationFragment<BackupKeyringPar
                 mTitleAnimator.setDisplayedChild(1, animate);
                 mStatusAnimator.setDisplayedChild(1, animate);
                 mCodeFieldsAnimator.setDisplayedChild(1, animate);
-                // use non-breaking spaces to enlarge the empty EditText appropriately
-                String empty = "\u00a0\u00a0\u00a0\u00a0-\u00a0\u00a0\u00a0\u00a0" +
-                        "-\u00a0\u00a0\u00a0\u00a0-\u00a0\u00a0\u00a0\u00a0" +
-                        "-\u00a0\u00a0\u00a0\u00a0-\u00a0\u00a0\u00a0\u00a0";
-                mCodeEditText.setText(empty);
+                mCodeEditText.setText("    -    -    -    -    -    ");
 
                 pushBackStackEntry();
 
@@ -354,8 +350,7 @@ public class BackupCodeFragment extends CryptoOperationFragment<BackupKeyringPar
                 String currentBackupCode = backupCode.getText().toString();
                 boolean inInputState = mCurrentState == BackupCodeState.STATE_INPUT
                         || mCurrentState == BackupCodeState.STATE_INPUT_ERROR;
-                boolean partIsComplete = (currentBackupCode.indexOf(' ') == -1)
-                        && (currentBackupCode.indexOf('\u00a0') == -1);
+                boolean partIsComplete = (currentBackupCode.indexOf(' ') == -1);
                 if (!inInputState || !partIsComplete) {
                     return;
                 }
diff --git a/OpenKeychain/src/main/res/layout/backup_code_fragment.xml b/OpenKeychain/src/main/res/layout/backup_code_fragment.xml
index 330f18d1c..619a1b3b1 100644
--- a/OpenKeychain/src/main/res/layout/backup_code_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/backup_code_fragment.xml
@@ -84,11 +84,9 @@
             android:textSize="18dp"
             android:textStyle="bold"
             android:typeface="monospace"
-            app:deleteChar="\u00a0"
             app:mask="****-****-****-****-****-****"
             app:maskIconColor="@color/colorPrimary"
             app:notMaskedSymbol="*"
-            app:replacementChar="\u00a0"
             tools:ignore="SpUsage" />
 
     </org.sufficientlysecure.keychain.ui.widget.ToolableViewAnimator>
diff --git a/OpenKeychain/src/main/res/layout/passphrase_dialog_backup_code.xml b/OpenKeychain/src/main/res/layout/passphrase_dialog_backup_code.xml
index b17c9dba7..a55033380 100644
--- a/OpenKeychain/src/main/res/layout/passphrase_dialog_backup_code.xml
+++ b/OpenKeychain/src/main/res/layout/passphrase_dialog_backup_code.xml
@@ -38,11 +38,9 @@
                 android:textSize="18dp"
                 android:textStyle="bold"
                 android:typeface="monospace"
-                app:deleteChar="\u00a0"
                 app:mask="****-****-****-****-****-****"
                 app:maskIconColor="@color/colorPrimary"
                 app:notMaskedSymbol="*"
-                app:replacementChar="\u00a0"
                 tools:ignore="SpUsage" />
 
         </LinearLayout>
-- 
cgit v1.2.3