From b0e5cbef3956f4378645ef7c2b8daeb04966d9b7 Mon Sep 17 00:00:00 2001 From: Sam Bosley Date: Wed, 18 Jan 2012 16:44:30 -0800 Subject: [PATCH] Resolve some left over merge conflicts --- .../com/todoroo/astrid/actfm/TagViewActivity.java | 7 ------- .../src/com/todoroo/astrid/activity/TaskListActivity.java | 2 +- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/astrid/plugin-src/com/todoroo/astrid/actfm/TagViewActivity.java b/astrid/plugin-src/com/todoroo/astrid/actfm/TagViewActivity.java index 6b7811bb2..b1b75704d 100644 --- a/astrid/plugin-src/com/todoroo/astrid/actfm/TagViewActivity.java +++ b/astrid/plugin-src/com/todoroo/astrid/actfm/TagViewActivity.java @@ -472,11 +472,4 @@ public class TagViewActivity extends TaskListActivity { ((TextView)taskListView.findViewById(android.R.id.empty)).setText(R.string.TLA_no_items); } - @Override - protected void refresh() { - setUpMembersGallery(); - loadTaskListContent(true); - ((TextView)taskListView.findViewById(android.R.id.empty)).setText(R.string.TLA_no_items); - } - } diff --git a/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java b/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java index 91e4a0d03..5bac9b778 100644 --- a/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java +++ b/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java @@ -636,7 +636,7 @@ public class TaskListActivity extends ListFragment implements OnScrollListener, if (!Preferences.getBoolean(WelcomeWalkthrough.KEY_SHOWED_WELCOME_LOGIN, false)) { Preferences.setBoolean(WelcomeWalkthrough.KEY_SHOWED_WELCOME_LOGIN, true); - Intent showWelcomeLogin = new Intent(this, WelcomeWalkthrough.class); + Intent showWelcomeLogin = new Intent(getActivity(), WelcomeWalkthrough.class); showWelcomeLogin.putExtra(ActFmLoginActivity.SHOW_TOAST, false); startActivity(showWelcomeLogin); return;