From f7a6b84b7c5bf80675c822caf2290bf42b3025e6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adrien=20B=C3=A9raud?= <adrien.beraud@savoirfairelinux.com>
Date: Thu, 13 Aug 2020 14:23:58 -0400
Subject: [PATCH] account: cache username
Change-Id: Ieea171bd1084ca04fb7d4f161ad67827c5ecfcf1
---
.../src/main/java/cx/ring/model/Account.java | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/ring-android/libringclient/src/main/java/cx/ring/model/Account.java b/ring-android/libringclient/src/main/java/cx/ring/model/Account.java
index acaf66d6c..c9bf85877 100644
--- a/ring-android/libringclient/src/main/java/cx/ring/model/Account.java
+++ b/ring-android/libringclient/src/main/java/cx/ring/model/Account.java
@@ -58,6 +58,8 @@ public class Account {
private AccountConfig mVolatileDetails;
private AccountConfig mDetails;
+ private String mUsername;
+
private final ArrayList<AccountCredentials> credentialsDetails = new ArrayList<>();
private Map<String, String> devices = new HashMap<>();
private final Map<String, CallContact> mContacts = new HashMap<>();
@@ -128,7 +130,7 @@ public class Account {
final List<Map<String, String>> credentials,
final Map<String, String> volDetails) {
accountID = bAccountID;
- mDetails = new AccountConfig(details);
+ setDetails(details);
mVolatileDetails = new AccountConfig(volDetails);
setCredentials(credentials);
}
@@ -371,7 +373,8 @@ public class Account {
}
public void setDetails(Map<String, String> details) {
- this.mDetails = new AccountConfig(details);
+ mDetails = new AccountConfig(details);
+ mUsername = mDetails.get(ConfigKey.ACCOUNT_USERNAME);
}
public void setDetail(ConfigKey key, String val) {
@@ -395,7 +398,7 @@ public class Account {
}
public String getUsername() {
- return mDetails.get(ConfigKey.ACCOUNT_USERNAME);
+ return mUsername;
}
public String getDisplayname() {
--
GitLab