aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain
diff options
context:
space:
mode:
Diffstat (limited to 'OpenKeychain')
-rw-r--r--OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpDecryptVerify.java8
-rw-r--r--OpenKeychain/src/main/res/values/strings.xml2
2 files changed, 2 insertions, 8 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpDecryptVerify.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpDecryptVerify.java
index f72956981..953150b72 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpDecryptVerify.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpDecryptVerify.java
@@ -1194,12 +1194,6 @@ public class PgpDecryptVerify extends BaseOperation<PgpDecryptVerifyInputParcel>
private static byte[] getLineSeparator() {
String nl = System.getProperty("line.separator");
- byte[] nlBytes = new byte[nl.length()];
-
- for (int i = 0; i != nlBytes.length; i++) {
- nlBytes[i] = (byte) nl.charAt(i);
- }
-
- return nlBytes;
+ return nl.getBytes();
}
}
diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml
index be0135d0c..9a275455a 100644
--- a/OpenKeychain/src/main/res/values/strings.xml
+++ b/OpenKeychain/src/main/res/values/strings.xml
@@ -1394,7 +1394,7 @@
<item quantity="other">"Incorrect PIN!\n%d tries remaining."</item>
</plurals>
<string name="error_nfc_terminated">"YubiKey in termination state."</string>
- <string name="error_nfc_wrong_length">"Entered PIN is too short. PINs are at least 6 numbers long."</string>
+ <string name="error_nfc_wrong_length">"Entered PIN is too short. PINs are at least 6 digits long."</string>
<string name="error_nfc_conditions_not_satisfied">"Conditions of use not satisfied."</string>
<string name="error_nfc_security_not_satisfied">"Security status not satisfied."</string>
<string name="error_nfc_authentication_blocked">"PIN blocked after too many attempts."</string>