cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Use non-breaking spaces for backup code MaskedEditText"

Browse Source 
This reverts commit 0feb4d074c.

Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/BackupCodeFragment.java
This commit is contained in:
Dominik Schürmann
2016-03-08 15:01:49 +01:00
parent d6520cde04
commit 5379f64d08
3 changed files with 2 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/BackupCodeFragment.java
View File

@@ -170,11 +170,7 @@ public class BackupCodeFragment extends CryptoOperationFragment<BackupKeyringPar
mTitleAnimator.setDisplayedChild(1, animate); mTitleAnimator.setDisplayedChild(1, animate);
mStatusAnimator.setDisplayedChild(1, animate); mStatusAnimator.setDisplayedChild(1, animate);
mCodeFieldsAnimator.setDisplayedChild(1, animate); mCodeFieldsAnimator.setDisplayedChild(1, animate);
// use non-breaking spaces to enlarge the empty EditText appropriately mCodeEditText.setText(" - - - - - ");
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);
pushBackStackEntry(); pushBackStackEntry();
@@ -354,8 +350,7 @@ public class BackupCodeFragment extends CryptoOperationFragment<BackupKeyringPar
String currentBackupCode = backupCode.getText().toString(); String currentBackupCode = backupCode.getText().toString();
boolean inInputState = mCurrentState == BackupCodeState.STATE_INPUT boolean inInputState = mCurrentState == BackupCodeState.STATE_INPUT
|| mCurrentState == BackupCodeState.STATE_INPUT_ERROR; || mCurrentState == BackupCodeState.STATE_INPUT_ERROR;
boolean partIsComplete = (currentBackupCode.indexOf(' ') == -1) boolean partIsComplete = (currentBackupCode.indexOf(' ') == -1);
&& (currentBackupCode.indexOf('\u00a0') == -1);
if (!inInputState || !partIsComplete) { if (!inInputState || !partIsComplete) {
return; return;
} }

2
OpenKeychain/src/main/res/layout/backup_code_fragment.xml
View File

@@ -84,11 +84,9 @@
android:textSize="18dp" android:textSize="18dp"
android:textStyle="bold" android:textStyle="bold"
android:typeface="monospace" android:typeface="monospace"
app:deleteChar="\u00a0"
app:mask="****-****-****-****-****-****" app:mask="****-****-****-****-****-****"
app:maskIconColor="@color/colorPrimary" app:maskIconColor="@color/colorPrimary"
app:notMaskedSymbol="*" app:notMaskedSymbol="*"
app:replacementChar="\u00a0"
tools:ignore="SpUsage" /> tools:ignore="SpUsage" />
</org.sufficientlysecure.keychain.ui.widget.ToolableViewAnimator> </org.sufficientlysecure.keychain.ui.widget.ToolableViewAnimator>

2
OpenKeychain/src/main/res/layout/passphrase_dialog_backup_code.xml
View File

@@ -38,11 +38,9 @@
android:textSize="18dp" android:textSize="18dp"
android:textStyle="bold" android:textStyle="bold"
android:typeface="monospace" android:typeface="monospace"
app:deleteChar="\u00a0"
app:mask="****-****-****-****-****-****" app:mask="****-****-****-****-****-****"
app:maskIconColor="@color/colorPrimary" app:maskIconColor="@color/colorPrimary"
app:notMaskedSymbol="*" app:notMaskedSymbol="*"
app:replacementChar="\u00a0"
tools:ignore="SpUsage" /> tools:ignore="SpUsage" />
</LinearLayout> </LinearLayout>