From 8d3b2e2c9d6888648b7e8d71da9997ef18333998 Mon Sep 17 00:00:00 2001
From: Alexander Bakker <ab@alexbakker.me>
Date: Mon, 6 Jun 2022 13:55:19 +0200
Subject: [PATCH] Rename slot type DERIVED to PASSWORD

---
 .../main/java/com/beemdevelopment/aegis/ui/AuthActivity.java  | 2 +-
 .../com/beemdevelopment/aegis/vault/slots/PasswordSlot.java   | 2 +-
 .../main/java/com/beemdevelopment/aegis/vault/slots/Slot.java | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/com/beemdevelopment/aegis/ui/AuthActivity.java b/app/src/main/java/com/beemdevelopment/aegis/ui/AuthActivity.java
index 14ec3e93..a09b468d 100644
--- a/app/src/main/java/com/beemdevelopment/aegis/ui/AuthActivity.java
+++ b/app/src/main/java/com/beemdevelopment/aegis/ui/AuthActivity.java
@@ -298,7 +298,7 @@ public class AuthActivity extends AegisActivity {
                     _slots.replace(result.getSlot());
                 }
 
-                if (result.getSlot().getType() == Slot.TYPE_DERIVED) {
+                if (result.getSlot().getType() == Slot.TYPE_PASSWORD) {
                     _prefs.resetPasswordReminderTimestamp();
                 }
 
diff --git a/app/src/main/java/com/beemdevelopment/aegis/vault/slots/PasswordSlot.java b/app/src/main/java/com/beemdevelopment/aegis/vault/slots/PasswordSlot.java
index 16455066..e140c165 100644
--- a/app/src/main/java/com/beemdevelopment/aegis/vault/slots/PasswordSlot.java
+++ b/app/src/main/java/com/beemdevelopment/aegis/vault/slots/PasswordSlot.java
@@ -87,6 +87,6 @@ public class PasswordSlot extends RawSlot {
 
     @Override
     public byte getType() {
-        return TYPE_DERIVED;
+        return TYPE_PASSWORD;
     }
 }
diff --git a/app/src/main/java/com/beemdevelopment/aegis/vault/slots/Slot.java b/app/src/main/java/com/beemdevelopment/aegis/vault/slots/Slot.java
index 6abf645d..73fd204b 100644
--- a/app/src/main/java/com/beemdevelopment/aegis/vault/slots/Slot.java
+++ b/app/src/main/java/com/beemdevelopment/aegis/vault/slots/Slot.java
@@ -27,7 +27,7 @@ import javax.crypto.spec.SecretKeySpec;
 
 public abstract class Slot extends UUIDMap.Value {
     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;
 
     private byte[] _encryptedMasterKey;
@@ -132,7 +132,7 @@ public abstract class Slot extends UUIDMap.Value {
                 case Slot.TYPE_RAW:
                     slot = new RawSlot(uuid, key, keyParams);
                     break;
-                case Slot.TYPE_DERIVED:
+                case Slot.TYPE_PASSWORD:
                     SCryptParameters scryptParams = new SCryptParameters(
                             obj.getInt("n"),
                             obj.getInt("r"),