fix: don't double encrypt on save

4 years ago · 596b02cfaf
parent 91aefb7c87
commit 596b02cfaf
1 changed files with 6 additions and 1 deletions
--- a/app/src/main/java/org/thoughtcrime/securesms/crypto/IdentityKeyUtil.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/crypto/IdentityKeyUtil.java
@ -139,7 +139,12 @@ public class IdentityKeyUtil {

    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
      KeyStoreHelper.SealedData encryptedSecret = KeyStoreHelper.seal(value.getBytes());
+      boolean isEncryptedSuffix = key.endsWith(ENCRYPTED_SUFFIX);
+      if (isEncryptedSuffix) {
+        preferencesEditor.putString(key, encryptedSecret.serialize());
+      } else {
        preferencesEditor.putString(key+ENCRYPTED_SUFFIX, encryptedSecret.serialize());
+      }
    } else {
      preferencesEditor.putString(key, value);
    }