From abc63ff77ceedbd89efc964886ee3bfe399c57a6 Mon Sep 17 00:00:00 2001 From: Sam Bosley Date: Mon, 30 Jan 2012 13:42:20 -0800 Subject: [PATCH] Fixed bugs with certain intents trying to use the tag view fragment as an activity --- astrid/plugin-src/com/timsu/astrid/C2DMReceiver.java | 4 ++-- astrid/src/com/todoroo/astrid/activity/ShortcutActivity.java | 2 -- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/astrid/plugin-src/com/timsu/astrid/C2DMReceiver.java b/astrid/plugin-src/com/timsu/astrid/C2DMReceiver.java index 2c5cd3706..38b8951c4 100644 --- a/astrid/plugin-src/com/timsu/astrid/C2DMReceiver.java +++ b/astrid/plugin-src/com/timsu/astrid/C2DMReceiver.java @@ -31,6 +31,7 @@ import com.todoroo.astrid.actfm.sync.ActFmPreferenceService; import com.todoroo.astrid.actfm.sync.ActFmSyncService; import com.todoroo.astrid.actfm.sync.ActFmSyncV2Provider; import com.todoroo.astrid.activity.ShortcutActivity; +import com.todoroo.astrid.activity.TaskListActivity; import com.todoroo.astrid.activity.TaskListFragment; import com.todoroo.astrid.api.AstridApiConstants; import com.todoroo.astrid.api.Filter; @@ -356,9 +357,8 @@ public class C2DMReceiver extends BroadcastReceiver { } } - Intent launchIntent = new Intent(); + Intent launchIntent = new Intent(context, TaskListActivity.class); launchIntent.putExtra(TaskListFragment.TOKEN_FILTER, filter); - launchIntent.setComponent(filter.customTaskList); filter.customExtras.putBoolean(TagViewActivity.TOKEN_START_ACTIVITY, shouldLaunchActivity(intent)); launchIntent.putExtras(filter.customExtras); diff --git a/astrid/src/com/todoroo/astrid/activity/ShortcutActivity.java b/astrid/src/com/todoroo/astrid/activity/ShortcutActivity.java index 6db3ba5f5..860da6178 100644 --- a/astrid/src/com/todoroo/astrid/activity/ShortcutActivity.java +++ b/astrid/src/com/todoroo/astrid/activity/ShortcutActivity.java @@ -22,7 +22,6 @@ package com.todoroo.astrid.activity; import java.util.Map.Entry; import android.app.Activity; -import android.content.ComponentName; import android.content.ContentValues; import android.content.Intent; import android.os.Bundle; @@ -91,7 +90,6 @@ public class ShortcutActivity extends Activity { taskListIntent.putExtra(TaskListFragment.TOKEN_SOURCE, extras.getInt(TaskListFragment.TOKEN_SOURCE)); if(extras != null && extras.containsKey(TOKEN_CUSTOM_CLASS)) { - taskListIntent.setComponent(ComponentName.unflattenFromString(extras.getString(TOKEN_CUSTOM_CLASS))); taskListIntent.putExtras(intent.getExtras()); }