From f0f4b08ef96f4597d897a2c4e9e151f4b3820afa Mon Sep 17 00:00:00 2001
From: Braden Farmer <farmerbb@gmail.com>
Date: Tue, 18 Feb 2020 00:54:29 -0700
Subject: [PATCH] Fixes

---
 .../farmerbb/taskbar/activity/MainActivity.java    |  4 ---
 .../taskbar/fragment/AdvancedFragment.java         | 33 +++++++++++++++-------
 2 files changed, 23 insertions(+), 14 deletions(-)

diff --git a/app/src/main/java/com/farmerbb/taskbar/activity/MainActivity.java b/app/src/main/java/com/farmerbb/taskbar/activity/MainActivity.java
index 63f15efe..67387334 100644
--- a/app/src/main/java/com/farmerbb/taskbar/activity/MainActivity.java
+++ b/app/src/main/java/com/farmerbb/taskbar/activity/MainActivity.java
@@ -381,10 +381,6 @@ public class MainActivity extends AppCompatActivity {
             if(oldFragment instanceof ManageAppDataFragment) {
                 newFragment = new AdvancedFragment();
                 tag = "AdvancedFragment";
-
-                Bundle bundle = new Bundle();
-                bundle.putBoolean("from_manage_app_data", true);
-                newFragment.setArguments(bundle);
             } else {
                 newFragment = new AboutFragment();
                 tag = "AboutFragment";
diff --git a/app/src/main/java/com/farmerbb/taskbar/fragment/AdvancedFragment.java b/app/src/main/java/com/farmerbb/taskbar/fragment/AdvancedFragment.java
index 2da75906..89ad9cbc 100644
--- a/app/src/main/java/com/farmerbb/taskbar/fragment/AdvancedFragment.java
+++ b/app/src/main/java/com/farmerbb/taskbar/fragment/AdvancedFragment.java
@@ -37,11 +37,12 @@ import androidx.localbroadcastmanager.content.LocalBroadcastManager;
 import androidx.appcompat.app.ActionBar;
 import androidx.appcompat.app.AlertDialog;
 import androidx.appcompat.app.AppCompatActivity;
+
+import android.preference.PreferenceManager;
 import android.view.View;
 import android.view.inputmethod.InputMethodManager;
 import android.widget.EditText;
 import android.widget.LinearLayout;
-import android.widget.ListView;
 
 import com.farmerbb.taskbar.BuildConfig;
 import com.farmerbb.taskbar.R;
@@ -111,14 +112,6 @@ public class AdvancedFragment extends SettingsFragment implements SharedPreferen
         if(!isLibrary)
             findPreference("launcher").setEnabled(!lockHomeToggle);
 
-        if(getArguments() != null && getArguments().getBoolean("from_manage_app_data", false)) {
-            View rootView = getView();
-            if(rootView != null) {
-                ListView list = rootView.findViewById(android.R.id.list);
-                if(list != null) list.scrollTo(0, Integer.MAX_VALUE);
-            }
-        }
-
         if(U.isExternalAccessDisabled(getActivity())) {
             addPreferencesFromResource(R.xml.tb_pref_advanced_extra_1);
             findPreference("clear_pinned_apps").setOnPreferenceClickListener(this);
@@ -352,8 +345,28 @@ public class AdvancedFragment extends SettingsFragment implements SharedPreferen
     }
 
     @Override
+    public void onStart() {
+        super.onStart();
+
+        // Register listener to check for changed preferences
+        if(!U.isLibrary(getActivity()))
+            PreferenceManager.getDefaultSharedPreferences(getActivity()).registerOnSharedPreferenceChangeListener(this);
+    }
+
+    @Override
+    public void onStop() {
+        super.onStop();
+
+        // Unregister listener
+        if(!U.isLibrary(getActivity()))
+            PreferenceManager.getDefaultSharedPreferences(getActivity()).unregisterOnSharedPreferenceChangeListener(this);
+    }
+
+    @Override
     public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String key) {
-        if(!U.isLibrary(getActivity()) && key.equals("tasker_enabled")) {
+        if(key.equals("tasker_enabled")) {
+            getPreferenceScreen().removePreference(findPreference("dummy"));
+
             boolean enabled = sharedPreferences.getBoolean(key, true);
 
             if(enabled) {
-- 
2.11.0