diff --git a/src/main/java/com/todoroo/astrid/activity/ShortcutActivity.java b/src/main/java/com/todoroo/astrid/activity/ShortcutActivity.java index 92b870e04..68325e8e5 100644 --- a/src/main/java/com/todoroo/astrid/activity/ShortcutActivity.java +++ b/src/main/java/com/todoroo/astrid/activity/ShortcutActivity.java @@ -89,10 +89,6 @@ public class ShortcutActivity extends Activity { Intent taskListIntent = new Intent(this, TaskListActivity.class); - if(extras != null && extras.containsKey(TaskListActivity.TOKEN_SOURCE)) { - taskListIntent.putExtra(TaskListActivity.TOKEN_SOURCE, extras.getInt(TaskListActivity.TOKEN_SOURCE)); - } - if(extras != null && extras.containsKey(TOKEN_CUSTOM_CLASS)) { taskListIntent.putExtras(intent.getExtras()); } diff --git a/src/main/java/com/todoroo/astrid/activity/TaskListActivity.java b/src/main/java/com/todoroo/astrid/activity/TaskListActivity.java index 7aa71eeb7..1c44884f9 100644 --- a/src/main/java/com/todoroo/astrid/activity/TaskListActivity.java +++ b/src/main/java/com/todoroo/astrid/activity/TaskListActivity.java @@ -41,7 +41,6 @@ import com.todoroo.astrid.data.Task; import com.todoroo.astrid.gtasks.GtasksListFragment; import com.todoroo.astrid.gtasks.GtasksPreferenceService; import com.todoroo.astrid.tags.TagFilterExposer; -import com.todoroo.astrid.utility.Constants; import com.todoroo.astrid.utility.Flags; import com.todoroo.astrid.voice.VoiceInputAssistant; @@ -63,9 +62,6 @@ public class TaskListActivity extends AstridActivity implements OnPageChangeList private NavigationDrawerFragment navigationDrawer; - /** token for indicating source of TLA launch */ - public static final String TOKEN_SOURCE = "source"; //$NON-NLS-1$ - public static final String TOKEN_SWITCH_TO_FILTER = "newListCreated"; //$NON-NLS-1$ /** For indicating the new list screen should be launched at fragment setup time */ @@ -117,10 +113,6 @@ public class TaskListActivity extends AstridActivity implements OnPageChangeList if (savedFilter != null) { setListsTitle(savedFilter.title); } - - if (getIntent().hasExtra(TOKEN_SOURCE)) { - trackActivitySource(); - } } public NavigationDrawerFragment getNavigationDrawerFragment() { @@ -448,25 +440,6 @@ public class TaskListActivity extends AstridActivity implements OnPageChangeList } } - /** - * Report who launched this activity - */ - protected void trackActivitySource() { - switch (getIntent().getIntExtra(TOKEN_SOURCE, Constants.SOURCE_DEFAULT)) { - case Constants.SOURCE_NOTIFICATION: - break; - case Constants.SOURCE_OTHER: - break; - case Constants.SOURCE_PPWIDGET: - break; - case Constants.SOURCE_WIDGET: - break; - case Constants.SOURCE_C2DM: - break; - } - getIntent().putExtra(TOKEN_SOURCE, Constants.SOURCE_DEFAULT); // Only report source once - } - @Override public boolean onOptionsItemSelected(MenuItem item) { TaskListFragment tlf = getTaskListFragment(); diff --git a/src/main/java/com/todoroo/astrid/reminders/Notifications.java b/src/main/java/com/todoroo/astrid/reminders/Notifications.java index 6a2138343..811e0087e 100644 --- a/src/main/java/com/todoroo/astrid/reminders/Notifications.java +++ b/src/main/java/com/todoroo/astrid/reminders/Notifications.java @@ -168,7 +168,6 @@ public class Notifications extends InjectingBroadcastReceiver { notifyIntent.putExtra(NotificationFragment.TOKEN_ID, id); notifyIntent.putExtra(EXTRAS_TEXT, text); notifyIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_MULTIPLE_TASK); - notifyIntent.putExtra(TaskListActivity.TOKEN_SOURCE, Constants.SOURCE_NOTIFICATION); broadcaster.requestNotification((int) id, notifyIntent, type, title, text, ringTimes); return true; diff --git a/src/main/java/com/todoroo/astrid/utility/Constants.java b/src/main/java/com/todoroo/astrid/utility/Constants.java index c5361f7d5..0bd2b4d86 100644 --- a/src/main/java/com/todoroo/astrid/utility/Constants.java +++ b/src/main/java/com/todoroo/astrid/utility/Constants.java @@ -21,15 +21,6 @@ public final class Constants { */ public static final MarketStrategy MARKET_STRATEGY = new MarketStrategy.AndroidMarketStrategy(); - // --- task list activity source strings - - public static final int SOURCE_OTHER = -1; - public static final int SOURCE_DEFAULT = 0; - public static final int SOURCE_NOTIFICATION = 1; - public static final int SOURCE_WIDGET = 2; - public static final int SOURCE_PPWIDGET = 3; - public static final int SOURCE_C2DM = 4; - // --- notification id's /** Notification Manager id for timing */ diff --git a/src/main/java/org/tasks/widget/WidgetHelper.java b/src/main/java/org/tasks/widget/WidgetHelper.java index ca287ec44..e33d4324d 100644 --- a/src/main/java/org/tasks/widget/WidgetHelper.java +++ b/src/main/java/org/tasks/widget/WidgetHelper.java @@ -109,7 +109,6 @@ public class WidgetHelper { Bundle extras = AndroidUtilities.bundleFromSerializedString(serializedExtras); listIntent.putExtras(extras); } - listIntent.putExtra(TaskListActivity.TOKEN_SOURCE, Constants.SOURCE_WIDGET); listIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_MULTIPLE_TASK); if (filter != null) { listIntent.putExtra(TaskListFragment.TOKEN_FILTER, filter);