Bug 1240728 - Post: cleanup / remove AddToReadingList from OverlayActionService r?mcomella
MozReview-Commit-ID: 3aUoXhfKYBP
--- a/mobile/android/base/java/org/mozilla/gecko/overlays/service/OverlayActionService.java
+++ b/mobile/android/base/java/org/mozilla/gecko/overlays/service/OverlayActionService.java
@@ -7,17 +7,16 @@ package org.mozilla.gecko.overlays.servi
import android.app.Service;
import android.content.Context;
import android.content.Intent;
import android.os.IBinder;
import android.util.Log;
import org.mozilla.gecko.overlays.service.sharemethods.AddBookmark;
-import org.mozilla.gecko.overlays.service.sharemethods.AddToReadingList;
import org.mozilla.gecko.overlays.service.sharemethods.SendTab;
import org.mozilla.gecko.overlays.service.sharemethods.ShareMethod;
import org.mozilla.gecko.util.ThreadUtils;
import java.util.EnumMap;
import java.util.Map;
import static org.mozilla.gecko.overlays.OverlayConstants.ACTION_PREPARE_SHARE;
@@ -25,17 +24,16 @@ import static org.mozilla.gecko.overlays
/**
* A service to receive requests from overlays to perform actions.
* See OverlayConstants for details of the intent API supported by this service.
*
* Currently supported operations are:
*
* Add bookmark*
- * Add to reading list*
* Send tab (delegates to Sync's existing handler)
* Future: Load page in background.
*
* * Neither of these incur a page fetch on the service... yet. That will require headless Gecko,
* something we're yet to have. Refactoring Gecko as a service itself and restructing the rest of
* the app to talk to it seems like the way to go there.
*/
public class OverlayActionService extends Service {
@@ -84,17 +82,16 @@ public class OverlayActionService extend
*/
private void initShareMethods(final Context context) {
ThreadUtils.postToBackgroundThread(new Runnable() {
@Override
public void run() {
shareTypes.clear();
shareTypes.put(ShareMethod.Type.ADD_BOOKMARK, new AddBookmark(context));
- shareTypes.put(ShareMethod.Type.ADD_TO_READING_LIST, new AddToReadingList(context));
shareTypes.put(ShareMethod.Type.SEND_TAB, new SendTab(context));
}
});
}
public void handleShare(final Intent intent) {
ThreadUtils.postToBackgroundThread(new Runnable() {
@Override
deleted file mode 100644
--- a/mobile/android/base/java/org/mozilla/gecko/overlays/service/sharemethods/AddToReadingList.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-package org.mozilla.gecko.overlays.service.sharemethods;
-
-import android.content.ContentResolver;
-import android.content.ContentValues;
-import android.content.Context;
-import org.mozilla.gecko.GeckoProfile;
-import org.mozilla.gecko.R;
-import org.mozilla.gecko.db.LocalBrowserDB;
-import org.mozilla.gecko.db.ReadingListProvider;
-import org.mozilla.gecko.overlays.service.ShareData;
-
-import static org.mozilla.gecko.db.BrowserContract.ReadingListItems;
-
-/**
- * ShareMethod to add a page to the reading list.
- *
- * Inserts the given URL/title pair into the reading list database.
- */
-public class AddToReadingList extends ShareMethod {
- private static final String LOGTAG = "GeckoAddToReadingList";
-
- @Override
- public Result handle(ShareData shareData) {
- final ContentResolver resolver = context.getContentResolver();
-
- final ContentValues values = new ContentValues();
- values.put(ReadingListItems.TITLE, shareData.title);
- values.put(ReadingListItems.URL, shareData.url);
- values.put(ReadingListItems.ADDED_ON, System.currentTimeMillis());
- values.put(ReadingListItems.ADDED_BY, ReadingListProvider.PLACEHOLDER_THIS_DEVICE);
-
- new LocalBrowserDB(GeckoProfile.DEFAULT_PROFILE).getReadingListAccessor().addReadingListItem(resolver, values);
-
- return Result.SUCCESS;
- }
-
- public AddToReadingList(Context context) {
- super(context);
- }
-}
--- a/mobile/android/base/moz.build
+++ b/mobile/android/base/moz.build
@@ -445,17 +445,16 @@ gbjar.sources += ['java/org/mozilla/geck
'notifications/WhatsNewReceiver.java',
'NotificationService.java',
'NSSBridge.java',
'OrderedBroadcastHelper.java',
'overlays/OverlayConstants.java',
'overlays/service/OverlayActionService.java',
'overlays/service/ShareData.java',
'overlays/service/sharemethods/AddBookmark.java',
- 'overlays/service/sharemethods/AddToReadingList.java',
'overlays/service/sharemethods/SendTab.java',
'overlays/service/sharemethods/ShareMethod.java',
'overlays/ui/OverlayDialogButton.java',
'overlays/ui/SendTabDeviceListArrayAdapter.java',
'overlays/ui/SendTabList.java',
'overlays/ui/SendTabTargetSelectedListener.java',
'overlays/ui/ShareDialog.java',
'permissions/PermissionBlock.java',