beenull/xpipe-mirror
1
0
Fork 0
mirror of https://github.com/xpipe-io/xpipe.git synced 2024-11-21 23:20:23 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix secrets not being properly rewritten when passphrase is removed

Browse source
This commit is contained in:
crschnick 2024-05-12 08:11:47 +00:00
parent 4fc95833e5
commit e32ee4da2f
1 changed files with 15 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
app/src/main/java/io/xpipe/app/storage/DataStoreSecret.java
View file

@ -36,9 +36,21 @@ public class DataStoreSecret {
}
public boolean requiresRewrite() {
return AppPrefs.get() != null
&& AppPrefs.get().getLockCrypt().get() != null
&& !Objects.equals(AppPrefs.get().getLockCrypt().get(), usedPasswordLockCrypt);
if (AppPrefs.get() == null) {
return false;
}
// Special check for empty passphrases
var wasEmpty = usedPasswordLockCrypt == null || usedPasswordLockCrypt.isEmpty();
var isEmpty = AppPrefs.get().getLockCrypt().get() == null || AppPrefs.get().getLockCrypt().get().isEmpty();
if (wasEmpty && isEmpty) {
return false;
}
if (wasEmpty != isEmpty) {
return true;
}
return !Objects.equals(AppPrefs.get().getLockCrypt().get(), usedPasswordLockCrypt);
}
public char[] getSecret() {