1 files changed, 35 insertions, 41 deletions

diff --git a/src/main/java/de/pixart/messenger/ui/SettingsFragment.java b/src/main/java/de/pixart/messenger/ui/SettingsFragment.java
index 8cea5eb61..939ef6145 100644
--- a/src/main/java/de/pixart/messenger/ui/SettingsFragment.java
+++ b/src/main/java/de/pixart/messenger/ui/SettingsFragment.java
@@ -1,64 +1,58 @@
 package de.pixart.messenger.ui;
 
-import android.app.Dialog;
+import android.content.Intent;
 import android.os.Bundle;
 import android.preference.Preference;
+import android.preference.PreferenceCategory;
 import android.preference.PreferenceFragment;
 import android.preference.PreferenceScreen;
-import android.view.View;
-import android.view.ViewGroup;
-import android.view.ViewParent;
-import android.widget.FrameLayout;
-import android.widget.LinearLayout;
+import android.text.TextUtils;
 
+import de.pixart.messenger.Config;
 import de.pixart.messenger.R;
 
 public class SettingsFragment extends PreferenceFragment {
 
-    //http://stackoverflow.com/questions/16374820/action-bar-home-button-not-functional-with-nested-preferencescreen/16800527#16800527
-    private void initializeActionBar(PreferenceScreen preferenceScreen) {
-        final Dialog dialog = preferenceScreen.getDialog();
+    private String page = null;
 
-        if (dialog != null) {
-            View homeBtn = dialog.findViewById(android.R.id.home);
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        addPreferencesFromResource(R.xml.preferences);
 
-            if (homeBtn != null) {
-                View.OnClickListener dismissDialogClickListener = new View.OnClickListener() {
-                    @Override
-                    public void onClick(View v) {
-                        dialog.dismiss();
-                    }
-                };
+        // Remove from standard preferences if the flag ONLY_INTERNAL_STORAGE is false
+        if (!Config.ONLY_INTERNAL_STORAGE) {
+            PreferenceCategory mCategory = (PreferenceCategory) findPreference("security_options");
+            if (mCategory != null) {
+                Preference cleanCache = findPreference("clean_cache");
+                Preference cleanPrivateStorage = findPreference("clean_private_storage");
+                mCategory.removePreference(cleanCache);
+                mCategory.removePreference(cleanPrivateStorage);
+            }
+        }
 
-                ViewParent homeBtnContainer = homeBtn.getParent();
+        if (!TextUtils.isEmpty(page)) {
+            openPreferenceScreen(page);
+        }
+    }
 
-                if (homeBtnContainer instanceof FrameLayout) {
-                    ViewGroup containerParent = (ViewGroup) homeBtnContainer.getParent();
-                    if (containerParent instanceof LinearLayout) {
-                        containerParent.setOnClickListener(dismissDialogClickListener);
-                    } else {
-                        ((FrameLayout) homeBtnContainer).setOnClickListener(dismissDialogClickListener);
-                    }
-                } else {
-                    homeBtn.setOnClickListener(dismissDialogClickListener);
+    public void setActivityIntent(final Intent intent) {
+        if (intent != null) {
+            if (Intent.ACTION_VIEW.equals(intent.getAction())) {
+                if (intent.getExtras() != null) {
+                    this.page = intent.getExtras().getString("page");
                 }
             }
         }
     }
 
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        // Load the preferences from an XML resource
-        addPreferencesFromResource(R.xml.preferences);
-    }
-
-    @Override
-    public boolean onPreferenceTreeClick(PreferenceScreen preferenceScreen, Preference preference) {
-        super.onPreferenceTreeClick(preferenceScreen, preference);
-        if (preference instanceof PreferenceScreen) {
-            initializeActionBar((PreferenceScreen) preference);
+    private void openPreferenceScreen(final String screenName) {
+        final Preference pref = findPreference(screenName);
+        if (pref instanceof PreferenceScreen) {
+            final PreferenceScreen preferenceScreen = (PreferenceScreen) pref;
+            getActivity().setTitle(preferenceScreen.getTitle());
+            preferenceScreen.setDependency("");
+            setPreferenceScreen((PreferenceScreen) pref);
         }
-        return false;
     }
 }