* #40116: Restore UI for Zrtp/TLS

res/values/arrays.xml

@@ -40,16 +40,16 @@ as that of the covered work.
         <item>@string/action_call_attended_transfer</item>
         <item>@string/action_call_conference</item>
     </string-array>
-    <!-- <string-array name="srtp_entry_values"> -->
-    <!-- <item>NONE</item> -->
-    <!-- <item>ZRTP</item> -->
-    <!-- <item>SDES</item> -->
-    <!-- </string-array> -->
-    <!-- <string-array name="srtp_entry"> -->
-    <!-- <item>@string/account_srtp_deactivated</item> -->
-    <!-- <item>ZRTP</item> -->
-    <!-- <item>SDES</item> -->
-    <!-- </string-array> -->
+    <string-array name="srtp_entry_values">
+        <item>NONE</item>
+        <item>ZRTP</item>
+        <item>SDES</item>
+    </string-array>
+    <string-array name="srtp_entry">
+        <item>@string/account_srtp_deactivated</item>
+        <item>ZRTP</item>
+        <item>SDES</item>
+    </string-array>
     <string-array name="dtmf_types_values">
         <item>overrtp</item>
         <item>sipinfo</item>

res/xml/account_security_prefs.xml

@@ -41,28 +41,28 @@ as that of the covered work.
             android:title="Credentials" >
         </Preference>
     </PreferenceCategory>
-<!--     <PreferenceCategory -->
-<!--         android:id="@+id/account_security_category" -->
-<!--         android:title="Security" > -->
-<!--         <Preference -->
-<!--             android:id="@+id/account_tls" -->
-<!--             android:key="TLS.details" -->
-<!--             android:persistent="false" -->
-<!--             android:title="TLS" /> -->
+     <PreferenceCategory
+         android:id="@+id/account_security_category"
+         android:title="Security" >
+         <Preference
+             android:id="@+id/account_tls"
+             android:key="TLS.details"
+             android:persistent="false"
+             android:title="TLS" />
 
-<!--         <ListPreference -->
-<!--             android:id="@+id/account_srtp_enable" -->
-<!--             android:entries="@array/srtp_entry" -->
-<!--             android:entryValues="@array/srtp_entry_values" -->
-<!--             android:key="SRTP.enable" -->
-<!--             android:persistent="false" -->
-<!--             android:title="SRTP Exchange" /> -->
+         <ListPreference
+             android:id="@+id/account_srtp_enable"
+             android:entries="@array/srtp_entry"
+             android:entryValues="@array/srtp_entry_values"
+             android:key="SRTP.enable"
+             android:persistent="false"
+             android:title="SRTP Exchange" />
 
-<!--         <Preference -->
-<!--             android:enabled="false" -->
-<!--             android:key="SRTP.details" -->
-<!--             android:title="SRTP Preferences" > -->
-<!--         </Preference> -->
-<!--     </PreferenceCategory> -->
+         <Preference
+             android:enabled="false"
+             android:key="SRTP.details"
+             android:title="SRTP Preferences" >
+         </Preference>
+     </PreferenceCategory>
 
 </PreferenceScreen>
\ No newline at end of file

src/org/sflphone/fragments/SecurityAccountFragment.java

@@ -33,6 +33,7 @@ package org.sflphone.fragments;
 
 import java.util.Locale;
 
+import android.content.Intent;
 import org.sflphone.R;
 import org.sflphone.account.AccountDetail;
 import org.sflphone.account.AccountDetailSrtp;
@@ -117,23 +118,44 @@ public class SecurityAccountFragment extends PreferenceFragment {
 
             @Override
             public boolean onPreferenceClick(Preference preference) {
-                mCallbacks.displayCredentialsScreen();
+                performFileSearch();
+                //mCallbacks.displayCredentialsScreen();
                 return false;
             }
         });
 
-        // setSrtpPreferenceDetails(mCallbacks.getAccount().getSrtpDetails());
-        // addPreferenceListener(mCallbacks.getAccount().getSrtpDetails(), changeSrtpModeListener);
-        //
-        // findPreference("TLS.details").setOnPreferenceClickListener(new OnPreferenceClickListener() {
-        //
-        // @Override
-        // public boolean onPreferenceClick(Preference preference) {
-        // mCallbacks.displayTLSScreen();
-        // return false;
-        // }
-        // });
+        setSrtpPreferenceDetails(mCallbacks.getAccount().getSrtpDetails());
+        addPreferenceListener(mCallbacks.getAccount().getSrtpDetails(), changeSrtpModeListener);
 
+        findPreference("TLS.details").setOnPreferenceClickListener(new OnPreferenceClickListener() {
+
+            @Override
+            public boolean onPreferenceClick(Preference preference) {
+                mCallbacks.displayTLSScreen();
+                return false;
+            }
+        });
+
+    }
+
+    private static final int READ_REQUEST_CODE = 42;
+    public void performFileSearch() {
+
+        // ACTION_OPEN_DOCUMENT is the intent to choose a file via the system's file
+        // browser.
+        Intent intent = new Intent(Intent.ACTION_OPEN_DOCUMENT);
+
+        // Filter to only show results that can be "opened", such as a
+        // file (as opposed to a list of contacts or timezones)
+        intent.addCategory(Intent.CATEGORY_OPENABLE);
+
+        // Filter to show only images, using the image MIME data type.
+        // If one wanted to search for ogg vorbis files, the type would be "audio/ogg".
+        // To search for all documents available via installed storage providers,
+        // it would be "*/*".
+        intent.setType("image/*");
+
+        startActivityForResult(intent, READ_REQUEST_CODE);
     }
 
     public void setCredentialSummary() {