Remove the ability to trigger the edit bookmark dialog via URL.

chrome/android/java/src/org/chromium/chrome/browser/bookmark/ManageBookmarkActivity.java

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 package org.chromium.chrome.browser.bookmark;
 
 import android.Manifest;
 import android.app.Fragment;
 import android.app.FragmentManager.OnBackStackChangedListener;
 import android.app.FragmentTransaction;
 import android.content.Intent;
 import android.content.pm.PackageManager;
 import android.content.res.Configuration;
-import android.net.Uri;
 import android.nfc.NfcAdapter;
 import android.os.Bundle;
 import android.os.Process;
 import android.support.v4.app.FragmentActivity;
 import android.util.Log;
 import android.view.WindowManager;
 
 import org.chromium.base.VisibleForTesting;
 import org.chromium.base.annotations.SuppressFBWarnings;
 import org.chromium.base.library_loader.ProcessInitException;
 import org.chromium.chrome.browser.ChromeApplication;
+import org.chromium.chrome.browser.ChromeBrowserProviderClient;
+import org.chromium.chrome.browser.util.IntentUtils;
 import org.chromium.components.dom_distiller.core.DomDistillerUrlUtils;
 import org.chromium.ui.UiUtils;
 import org.chromium.ui.base.DeviceFormFactor;
 
 /**
  * This class provides the adding bookmark UI. It is also required by
  * android.provider.Browser.saveBookmark
  */
 public class ManageBookmarkActivity extends FragmentActivity {
 
-    private static final String BOOKMARK_ID_URI_PARAM = "id";
-    private static final String BOOKMARK_IS_FOLDER_URI_PARAM = "isfolder";
-
     private static final String TAG = "ManageBookmarkActivity";
 
     /* TODO(gb-deprecation): Use android.provider.BrowserContract.Bookmarks.IS_FOLDER */
     public static final String BOOKMARK_INTENT_IS_FOLDER = "folder";
     /* TODO(gb-deprecation): Use android.provider.BrowserContract.Bookmarks.TITLE */
     public static final String BOOKMARK_INTENT_TITLE = "title";
     /* TODO(gb-deprecation): Use android.provider.BrowserContract.Bookmarks.URL */
     public static final String BOOKMARK_INTENT_URL = "url";
     /* TODO(gb-deprecation): Use android.provider.BrowserContract.Bookmarks._ID */
     public static final String BOOKMARK_INTENT_ID = "_id";
@@ skipping 141 matching lines @@
      * Creates the base add/edit bookmark fragment based on the intent passed to this activity.
      *
      * @return The appropriate fragment based on the intent parameters.
      */
     @SuppressFBWarnings("NP_NULL_ON_SOME_PATH")
     private AddEditBookmarkFragment generateBaseFragment() {
         if (getIntent() == null) {
             throw new IllegalArgumentException("intent can not be null");
         }
         Intent intent = getIntent();
-        Uri intentUri = intent.getData();
 
-        Long bookmarkId = null;
-        boolean isFolder = false;
-        AddEditBookmarkFragment addEditFragment;
-        if (intentUri != null && intentUri.getHost().equals("editbookmark")) {
-            isFolder = intentUri.getBooleanQueryParameter(BOOKMARK_IS_FOLDER_URI_PARAM, false);
-            String bookmarkIdParam = intentUri.getQueryParameter(BOOKMARK_ID_URI_PARAM);
-            if (bookmarkIdParam != null) bookmarkId = Long.parseLong(bookmarkIdParam);
-            addEditFragment = AddEditBookmarkFragment.newEditInstance(isFolder, bookmarkId);
-        } else {
-            Bundle extras = intent.getExtras();
-            String url = null;
-            String name = null;
-            if (extras != null) {
-                isFolder = extras.getBoolean(BOOKMARK_INTENT_IS_FOLDER, false);
+        boolean isFolder = IntentUtils.safeGetBooleanExtra(
+                intent, BOOKMARK_INTENT_IS_FOLDER, false);
+        String name = IntentUtils.safeGetStringExtra(intent, BOOKMARK_INTENT_TITLE);
+        String url = IntentUtils.safeGetStringExtra(intent, BOOKMARK_INTENT_URL);
+        if (url != null) url = DomDistillerUrlUtils.getOriginalUrlFromDistillerUrl(url);
+        long bookmarkId = IntentUtils.safeGetLongExtra(
+                intent, BOOKMARK_INTENT_ID, ChromeBrowserProviderClient.INVALID_BOOKMARK_ID);
 
-                if (extras.containsKey(BOOKMARK_INTENT_TITLE)) {
-                    name = extras.getString(BOOKMARK_INTENT_TITLE);
-                }
-                if (extras.containsKey(BOOKMARK_INTENT_URL)) {
-                    url = extras.getString(BOOKMARK_INTENT_URL);
-                    url = DomDistillerUrlUtils.getOriginalUrlFromDistillerUrl(url);
-                }
-                if (extras.containsKey(BOOKMARK_INTENT_ID)) {
-                    bookmarkId = extras.getLong(BOOKMARK_INTENT_ID);
-                }
-            }
-            addEditFragment = AddEditBookmarkFragment.newInstance(isFolder, bookmarkId, name, url);
-        }
+        AddEditBookmarkFragment addEditFragment = AddEditBookmarkFragment.newInstance(
+                isFolder, bookmarkId, name, url);
+
         setActionListenerOnAddEdit(addEditFragment);
         return addEditFragment;
     }
 
     /**
      * Creates and sets an action listener on the add/edit bookmark fragment.
      * @param addEditFragment The fragment that the listener should be attached to.
      */
     private void setActionListenerOnAddEdit(final AddEditBookmarkFragment addEditFragment) {
         addEditFragment.setOnActionListener(new AddEditBookmarkFragment.OnActionListener() {
@@ skipping 86 matching lines @@
                 AddEditBookmarkFragment.newAddNewFolderInstance(parentFolderId, parentName);
         newFolderFragment.setTargetFragment(triggeringFragment, 0);
         setActionListenerOnAddEdit(newFolderFragment);
         getFragmentManager().beginTransaction()
                 .hide(triggeringFragment)
                 .add(android.R.id.content, newFolderFragment, ADD_FOLDER_FRAGMENT_TAG)
                 .addToBackStack(null)
                 .commit();
     }
 }