luckyimnotanigger/Aegis
1
0
Fork 0
mirror of https://github.com/beemdevelopment/Aegis.git synced 2025-04-24 15:56:07 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Rename slot type DERIVED to PASSWORD

Browse source
This commit is contained in:
Alexander Bakker 2022-06-06 13:55:19 +02:00
parent 0cfd78ace1
commit 8d3b2e2c9d
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/java/com/beemdevelopment/aegis/ui/AuthActivity.java
View file

@ -298,7 +298,7 @@ public class AuthActivity extends AegisActivity {
_slots.replace(result.getSlot()); _slots.replace(result.getSlot());
} }
if (result.getSlot().getType() == Slot.TYPE_DERIVED) { if (result.getSlot().getType() == Slot.TYPE_PASSWORD) {
_prefs.resetPasswordReminderTimestamp(); _prefs.resetPasswordReminderTimestamp();
} }

2
app/src/main/java/com/beemdevelopment/aegis/vault/slots/PasswordSlot.java
View file

@ -87,6 +87,6 @@ public class PasswordSlot extends RawSlot {
@Override @Override
public byte getType() { public byte getType() {
return TYPE_DERIVED; return TYPE_PASSWORD;
} }
} }

4
app/src/main/java/com/beemdevelopment/aegis/vault/slots/Slot.java
View file

@ -27,7 +27,7 @@ import javax.crypto.spec.SecretKeySpec;
public abstract class Slot extends UUIDMap.Value { public abstract class Slot extends UUIDMap.Value {
public final static byte TYPE_RAW = 0x00; public final static byte TYPE_RAW = 0x00;
public final static byte TYPE_DERIVED = 0x01; public final static byte TYPE_PASSWORD = 0x01;
public final static byte TYPE_BIOMETRIC = 0x02; public final static byte TYPE_BIOMETRIC = 0x02;
private byte[] _encryptedMasterKey; private byte[] _encryptedMasterKey;
@ -132,7 +132,7 @@ public abstract class Slot extends UUIDMap.Value {
case Slot.TYPE_RAW: case Slot.TYPE_RAW:
slot = new RawSlot(uuid, key, keyParams); slot = new RawSlot(uuid, key, keyParams);
break; break;
case Slot.TYPE_DERIVED: case Slot.TYPE_PASSWORD:
SCryptParameters scryptParams = new SCryptParameters( SCryptParameters scryptParams = new SCryptParameters(
obj.getInt("n"), obj.getInt("n"),
obj.getInt("r"), obj.getInt("r"),