Undid a change that was causing duplicate filter list fragments

pull/14/head
Sam Bosley 14 years ago
parent c014cccc2c
commit 4bf7cbe57c

@ -6,7 +6,6 @@ import android.os.Bundle;
import android.support.v4.app.FragmentActivity; import android.support.v4.app.FragmentActivity;
import android.support.v4.app.FragmentManager; import android.support.v4.app.FragmentManager;
import android.support.v4.app.FragmentTransaction; import android.support.v4.app.FragmentTransaction;
import android.view.ViewGroup;
import com.timsu.astrid.R; import com.timsu.astrid.R;
import com.todoroo.andlib.utility.AndroidUtilities; import com.todoroo.andlib.utility.AndroidUtilities;
@ -169,20 +168,13 @@ public class AstridWrapperActivity extends FragmentActivity
protected void setupFilterlistFragment() { protected void setupFilterlistFragment() {
FragmentManager manager = getSupportFragmentManager(); FragmentManager manager = getSupportFragmentManager();
FragmentTransaction transaction = manager.beginTransaction(); FragmentTransaction transaction = manager.beginTransaction();
FilterListActivity frag = getFilterListFragment(); FilterListActivity newFragment = new FilterListActivity();
if (frag == null) if (findViewById(R.id.filterlist_fragment_container) != null) {
frag = new FilterListActivity(); transaction.replace(R.id.filterlist_fragment_container, newFragment, FilterListActivity.TAG_FILTERLIST_FRAGMENT);
ViewGroup container = (ViewGroup) findViewById(R.id.filterlist_fragment_container);
if (container != null) {
if (container.getChildCount() > 0)
transaction.replace(R.id.filterlist_fragment_container, frag, FilterListActivity.TAG_FILTERLIST_FRAGMENT);
else
transaction.add(R.id.filterlist_fragment_container, frag, FilterListActivity.TAG_FILTERLIST_FRAGMENT);
} else { } else {
if (getFilterListFragment() != null) if (getFilterListFragment() != null)
return; return;
transaction.add(frag, FilterListActivity.TAG_FILTERLIST_FRAGMENT); transaction.add(newFragment, FilterListActivity.TAG_FILTERLIST_FRAGMENT);
} }
transaction.commit(); transaction.commit();
} }

Loading…
Cancel
Save