Avoid cipher initalization for missing prefs

valldrac · valldrac · commit 0be9901b63b8 · 2026-04-04T12:00:13.000+02:00
diff --git a/app/src/main/java/org/thoughtcrime/securesms/crypto/EncryptedPreferences.java b/app/src/main/java/org/thoughtcrime/securesms/crypto/EncryptedPreferences.java
@@ -367,11 +367,10 @@ private Object getDecryptedObject(String key) {
       }
     }
     Object value = null;
-    MasterCipher masterCipher = getCipher();
     synchronized (cache) {
       String encryptedValue = sharedPreferences.getString(key, null);
       if (encryptedValue != null) {
-        byte[] bytes = decrypt(key, encryptedValue, masterCipher);
+        byte[] bytes = decrypt(key, encryptedValue, getCipher());
         ByteBuffer buffer = ByteBuffer.wrap(bytes);
         buffer.position(0);
         int typeId = buffer.getInt();

Original file line number	Diff line number	Diff line change
`@@ -367,11 +367,10 @@ private Object getDecryptedObject(String key) {`
`367`	`367`	`}`
`368`	`368`	`}`
`369`	`369`	`Object value = null;`
`370`		`- MasterCipher masterCipher = getCipher();`
`371`	`370`	`synchronized (cache) {`
`372`	`371`	`String encryptedValue = sharedPreferences.getString(key, null);`
`373`	`372`	`if (encryptedValue != null) {`
`374`		`- byte[] bytes = decrypt(key, encryptedValue, masterCipher);`
	`373`	`+ byte[] bytes = decrypt(key, encryptedValue, getCipher());`
`375`	`374`	`ByteBuffer buffer = ByteBuffer.wrap(bytes);`
`376`	`375`	`buffer.position(0);`
`377`	`376`	`int typeId = buffer.getInt();`