commit c9c30b73f9fceae01d912a7153576adfdc8a6a74
author Alexandre Lision <alexandre.lision@savoirfairelinux.com> Mon Nov 18 16:27:26 2013 -0500
committer Alexandre Lision <alexandre.lision@savoirfairelinux.com> Mon Nov 18 16:27:26 2013 -0500
tree 4c652d6fd9df1133d37e7de541ad6b1252a52d55
parent dd5d8ded60608b295a41a3857a03acbda3603ac5

* #34699: persistent SRTP preferences, TLS not working

src/org/sflphone/account/AccountDetailSrtp.java

diff --git a/src/org/sflphone/account/AccountDetailSrtp.java b/src/org/sflphone/account/AccountDetailSrtp.java
index 05d5451..016e713 100644
--- a/src/org/sflphone/account/AccountDetailSrtp.java
+++ b/src/org/sflphone/account/AccountDetailSrtp.java
@@ -31,7 +31,6 @@
 public class AccountDetailSrtp implements AccountDetail{
 
     private static final String TAG = "AccountDetailSrtp";
-    public static final String BUNDLE_TAG = "SrtpPreferenceArrayList";
     
     public static final String CONFIG_SRTP_ENABLE = "SRTP.enable";
     public static final String CONFIG_SRTP_KEY_EXCHANGE = "SRTP.keyExchange";
@@ -49,7 +48,7 @@
         ArrayList<AccountDetail.PreferenceEntry> preference = new ArrayList<AccountDetail.PreferenceEntry>();
 
         preference.add(new PreferenceEntry(CONFIG_SRTP_ENABLE, R.string.account_srtp_enabled_label, true));
-        preference.add(new PreferenceEntry(CONFIG_SRTP_KEY_EXCHANGE, R.string.account_srtp_exchange_label, true));
+        preference.add(new PreferenceEntry(CONFIG_SRTP_KEY_EXCHANGE, R.string.account_srtp_exchange_label, false));
         preference.add(new PreferenceEntry(CONFIG_SRTP_ENCRYPTION_ALGO, R.string.account_encryption_algo_label, true));
         preference.add(new PreferenceEntry(CONFIG_SRTP_RTP_FALLBACK, R.string.account_srtp_fallback_label, true));
         preference.add(new PreferenceEntry(CONFIG_ZRTP_HELLO_HASH, R.string.account_hello_hash_enable_label, true));
@@ -68,9 +67,10 @@
     public AccountDetailSrtp(HashMap<String, String> pref)
     {
         privateArray = getPreferenceEntries();
-
         for(AccountDetail.PreferenceEntry p : privateArray) {
+            
             p.mValue = pref.get(p.mKey);
+            Log.i(TAG,p.mKey+" : "+p.mValue);
         }
     }
 
@@ -146,9 +146,12 @@
         
     }
 
-
-    public boolean getDetailBoolean()
-    {
-        return true;
+    public boolean getDetailBoolean(String srtpParam) {
+        for(AccountDetail.PreferenceEntry p : privateArray) {
+            if(p.mKey.equals(srtpParam)) {
+                return p.mValue.contentEquals("true");
+            }
+        }
+        return false;
     }
 }