From 9ab573c8797836d29b5b9f82be6f41637f3d482e Mon Sep 17 00:00:00 2001
From: Florens Douwes <Floens@gmail.com>
Date: Sat, 3 May 2014 17:43:37 +0200
Subject: [PATCH] Remove delay of thread watcher options fragment showing.

---
 .../ui/activity/WatchSettingsActivity.java    | 38 ++++++++++---------
 1 file changed, 20 insertions(+), 18 deletions(-)

diff --git a/Chan/src/org/floens/chan/ui/activity/WatchSettingsActivity.java b/Chan/src/org/floens/chan/ui/activity/WatchSettingsActivity.java
index 1db89e83..5be65600 100644
--- a/Chan/src/org/floens/chan/ui/activity/WatchSettingsActivity.java
+++ b/Chan/src/org/floens/chan/ui/activity/WatchSettingsActivity.java
@@ -31,6 +31,8 @@ public class WatchSettingsActivity extends Activity implements OnCheckedChangeLi
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
+
+        setFragment(ChanPreferences.getWatchEnabled());
     }
 
     @Override
@@ -41,29 +43,18 @@ public class WatchSettingsActivity extends Activity implements OnCheckedChangeLi
         watchSwitch.setOnCheckedChangeListener(this);
         watchSwitch.setPadding(0, 0, Utils.dp(14), 0);
 
-        setEnabled(ChanPreferences.getWatchEnabled());
+        setSwitch(ChanPreferences.getWatchEnabled());
 
         return true;
     }
 
     @Override
     public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
-        setEnabled(isChecked);
+        setFragment(isChecked);
+        setSwitch(isChecked);
     }
 
-    private void setEnabled(boolean enabled) {
-        if (enabled) {
-            FragmentTransaction t = getFragmentManager().beginTransaction();
-            t.replace(android.R.id.content, new WatchSettingsFragment());
-            t.setTransition(FragmentTransaction.TRANSIT_FRAGMENT_FADE);
-            t.commit();
-        } else {
-            FragmentTransaction t = getFragmentManager().beginTransaction();
-            t.replace(android.R.id.content, TextFragment.newInstance(R.string.watch_info_text));
-            t.setTransition(FragmentTransaction.TRANSIT_FRAGMENT_FADE);
-            t.commit();
-        }
-
+    private void setSwitch(boolean enabled) {
         watchSwitch.setChecked(enabled);
 
         ChanPreferences.setWatchEnabled(enabled);
@@ -77,6 +68,20 @@ public class WatchSettingsActivity extends Activity implements OnCheckedChangeLi
         }, 500);
     }
 
+    private void setFragment(boolean enabled) {
+        if (enabled) {
+            FragmentTransaction t = getFragmentManager().beginTransaction();
+            t.replace(android.R.id.content, new WatchSettingsFragment());
+            t.setTransition(FragmentTransaction.TRANSIT_FRAGMENT_FADE);
+            t.commit();
+        } else {
+            FragmentTransaction t = getFragmentManager().beginTransaction();
+            t.replace(android.R.id.content, TextFragment.newInstance(R.string.watch_info_text));
+            t.setTransition(FragmentTransaction.TRANSIT_FRAGMENT_FADE);
+            t.commit();
+        }
+    }
+
     public static class TextFragment extends Fragment {
         public static TextFragment newInstance(int textResource) {
             TextFragment f = new TextFragment();
@@ -112,9 +117,6 @@ public class WatchSettingsActivity extends Activity implements OnCheckedChangeLi
 
             addPreferencesFromResource(R.xml.preference_watch);
 
-            // final Preference backgroundEnabled =
-            // findPreference("preference_watch_background_enabled");
-
             final ListPreference backgroundTimeout = (ListPreference) findPreference("preference_watch_background_timeout");
             String currentValue = backgroundTimeout.getValue();
             if (currentValue == null) {