Change PIN and Admin PIN after move to key operation

1 files changed, 8 insertions, 5 deletions

diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/Passphrase.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/Passphrase.java
index 06efdde4d..fe42c7a2c 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/Passphrase.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/Passphrase.java
@@ -117,6 +117,13 @@ public class Passphrase implements Parcelable {
         }
     }
 
+    /**
+     * Creates a new String from the char[]. This is considered unsafe!
+     */
+    public String toStringUnsafe() {
+        return new String(mPassphrase);
+    }
+
     @Override
     public boolean equals(Object o) {
         if (this == o) {
@@ -127,11 +134,7 @@ public class Passphrase implements Parcelable {
         }
 
         Passphrase that = (Passphrase) o;
-        if (!Arrays.equals(mPassphrase, that.mPassphrase)) {
-            return false;
-        }
-
-        return true;
+        return Arrays.equals(mPassphrase, that.mPassphrase);
     }
 
     @Override