From b6ac4cb2c0ce4468c58ebb8ad08ecb6ff8ea5958 Mon Sep 17 00:00:00 2001
From: Alex Baker <baker.alex@gmail.com>
Date: Fri, 7 Nov 2014 17:16:43 -0600
Subject: [PATCH] Move setupFragment method

---
 .../astrid/activity/AstridActivity.java       | 30 -------------
 .../astrid/activity/TaskListActivity.java     | 42 ++++++++++++++++---
 2 files changed, 36 insertions(+), 36 deletions(-)

diff --git a/astrid/src/main/java/com/todoroo/astrid/activity/AstridActivity.java b/astrid/src/main/java/com/todoroo/astrid/activity/AstridActivity.java
index 5751d55a6..f818d5009 100644
--- a/astrid/src/main/java/com/todoroo/astrid/activity/AstridActivity.java
+++ b/astrid/src/main/java/com/todoroo/astrid/activity/AstridActivity.java
@@ -254,36 +254,6 @@ public class AstridActivity extends InjectingActionBarActivity
         super.onBackPressed();
     }
 
-    // --- fragment helpers
-
-    protected Fragment setupFragment(String tag, int container, Class<? extends Fragment> cls) {
-        final FragmentManager fm = getSupportFragmentManager();
-        Fragment fragment = fm.findFragmentByTag(tag);
-        if(fragment == null) {
-            try {
-                fragment = cls.newInstance();
-            } catch (InstantiationException | IllegalAccessException e) {
-                log.error(e.getMessage(), e);
-                return null;
-            }
-            FragmentTransaction ft = getSupportFragmentManager().beginTransaction();
-            if (container == 0) {
-                ft.add(fragment, tag);
-            }
-            else {
-                ft.replace(container, fragment, tag);
-            }
-            ft.commit();
-            runOnUiThread(new Runnable() {
-                @Override
-                public void run() {
-                    fm.executePendingTransactions();
-                }
-            });
-        }
-        return fragment;
-    }
-
     // Voice recognizer callbacks
     @Override
     public void onSpeechResult(String result) {
diff --git a/astrid/src/main/java/com/todoroo/astrid/activity/TaskListActivity.java b/astrid/src/main/java/com/todoroo/astrid/activity/TaskListActivity.java
index 502879a3a..bbad93a59 100644
--- a/astrid/src/main/java/com/todoroo/astrid/activity/TaskListActivity.java
+++ b/astrid/src/main/java/com/todoroo/astrid/activity/TaskListActivity.java
@@ -13,6 +13,8 @@ import android.content.Intent;
 import android.net.Uri;
 import android.os.Bundle;
 import android.support.v4.app.Fragment;
+import android.support.v4.app.FragmentManager;
+import android.support.v4.app.FragmentTransaction;
 import android.support.v4.view.ViewPager.OnPageChangeListener;
 import android.support.v7.app.ActionBar;
 import android.util.TypedValue;
@@ -49,6 +51,8 @@ import com.todoroo.astrid.utility.Flags;
 
 import net.simonvt.menudrawer.MenuDrawer;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.tasks.R;
 import org.tasks.preferences.ActivityPreferences;
 
@@ -56,6 +60,8 @@ import javax.inject.Inject;
 
 public class TaskListActivity extends AstridActivity implements OnPageChangeListener {
 
+    private static final Logger log = LoggerFactory.getLogger(TaskListActivity.class);
+
     @Inject TagDataDao tagDataDao;
     @Inject ActivityPreferences preferences;
     @Inject GtasksPreferenceService gtasksPreferenceService;
@@ -188,8 +194,36 @@ public class TaskListActivity extends AstridActivity implements OnPageChangeList
                 FilterListFragment.class));
     }
 
-    private void setupPopoverWithFragment(Fragment frag) {
-        View view = frag.getView();
+    protected Fragment setupFragment(String tag, int container, Class<? extends Fragment> cls) {
+        final FragmentManager fm = getSupportFragmentManager();
+        Fragment fragment = fm.findFragmentByTag(tag);
+        if(fragment == null) {
+            try {
+                fragment = cls.newInstance();
+            } catch (InstantiationException | IllegalAccessException e) {
+                log.error(e.getMessage(), e);
+                return null;
+            }
+            FragmentTransaction ft = getSupportFragmentManager().beginTransaction();
+            if (container == 0) {
+                ft.add(fragment, tag);
+            }
+            else {
+                ft.replace(container, fragment, tag);
+            }
+            ft.commit();
+            runOnUiThread(new Runnable() {
+                @Override
+                public void run() {
+                    fm.executePendingTransactions();
+                }
+            });
+        }
+        return fragment;
+    }
+
+    public void setupPopoverWithFilterList(FilterListFragment fla) {
+        View view = fla.getView();
         if (view != null) {
             FrameLayout parent = (FrameLayout) view.getParent();
             if (parent != null) {
@@ -199,10 +233,6 @@ public class TaskListActivity extends AstridActivity implements OnPageChangeList
         }
     }
 
-    public void setupPopoverWithFilterList(FilterListFragment fla) {
-        setupPopoverWithFragment(fla);
-    }
-
     @Override
     public boolean onFilterItemClicked(FilterListItem item) {
         TaskEditFragment.removeExtrasFromIntent(getIntent());