diff --git a/res/values/strings.xml b/res/values/strings.xml
index 8462ef899..09d098d6f 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -11,6 +11,7 @@
Default
Custom
None
+ Current
Automatic
Strict
Open
diff --git a/src/org/thoughtcrime/securesms/ConversationListActivity.java b/src/org/thoughtcrime/securesms/ConversationListActivity.java
index c002a1b5f..92a563918 100644
--- a/src/org/thoughtcrime/securesms/ConversationListActivity.java
+++ b/src/org/thoughtcrime/securesms/ConversationListActivity.java
@@ -268,7 +268,7 @@ public class ConversationListActivity extends PassphraseRequiredActionBarActivit
// build menu
ArrayList menu = new ArrayList<>();
for (AccountManager.Account account : accounts) {
- menu.add(account.getDescr());
+ menu.add(account.getDescr(this));
}
int addAccount = menu.size();
diff --git a/src/org/thoughtcrime/securesms/connect/AccountManager.java b/src/org/thoughtcrime/securesms/connect/AccountManager.java
index 8ad66f7d0..9667e441b 100644
--- a/src/org/thoughtcrime/securesms/connect/AccountManager.java
+++ b/src/org/thoughtcrime/securesms/connect/AccountManager.java
@@ -9,6 +9,7 @@ import androidx.annotation.Nullable;
import com.b44t.messenger.DcContext;
import org.thoughtcrime.securesms.ApplicationContext;
+import org.thoughtcrime.securesms.R;
import java.io.File;
import java.util.ArrayList;
@@ -22,7 +23,8 @@ public class AccountManager {
private String displayname;
private String addr;
private boolean configured;
- public String getDescr() {
+ private boolean current;
+ public String getDescr(Context context) {
String ret = "";
if (!displayname.isEmpty() && !addr.isEmpty()) {
ret = String.format("%s (%s)", displayname, addr);
@@ -34,6 +36,9 @@ public class AccountManager {
if (!configured) {
ret += " (not configured)";
}
+ if (current) {
+ ret += " (" + context.getString(R.string.current) + ")";
+ }
return ret;
}
};
@@ -90,12 +95,18 @@ public class AccountManager {
public ArrayList getAccounts(Context context) {
ArrayList result = new ArrayList<>();
+ String dbName = PreferenceManager.getDefaultSharedPreferences(context)
+ .getString("curr_account_db_name", "messenger.db");
+
try {
File dir = context.getFilesDir();
File[] files = dir.listFiles();
for (File file : files) {
Account account = maybeGetAccount(file);
if (account!=null) {
+ if (account.dbName.equals(dbName)) {
+ account.current = true;
+ }
result.add(account);
}
}