forked from thijooree/android
login sorting fixed
This commit is contained in:
@@ -14,6 +14,11 @@ import javax.crypto.spec.GCMParameterSpec
|
||||
|
||||
class CredentialStore(context: Context) {
|
||||
|
||||
companion object {
|
||||
/** Same format as BankAccount.loginTag / MibCard.loginTag, e.g. "bml_<loginId>". */
|
||||
fun loginKey(bank: String, loginId: String) = "${bank}_$loginId"
|
||||
}
|
||||
|
||||
private val prefs = context.getSharedPreferences("credential_store", Context.MODE_PRIVATE)
|
||||
private val keyAlias = "basedbank_credential_key"
|
||||
private val transformation = "AES/GCM/NoPadding"
|
||||
@@ -23,6 +28,37 @@ class CredentialStore(context: Context) {
|
||||
data class FahipayCredentials(val idCard: String, val password: String)
|
||||
data class MfaisaCredentials(val msisdn: String, val pin: String)
|
||||
|
||||
// ── Cross-bank login order (keys are login tags, see loginKey) ──────────
|
||||
|
||||
/** User-chosen order of all logins; logins not yet ordered (e.g. newly added) follow, bank by bank. */
|
||||
fun getLoginOrder(): List<String> {
|
||||
val all = getMibLoginIds().map { loginKey("mib", it) } +
|
||||
getBmlLoginIds().map { loginKey("bml", it) } +
|
||||
getFahipayLoginIds().map { loginKey("fahipay", it) } +
|
||||
getMfaisaLoginIds().map { loginKey("mfaisa", it) }
|
||||
val saved = try {
|
||||
val arr = org.json.JSONArray(prefs.getString("login_order", null) ?: "[]")
|
||||
(0 until arr.length()).map { arr.getString(it) }
|
||||
} catch (_: Exception) { emptyList() }
|
||||
return saved.filter { it in all } + all.filter { it !in saved }
|
||||
}
|
||||
|
||||
/** Position of a login tag in [getLoginOrder]; unknown tags sort last. */
|
||||
fun loginRank(): (String) -> Int {
|
||||
val order = getLoginOrder()
|
||||
return { tag -> order.indexOf(tag).let { if (it < 0) Int.MAX_VALUE else it } }
|
||||
}
|
||||
|
||||
/** Saves the combined order and keeps each bank's own login list in the same relative order. */
|
||||
fun setLoginOrder(keys: List<String>) {
|
||||
prefs.edit().putString("login_order", org.json.JSONArray(keys).toString()).apply()
|
||||
fun idsFor(bank: String) = keys.filter { it.startsWith("${bank}_") }.map { it.removePrefix("${bank}_") }
|
||||
setMibLoginIds(idsFor("mib"))
|
||||
setBmlLoginIds(idsFor("bml"))
|
||||
setFahipayLoginIds(idsFor("fahipay"))
|
||||
setMfaisaLoginIds(idsFor("mfaisa"))
|
||||
}
|
||||
|
||||
// ── MIB login credentials (multi-login, keyed by loginId = username) ─────
|
||||
|
||||
fun getMibLoginIds(): List<String> {
|
||||
|
||||
Reference in New Issue
Block a user