2 files changed, 18 insertions, 0 deletions
diff --git a/app/src/main/java/com/zeapo/pwdstore/utils/Extensions.kt b/app/src/main/java/com/zeapo/pwdstore/utils/Extensions.kt
index 96bf1b7e..561b8d99 100644
--- a/app/src/main/java/com/zeapo/pwdstore/utils/Extensions.kt
+++ b/app/src/main/java/com/zeapo/pwdstore/utils/Extensions.kt
@@ -9,6 +9,7 @@ import android.content.Context
 import android.content.Intent
 import android.content.SharedPreferences
 import android.os.Build
+import android.util.Base64
 import android.util.TypedValue
 import android.view.View
 import android.view.autofill.AutofillManager
@@ -42,6 +43,10 @@ fun String.splitLines(): Array<String> {
     return split("\n".toRegex()).dropLastWhile { it.isEmpty() }.toTypedArray()
 }
 
+fun String.base64(): String {
+    return Base64.encodeToString(encodeToByteArray(), Base64.NO_WRAP)
+}
+
 val Context.clipboard get() = getSystemService<ClipboardManager>()
 
 fun FragmentActivity.snackbar(
diff --git a/app/src/main/java/com/zeapo/pwdstore/utils/PasswordRepository.kt b/app/src/main/java/com/zeapo/pwdstore/utils/PasswordRepository.kt
index 8a49f0e3..45453d4f 100644
--- a/app/src/main/java/com/zeapo/pwdstore/utils/PasswordRepository.kt
+++ b/app/src/main/java/com/zeapo/pwdstore/utils/PasswordRepository.kt
@@ -4,6 +4,7 @@
  */
 package com.zeapo.pwdstore.utils
 
+import android.content.Context
 import android.content.SharedPreferences
 import androidx.core.content.edit
 import com.zeapo.pwdstore.Application
@@ -31,6 +32,18 @@ open class PasswordRepository protected constructor() {
             p1.name.compareTo(p2.name, ignoreCase = true)
         }),
 
+        RECENTLY_USED(Comparator { p1: PasswordItem, p2: PasswordItem ->
+            val recentHistory = Application.instance.getSharedPreferences("recent_password_history", Context.MODE_PRIVATE)
+            val timeP1 = recentHistory.getString(p1.file.absolutePath.base64())
+            val timeP2 = recentHistory.getString(p2.file.absolutePath.base64())
+            when {
+                timeP1 != null && timeP2 != null -> timeP2.compareTo(timeP1)
+                timeP1 != null && timeP2 == null -> return@Comparator -1
+                timeP1 == null && timeP2 != null -> return@Comparator 1
+                else -> p1.name.compareTo(p2.name, ignoreCase = true)
+            }
+        }),
+
         FILE_FIRST(Comparator { p1: PasswordItem, p2: PasswordItem ->
             (p2.type + p1.name).compareTo(p1.type + p2.name, ignoreCase = true)
         });