From a76fa3d203f201456bf977f1004fd093dec594c0 Mon Sep 17 00:00:00 2001
From: Alexandre Savard <alexandre.savard@savoirfairelinux.com>
Date: Thu, 1 Nov 2012 14:01:57 -0400
Subject: [PATCH] #17195: Use account order to determine selected account at
startup
---
.../utils/AccountSelectionButton.java | 32 ++++++++++++++-----
1 file changed, 24 insertions(+), 8 deletions(-)
diff --git a/src/com/savoirfairelinux/sflphone/utils/AccountSelectionButton.java b/src/com/savoirfairelinux/sflphone/utils/AccountSelectionButton.java
index 69a074191..01b99a7ed 100644
--- a/src/com/savoirfairelinux/sflphone/utils/AccountSelectionButton.java
+++ b/src/com/savoirfairelinux/sflphone/utils/AccountSelectionButton.java
@@ -65,17 +65,33 @@ public class AccountSelectionButton extends Button
mContext = context;
final AccountSelectionButton b = this;
+ ArrayList<String> list = getAccountList();
+ if(list.size() > 1) {
+ list.remove("IP2IP");
+ setText(list.get(0));
+ } else {
+ setText("IP2IP");
+ }
+
setOnClickListener(new View.OnClickListener() {
public void onClick(View v) {
- try {
- ArrayList<String> list = (ArrayList<String>)mService.getAccountList();
- AccountSelectionDialog accountSelectionDialog = new AccountSelectionDialog(mContext, list, b);
- accountSelectionDialog.show();
- }
- catch (RemoteException e) {
- Log.e(TAG, "Remote exception", e);
- }
+ ArrayList<String> list = getAccountList();
+ AccountSelectionDialog accountSelectionDialog = new AccountSelectionDialog(mContext, list, b);
+ accountSelectionDialog.show();
}
});
}
+
+ public ArrayList<String> getAccountList() {
+ ArrayList<String> list = null;
+
+ try {
+ list = (ArrayList<String>)mService.getAccountList();
+ }
+ catch (RemoteException e) {
+ Log.e(TAG, "Remote exception", e);
+ }
+
+ return list;
+ }
}
--
GitLab