commit 509a755080851a2904ba5dbcabb64b2f0feef2d5
author Alexandre Lision <alexandre.lision@savoirfairelinux.com> Tue Mar 04 13:37:50 2014 -0500
committer Alexandre Lision <alexandre.lision@savoirfairelinux.com> Tue Mar 04 13:37:50 2014 -0500
tree ae1c7e5c82a2ae7e4656ae8e53bef8fdf5e64eb5
parent 2c41b501c948a62ccf7cd1bfed9a8233cfe99fff

Use Tls methods' list from daemon instead of defining them client side

Refs #42054

src/org/sflphone/account/TLSManager.java

diff --git a/src/org/sflphone/account/TLSManager.java b/src/org/sflphone/account/TLSManager.java
index 5032933..e59ccd5 100644
--- a/src/org/sflphone/account/TLSManager.java
+++ b/src/org/sflphone/account/TLSManager.java
@@ -31,37 +31,34 @@
 
 package org.sflphone.account;
 
-import android.app.Fragment;
-import android.content.Intent;
-import org.sflphone.fragments.NestedSettingsFragment;
-import org.sflphone.model.Account;
-
 import android.app.Activity;
+import android.content.Intent;
 import android.preference.CheckBoxPreference;
+import android.preference.ListPreference;
 import android.preference.Preference;
 import android.preference.Preference.OnPreferenceChangeListener;
 import android.preference.Preference.OnPreferenceClickListener;
 import android.preference.PreferenceScreen;
 import android.util.Log;
+import org.sflphone.fragments.NestedSettingsFragment;
+import org.sflphone.model.Account;
 
 import java.io.File;
 
 public class TLSManager {
     PreferenceScreen mScreen;
     private Account mAccount;
-    private Fragment mContext;
+    private NestedSettingsFragment mFrag;
     private static final String TAG = TLSManager.class.getSimpleName();
 
     public void onCreate(NestedSettingsFragment con, PreferenceScreen preferenceScreen, Account acc) {
-        mContext = con;
+        mFrag = con;
         mScreen = preferenceScreen;
         mAccount = acc;
-
         setDetails();
     }
 
     private void setDetails() {
-
         boolean activated = mAccount.getTlsDetails().getDetailBoolean(AccountDetailTls.CONFIG_TLS_ENABLE);
 
         for (int i = 0; i < mScreen.getPreferenceCount(); ++i) {
@@ -81,6 +78,10 @@
                 } else if (current.getKey().contentEquals(AccountDetailTls.CONFIG_TLS_CERTIFICATE_FILE)) {
                     current.setSummary(new File(mAccount.getTlsDetails().getDetailString(AccountDetailTls.CONFIG_TLS_CERTIFICATE_FILE)).getName());
                     current.setOnPreferenceClickListener(filePickerListener);
+                } else if (current.getKey().contentEquals(AccountDetailTls.CONFIG_TLS_METHOD)) {
+                    String[] values = mFrag.getTlsMethods();
+                    ((ListPreference)current).setEntries(values);
+                    ((ListPreference)current).setEntryValues(values);
                 } else {
                     current.setSummary(mAccount.getTlsDetails().getDetailString(mScreen.getPreference(i).getKey()));
                 }
@@ -164,7 +165,7 @@
         // To search for all documents available via installed storage providers,
         // it would be "*/*".
         intent.setType("*/*");
-        mContext.startActivityForResult(intent, requestCodeToSet);
+        mFrag.startActivityForResult(intent, requestCodeToSet);
     }
 
     public void onActivityResult(int requestCode, int resultCode, Intent data) {