diff --git a/api/src/main/java/com/todoroo/andlib/utility/AndroidUtilities.java b/api/src/main/java/com/todoroo/andlib/utility/AndroidUtilities.java
index 36d452300..a18d62073 100644
--- a/api/src/main/java/com/todoroo/andlib/utility/AndroidUtilities.java
+++ b/api/src/main/java/com/todoroo/andlib/utility/AndroidUtilities.java
@@ -9,7 +9,6 @@ import android.app.Activity;
import android.content.BroadcastReceiver;
import android.content.ContentValues;
import android.content.Context;
-import android.content.Intent;
import android.os.Bundle;
import android.text.InputType;
import android.view.MotionEvent;
@@ -61,22 +60,6 @@ public class AndroidUtilities {
});
}
- /**
- * Start the given intent, handling security exceptions if they arise
- * @param request request code. if negative, no request.
- */
- public static void startExternalIntent(Context context, Intent intent, int request) {
- try {
- if(request > -1 && context instanceof Activity) {
- ((Activity) context).startActivityForResult(intent, request);
- } else {
- context.startActivity(intent);
- }
- } catch (Exception e) {
- log.error(e.getMessage(), e);
- }
- }
-
/**
* Put an arbitrary object into a {@link ContentValues}
*/
diff --git a/api/src/main/java/com/todoroo/astrid/api/AstridApiConstants.java b/api/src/main/java/com/todoroo/astrid/api/AstridApiConstants.java
index 3e146c60f..462ff5e2c 100644
--- a/api/src/main/java/com/todoroo/astrid/api/AstridApiConstants.java
+++ b/api/src/main/java/com/todoroo/astrid/api/AstridApiConstants.java
@@ -149,13 +149,6 @@ public class AstridApiConstants {
// --- Actions API
- /**
- * Action name for intents to be displayed on Astrid's task list menu
- *
EXTRAS_ADDON your add-on identifier
- * EXTRAS_RESPONSE an array of {@link Intent}s
- */
- public static final String ACTION_TASK_LIST_MENU = API_PACKAGE + ".TASK_LIST_MENU";
-
/**
* Action name for intents to be displayed in Astrid's settings. By default,
* your application will be put into the category named by your application,
diff --git a/astrid/src/main/java/com/todoroo/astrid/activity/TaskListFragment.java b/astrid/src/main/java/com/todoroo/astrid/activity/TaskListFragment.java
index e06aebf9c..e21628e5d 100644
--- a/astrid/src/main/java/com/todoroo/astrid/activity/TaskListFragment.java
+++ b/astrid/src/main/java/com/todoroo/astrid/activity/TaskListFragment.java
@@ -12,8 +12,6 @@ import android.content.Context;
import android.content.DialogInterface;
import android.content.Intent;
import android.content.IntentFilter;
-import android.content.pm.PackageManager;
-import android.content.pm.ResolveInfo;
import android.content.res.Resources;
import android.database.Cursor;
import android.database.sqlite.SQLiteException;
@@ -26,7 +24,6 @@ import android.view.ContextMenu.ContextMenuInfo;
import android.view.KeyEvent;
import android.view.LayoutInflater;
import android.view.Menu;
-import android.view.MenuInflater;
import android.view.MenuItem;
import android.view.MotionEvent;
import android.view.View;
@@ -86,7 +83,6 @@ import org.tasks.injection.Injector;
import org.tasks.notifications.NotificationManager;
import org.tasks.preferences.ActivityPreferences;
-import java.util.List;
import java.util.Timer;
import java.util.TimerTask;
import java.util.concurrent.atomic.AtomicReference;
@@ -118,8 +114,6 @@ public class TaskListFragment extends InjectingListFragment implements OnSortSel
// --- menu codes
- protected static final int MENU_ADDON_INTENT_ID = Menu.FIRST + 199;
-
protected static final int CONTEXT_MENU_EDIT_TASK_ID = R.string.TAd_contextEditTask;
protected static final int CONTEXT_MENU_COPY_TASK_ID = R.string.TAd_contextCopyTask;
protected static final int CONTEXT_MENU_DELETE_TASK_ID = R.string.TAd_contextDeleteTask;
@@ -391,38 +385,6 @@ public class TaskListFragment extends InjectingListFragment implements OnSortSel
}
}
- /**
- * Create options menu (displayed when user presses menu key)
- */
- @Override
- public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
- Activity activity = getActivity();
- if (activity == null) {
- return;
- }
- if (!isCurrentTaskListFragment()) {
- return;
- }
-
- addMenuItems(menu);
- }
-
- protected void addMenuItems(Menu menu) {
- // ask about plug-ins
- Intent queryIntent = new Intent(
- AstridApiConstants.ACTION_TASK_LIST_MENU);
-
- PackageManager pm = getActivity().getPackageManager();
- List resolveInfoList = pm.queryIntentActivities(
- queryIntent, 0);
- for (ResolveInfo resolveInfo : resolveInfoList) {
- Intent intent = new Intent(AstridApiConstants.ACTION_TASK_LIST_MENU);
- intent.setClassName(resolveInfo.activityInfo.packageName,
- resolveInfo.activityInfo.name);
- addMenuItem(menu, resolveInfo.loadLabel(pm), resolveInfo.loadIcon(pm), intent, MENU_ADDON_INTENT_ID);
- }
- }
-
protected void setUpUiComponents() {
// set listener for quick-changing task priority
getListView().setOnKeyListener(new OnKeyListener() {
@@ -942,19 +904,6 @@ public class TaskListFragment extends InjectingListFragment implements OnSortSel
return onOptionsItemSelected(item);
}
- public boolean handleOptionsMenuItemSelected(int id, Intent intent) {
- Activity activity = getActivity();
- switch(id) {
- case MENU_ADDON_INTENT_ID:
- if (activity != null) {
- AndroidUtilities.startExternalIntent(activity, intent,
- ACTIVITY_MENU_EXTERNAL);
- }
- return true;
- }
- return false;
- }
-
@Override
public boolean onOptionsItemSelected(final MenuItem item) {
long itemId;
@@ -963,11 +912,6 @@ public class TaskListFragment extends InjectingListFragment implements OnSortSel
return false;
}
- // handle my own menus
- if (handleOptionsMenuItemSelected(item.getItemId(), item.getIntent())) {
- return true;
- }
-
switch (item.getItemId()) {
// --- context menu items
diff --git a/astrid/src/main/java/com/todoroo/astrid/gtasks/sync/GtasksSyncV2Provider.java b/astrid/src/main/java/com/todoroo/astrid/gtasks/sync/GtasksSyncV2Provider.java
index d3a379f01..23b813d8d 100644
--- a/astrid/src/main/java/com/todoroo/astrid/gtasks/sync/GtasksSyncV2Provider.java
+++ b/astrid/src/main/java/com/todoroo/astrid/gtasks/sync/GtasksSyncV2Provider.java
@@ -32,8 +32,6 @@ import com.todoroo.astrid.gtasks.api.GoogleTasksException;
import com.todoroo.astrid.gtasks.api.GtasksApiUtilities;
import com.todoroo.astrid.gtasks.api.GtasksInvoker;
import com.todoroo.astrid.gtasks.auth.GtasksTokenValidator;
-import com.todoroo.astrid.service.MetadataService;
-import com.todoroo.astrid.service.TaskDeleter;
import com.todoroo.astrid.service.TaskService;
import com.todoroo.astrid.sync.SyncResultCallback;
import com.todoroo.astrid.sync.SyncV2Provider;
@@ -62,7 +60,6 @@ public class GtasksSyncV2Provider extends SyncV2Provider {
private static final Logger log = LoggerFactory.getLogger(GtasksSyncV2Provider.class);
private final TaskService taskService;
- private final MetadataService metadataService;
private final StoreObjectDao storeObjectDao;
private final GtasksPreferenceService gtasksPreferenceService;
private final GtasksSyncService gtasksSyncService;
@@ -74,15 +71,13 @@ public class GtasksSyncV2Provider extends SyncV2Provider {
private final GtasksTokenValidator gtasksTokenValidator;
private final GtasksMetadata gtasksMetadataFactory;
private final SyncExecutor executor;
- private final TaskDeleter taskDeleter;
@Inject
- public GtasksSyncV2Provider(TaskService taskService, MetadataService metadataService, StoreObjectDao storeObjectDao, GtasksPreferenceService gtasksPreferenceService,
+ public GtasksSyncV2Provider(TaskService taskService, StoreObjectDao storeObjectDao, GtasksPreferenceService gtasksPreferenceService,
GtasksSyncService gtasksSyncService, GtasksListService gtasksListService, GtasksMetadataService gtasksMetadataService,
GtasksTaskListUpdater gtasksTaskListUpdater, @ForApplication Context context, Preferences preferences,
- GtasksTokenValidator gtasksTokenValidator, GtasksMetadata gtasksMetadata, SyncExecutor executor, TaskDeleter taskDeleter) {
+ GtasksTokenValidator gtasksTokenValidator, GtasksMetadata gtasksMetadata, SyncExecutor executor) {
this.taskService = taskService;
- this.metadataService = metadataService;
this.storeObjectDao = storeObjectDao;
this.gtasksPreferenceService = gtasksPreferenceService;
this.gtasksSyncService = gtasksSyncService;
@@ -94,7 +89,6 @@ public class GtasksSyncV2Provider extends SyncV2Provider {
this.gtasksTokenValidator = gtasksTokenValidator;
this.gtasksMetadataFactory = gtasksMetadata;
this.executor = executor;
- this.taskDeleter = taskDeleter;
}
@Override