move preference click/build info stuff into onCreate

2 files changed, 12 insertions, 43 deletions

diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/PreferencesFragment.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/PreferencesFragment.java
index b4f1ccdc..8816743e 100755
--- a/org.fox.ttrss/src/main/java/org/fox/ttrss/PreferencesFragment.java
+++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/PreferencesFragment.java
@@ -19,10 +19,18 @@ public class PreferencesFragment extends PreferenceFragment {
         // Load the preferences from an XML resource
         addPreferencesFromResource(R.xml.preferences);
 
-    }
-
-    public void onResume() {
-        super.onResume();
+        findPreference("network_settings").setOnPreferenceClickListener(new Preference.OnPreferenceClickListener() {
+            @Override
+            public boolean onPreferenceClick(Preference preference) {
+                getFragmentManager()
+                        .beginTransaction()
+                        .replace(R.id.preferences_container, new NetworkPreferencesFragment() )
+                        .addToBackStack( NetworkPreferencesFragment.class.getSimpleName() )
+                        .commit();
+
+                return false;
+            }
+        });
 
         try {
             String version;
@@ -43,19 +51,6 @@ public class PreferencesFragment extends PreferenceFragment {
 
             findPreference("build_timestamp").setSummary(getString(R.string.prefs_build_timestamp, buildTimestamp));
 
-            findPreference("network_settings").setOnPreferenceClickListener(new Preference.OnPreferenceClickListener() {
-                @Override
-                public boolean onPreferenceClick(Preference preference) {
-                    getFragmentManager()
-                            .beginTransaction()
-                            .replace(R.id.preferences_container, new NetworkPreferencesFragment() )
-                            .addToBackStack( NetworkPreferencesFragment.class.getSimpleName() )
-                            .commit();
-
-                    return false;
-                }
-            });
-
         } catch (PackageManager.NameNotFoundException e) {
             e.printStackTrace();
         }
diff --git a/org.fox.ttrss/src/main/res/xml/preferences.xml b/org.fox.ttrss/src/main/res/xml/preferences.xml
index cdf952a6..73f82c0b 100755
--- a/org.fox.ttrss/src/main/res/xml/preferences.xml
+++ b/org.fox.ttrss/src/main/res/xml/preferences.xml
@@ -28,32 +28,6 @@
             android:title="@string/prefs_network_settings" />
 
     </PreferenceCategory>
-    <!-- <PreferenceCategory android:title="@string/ssl" >
-        <org.fox.ttrss.util.LessBrokenSwitchPreference
-            android:defaultValue="false"
-            android:key="ssl_trust_any"
-            android:summary="@string/ssl_trust_any_long"
-            android:title="@string/ssl_trust_any" />
-        <org.fox.ttrss.util.LessBrokenSwitchPreference
-            android:defaultValue="false"
-            android:key="ssl_trust_any_host"
-            android:summary="@string/ssl_trust_any_host_long"
-            android:title="@string/ssl_trust_any_host" />
-    </PreferenceCategory>
-    <PreferenceCategory android:title="@string/http_authentication" >
-        <EditTextPreference
-            android:key="http_login"
-            android:singleLine="true"
-            android:summary="@string/http_login_summary"
-            android:title="@string/login" >
-        </EditTextPreference>
-        <EditTextPreference
-            android:key="http_password"
-            android:password="true"
-            android:singleLine="true"
-            android:title="@string/password" >
-        </EditTextPreference>
-    </PreferenceCategory> -->
     <PreferenceCategory
         android:key="category_look_and_feel"
         android:title="@string/look_and_feel" >