From 8951c7351854bbfc9f2815e74b81cc2a4d606bf0 Mon Sep 17 00:00:00 2001
From: Soren Stoutner <soren@stoutner.com>
Date: Thu, 7 Jul 2016 15:21:02 -0700
Subject: [PATCH] Add the ability to edit bookmarks.

---
 .idea/dictionaries/soren.xml                  |   3 +
 ...about_license.html => about_licenses.html} |   2 +
 app/src/main/assets/images/ic_edit.png        | Bin 0 -> 826 bytes
 .../privacybrowser/AboutActivity.java         |   2 +-
 .../privacybrowser/AboutTabFragment.java      |   2 +-
 .../privacybrowser/BookmarksActivity.java     | 173 +++++++++++-------
 .../BookmarksDatabaseHandler.java             |  84 +++++++--
 .../privacybrowser/CreateBookmark.java        |  57 +++---
 .../CreateHomeScreenShortcut.java             |   3 -
 .../stoutner/privacybrowser/EditBookmark.java | 166 +++++++++++++++++
 .../privacybrowser/MainWebViewActivity.java   |   4 +-
 app/src/main/res/drawable/back.xml            |   1 +
 app/src/main/res/drawable/edit.xml            |  15 ++
 app/src/main/res/drawable/exit.xml            |   1 +
 app/src/main/res/drawable/forward.xml         |   1 +
 .../res/layout/create_bookmark_dialog.xml     |  66 ++++---
 .../create_home_screen_shortcut_dialog.xml    |  17 +-
 .../main/res/layout/edit_bookmark_dialog.xml  |  96 ++++++++++
 .../res/layout/main_coordinatorlayout.xml     |   3 +-
 app/src/main/res/layout/url_bar.xml           |  24 ++-
 .../main/res/menu/bookmarks_context_menu.xml  |   9 +-
 app/src/main/res/values/colors.xml            |   3 +-
 app/src/main/res/values/strings.xml           |   8 +-
 23 files changed, 567 insertions(+), 173 deletions(-)
 rename app/src/main/assets/{about_license.html => about_licenses.html} (99%)
 create mode 100644 app/src/main/assets/images/ic_edit.png
 create mode 100644 app/src/main/java/com/stoutner/privacybrowser/EditBookmark.java
 create mode 100644 app/src/main/res/drawable/edit.xml
 create mode 100644 app/src/main/res/layout/edit_bookmark_dialog.xml

diff --git a/.idea/dictionaries/soren.xml b/.idea/dictionaries/soren.xml
index f0434fc3..2d91de18 100644
--- a/.idea/dictionaries/soren.xml
+++ b/.idea/dictionaries/soren.xml
@@ -11,6 +11,7 @@
       <w>bookmarkurl</w>
       <w>buildapi</w>
       <w>buildversion</w>
+      <w>checkedtextview</w>
       <w>chromeversion</w>
       <w>commitdiff</w>
       <w>coordinatorlayout</w>
@@ -28,6 +29,7 @@
       <w>linearlayout</w>
       <w>listview</w>
       <w>logins</w>
+      <w>lossless</w>
       <w>mozilla</w>
       <w>nojs</w>
       <w>orbot</w>
@@ -36,6 +38,7 @@
       <w>redmine</w>
       <w>referer</w>
       <w>relativelayout</w>
+      <w>requery</w>
       <w>robinlinus</w>
       <w>samsung</w>
       <w>securitypatch</w>
diff --git a/app/src/main/assets/about_license.html b/app/src/main/assets/about_licenses.html
similarity index 99%
rename from app/src/main/assets/about_license.html
rename to app/src/main/assets/about_licenses.html
index b495595d..6ff69285 100644
--- a/app/src/main/assets/about_license.html
+++ b/app/src/main/assets/about_licenses.html
@@ -77,6 +77,8 @@
 
 <p><img class="center" src="images/ic_add.png" height="32" width="32"> ic_add.</p>
 
+<p><img class="center" src="images/ic_edit.png" height="32" width="32"> ic_edit.</p>
+
 <p><img class="center" src="images/ic_delete.png" height="32" width="32"> ic_download.</p>
 <hr/>
 
diff --git a/app/src/main/assets/images/ic_edit.png b/app/src/main/assets/images/ic_edit.png
new file mode 100644
index 0000000000000000000000000000000000000000..f4612f085475745a4f5ddb0e2490453caf129747
GIT binary patch
literal 826
zcmeAS@N?(olHy`uVBq!ia0vp^4Is?H1|$#LC7uRSEX7WqAsj$Z!;#Vf<Z~8yL>4nJ
zsJsMW#sHP)KY)UgC9V-A!TD(=<%vb94CUqJdYO6I#mR{Use1WE>9gP2NHH)lZTEC>
z45^s&_NHT&NFamj#ct#91(B_K4h7*ttRHhvHl9A=B5<d<$wK5}ih#?(jMC+=uCIQ#
zi@i$B>F+N6xh1SBo|E9n<aqG|*$<*W_-YvR8r#oyU$Tm0vTuBC9T$FJ@x7&)TMEj5
z*vHE^c3=9Mxxhg7zTljd1r;^!1!;#qev~~pljD2;dk(*t8S+4h6&qrJ5=n<X0VO&)
z9zU{f>fOy?XI#f{{f?d0x6X%bwv2Wg&vDeK-_USZn78TP`eyAv`j6DsS~iJm&-HYV
z%4T_g-D*Of{j0rJk6vGwIJmvi{nEli?`Q8@Dp)hKR7+OnPwnIFMors``Icoqyl=kW
zwn_fLX36x+Ee5g+Et^h*SOpaw*WGLGFO?J9JG0Qtm*Y5lWHHMzd5t^vXQY%3{y8N6
zi~f8<P@;aphCA}<%5DjN8V?nHbniLvgSqwTV|`1e$NVD4j>ac}wDk1br-SG<;{UI|
zo}u2>pFYP|_|UJ9??3x3V06;or>w#K_eb9Xl`o5}n<ic8-}_R~CL{iUL*i}u<>!9h
zyWaZG|HuEhXt`%6x&IzGrq4M9i7a-rx=8CyA5Y&}*c*SXFZa);vVzCcw=S06zee`n
zkJMxLEg!$1^RfKg59{<lbB+I<ldON<v%eTwxCSYmE#ckC=y2{H8(T#BI$%0y@O1Ta
JS?83{1OU6wh6?}y

literal 0
HcmV?d00001

diff --git a/app/src/main/java/com/stoutner/privacybrowser/AboutActivity.java b/app/src/main/java/com/stoutner/privacybrowser/AboutActivity.java
index 62978aac..6b462acd 100644
--- a/app/src/main/java/com/stoutner/privacybrowser/AboutActivity.java
+++ b/app/src/main/java/com/stoutner/privacybrowser/AboutActivity.java
@@ -83,7 +83,7 @@ public class AboutActivity extends AppCompatActivity {
                     return getString(R.string.changelog);
 
                 case 4:
-                    return getString(R.string.license);
+                    return getString(R.string.licenses);
 
                 case 5:
                     return getString(R.string.contributors);
diff --git a/app/src/main/java/com/stoutner/privacybrowser/AboutTabFragment.java b/app/src/main/java/com/stoutner/privacybrowser/AboutTabFragment.java
index 19de018e..c49fbc88 100644
--- a/app/src/main/java/com/stoutner/privacybrowser/AboutTabFragment.java
+++ b/app/src/main/java/com/stoutner/privacybrowser/AboutTabFragment.java
@@ -151,7 +151,7 @@ public class AboutTabFragment extends Fragment {
                     break;
 
                 case 4:
-                    tabWebView.loadUrl("file:///android_asset/about_license.html");
+                    tabWebView.loadUrl("file:///android_asset/about_licenses.html");
                     break;
 
                 case 5:
diff --git a/app/src/main/java/com/stoutner/privacybrowser/BookmarksActivity.java b/app/src/main/java/com/stoutner/privacybrowser/BookmarksActivity.java
index 556bd60c..108dcc04 100644
--- a/app/src/main/java/com/stoutner/privacybrowser/BookmarksActivity.java
+++ b/app/src/main/java/com/stoutner/privacybrowser/BookmarksActivity.java
@@ -25,6 +25,8 @@ import android.content.Context;
 import android.database.Cursor;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
+import android.graphics.drawable.BitmapDrawable;
+import android.graphics.drawable.Drawable;
 import android.os.Bundle;
 import android.support.design.widget.FloatingActionButton;
 import android.support.design.widget.Snackbar;
@@ -40,6 +42,7 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.AbsListView;
 import android.widget.AdapterView;
+import android.widget.CheckBox;
 import android.widget.EditText;
 import android.widget.ImageView;
 import android.widget.ListView;
@@ -47,12 +50,17 @@ import android.widget.TextView;
 
 import java.io.ByteArrayOutputStream;
 
-public class BookmarksActivity extends AppCompatActivity implements CreateBookmark.CreateBookmarkListener {
-    private BookmarksDatabaseHandler bookmarksDatabaseHandler;
-    private ListView bookmarksListView;
+public class BookmarksActivity extends AppCompatActivity implements CreateBookmark.CreateBookmarkListener, EditBookmark.EditBookmarkListener {
+    // `bookmarksDatabaseHandler` is public static so it can be accessed from EditBookmark.  It is also used in `onCreate()`,
+    // `onCreateBookmarkCreate()`, `updateBookmarksListView()`, and `updateBookmarksListViewExcept()`.
+    public static BookmarksDatabaseHandler bookmarksDatabaseHandler;
 
-    // deleteBookmarkMenuItem is used in onCreate() and onPrepareOptionsMenu().
-    private MenuItem deleteBookmarkMenuItem;
+    // `bookmarksListView` is public static so it can be accessed from EditBookmark.
+    // It is also used in `onCreate()`, `updateBookmarksListView()`, and `updateBookmarksListViewExcept()`.
+    public static ListView bookmarksListView;
+
+    // `contextualActionMode` is used in `onCreate()` and `onEditBookmarkSave()`.
+    private ActionMode contextualActionMode;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -69,13 +77,16 @@ public class BookmarksActivity extends AppCompatActivity implements CreateBookma
         appBar.setDisplayHomeAsUpEnabled(true);
 
         // Initialize the database handler and the ListView.
+        // `this` specifies the context.  The two `null`s do not specify the database name or a `CursorFactory`.
+        // The `0` is to specify a database version, but that is set instead using a constant in BookmarksDatabaseHandler.
         bookmarksDatabaseHandler = new BookmarksDatabaseHandler(this, null, null, 0);
         bookmarksListView = (ListView) findViewById(R.id.bookmarks_listview);
 
         // Display the bookmarks in the ListView.
         updateBookmarksListView();
 
-        // Set a listener so that tapping a list item loads the URL.  We need to store the activity in a variable so that we can return to the parent activity after loading the URL.
+        // Set a listener so that tapping a list item loads the URL.  We need to store the activity
+        // in a variable so that we can return to the parent activity after loading the URL.
         final Activity bookmarksActivity = this;
         bookmarksListView.setOnItemClickListener(new AdapterView.OnItemClickListener() {
             @Override
@@ -92,26 +103,20 @@ public class BookmarksActivity extends AppCompatActivity implements CreateBookma
             }
         });
 
-        // registerForContextMenu(bookmarksListView);
-
+        // `MultiChoiceModeListener` handles long clicks.
         bookmarksListView.setMultiChoiceModeListener(new AbsListView.MultiChoiceModeListener() {
-            @Override
-            public void onItemCheckedStateChanged(ActionMode mode, int position, long id, boolean checked) {
-                String numberSelectedString;
-                long[] selectedItemsLongArray = bookmarksListView.getCheckedItemIds();
-
-                numberSelectedString = selectedItemsLongArray.length + " " + getString(R.string.selected);
-
-                mode.setSubtitle(numberSelectedString);
-            }
+            // `editBookmarkMenuItem` is used in `onCreateActionMode()` and `onItemCheckedStateChanged`.
+            MenuItem editBookmarkMenuItem;
 
             @Override
             public boolean onCreateActionMode(ActionMode mode, Menu menu) {
-                // Inflate the menu for the contextual app bar.
+                // Inflate the menu for the contextual app bar and set the title.
                 getMenuInflater().inflate(R.menu.bookmarks_context_menu, menu);
-
                 mode.setTitle(R.string.bookmarks);
 
+                // Get a handle for `R.id.edit_bookmark`.
+                editBookmarkMenuItem = menu.findItem(R.id.edit_bookmark);
+
                 return true;
             }
 
@@ -120,25 +125,52 @@ public class BookmarksActivity extends AppCompatActivity implements CreateBookma
                 return false;
             }
 
+            @Override
+            public void onItemCheckedStateChanged(ActionMode mode, int position, long id, boolean checked) {
+                // Get an array of the selected bookmarks.
+                long[] selectedBookmarksLongArray = bookmarksListView.getCheckedItemIds();
+
+                // Calculate the number of selected bookmarks.
+                int numberOfSelectedBookmarks = selectedBookmarksLongArray.length;
+
+                // List the number of selected bookmarks in the subtitle.
+                mode.setSubtitle(numberOfSelectedBookmarks + " " + getString(R.string.selected));
+
+                // Show the `Edit` option only if 1 bookmark is selected.
+                if (numberOfSelectedBookmarks == 1) {
+                    editBookmarkMenuItem.setVisible(true);
+                } else {
+                    editBookmarkMenuItem.setVisible(false);
+                }
+            }
+
             @Override
             public boolean onActionItemClicked(ActionMode mode, MenuItem item) {
                 int menuItemId = item.getItemId();
 
                 switch (menuItemId) {
+                    case R.id.edit_bookmark:
+                        // Show the `EditBookmark` `AlertDialog` and name the instance `@string/edit_bookmark`.
+                        DialogFragment editBookmarkDialog = new EditBookmark();
+                        editBookmarkDialog.show(getFragmentManager(), "@string/edit_bookmark");
+
+                        contextualActionMode = mode;
+                        break;
+
                     case R.id.delete_bookmark:
                         // Get an array of the selected rows.
-                        final long[] selectedItemsLongArray = bookmarksListView.getCheckedItemIds();
+                        final long[] selectedBookmarksLongArray = bookmarksListView.getCheckedItemIds();
 
                         String snackbarMessage;
 
                         // Determine how many items are in the array and prepare an appropriate Snackbar message.
-                        if (selectedItemsLongArray.length == 1) {
+                        if (selectedBookmarksLongArray.length == 1) {
                             snackbarMessage = getString(R.string.one_bookmark_deleted);
                         } else {
-                            snackbarMessage = selectedItemsLongArray.length + " " + getString(R.string.bookmarks_deleted);
+                            snackbarMessage = selectedBookmarksLongArray.length + " " + getString(R.string.bookmarks_deleted);
                         }
 
-                        updateBookmarksListViewExcept(selectedItemsLongArray);
+                        updateBookmarksListViewExcept(selectedBookmarksLongArray);
 
                         // Show a SnackBar.
                         Snackbar.make(findViewById(R.id.bookmarks_coordinatorlayout), snackbarMessage, Snackbar.LENGTH_LONG)
@@ -162,7 +194,7 @@ public class BookmarksActivity extends AppCompatActivity implements CreateBookma
                                             // The Snackbar was dismissed without the "Undo" button being pushed.
                                             default:
                                                 // Delete each selected row.
-                                                for (long databaseIdLong : selectedItemsLongArray) {
+                                                for (long databaseIdLong : selectedBookmarksLongArray) {
                                                     // Convert `databaseIdLong` to an int.
                                                     int databaseIdInt = (int) databaseIdLong;
 
@@ -177,7 +209,9 @@ public class BookmarksActivity extends AppCompatActivity implements CreateBookma
 
                         // Close the contextual app bar.
                         mode.finish();
+                        break;
                 }
+                // Consume the click.
                 return true;
             }
 
@@ -193,68 +227,81 @@ public class BookmarksActivity extends AppCompatActivity implements CreateBookma
         createBookmarkFAB.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
-                // Show the CreateBookmark AlertDialog and name the instance "@string/create_bookmark".
+                // Show the `CreateBookmark` `AlertDialog` and name the instance `@string/create_bookmark`.
                 DialogFragment createBookmarkDialog = new CreateBookmark();
                 createBookmarkDialog.show(getFragmentManager(), "@string/create_bookmark");
             }
         });
     }
 
-    /*
-    @Override
-    public void onCreateContextMenu(ContextMenu menu, View v, ContextMenu.ContextMenuInfo menuInfo) {
-        super.onCreateContextMenu(menu, v, menuInfo);
-        getMenuInflater().inflate(R.menu.bookmarks_context_menu, menu);
-    } */
-
-    /*@Override
-    public boolean onCreateOptionsMenu(Menu menu) {
-        getMenuInflater().inflate(R.menu.menu_bookmarks_options, menu);
-
-        return true;
-    }
-
-    @Override
-    public boolean onPrepareOptionsMenu(Menu menu) {
-        // Disable the delete icon.
-        deleteBookmarkMenuItem = menu.findItem(R.id.delete_bookmark);
-        deleteBookmarkMenuItem.setVisible(false);
-
-        // Run all the other default commands.
-        super.onPrepareOptionsMenu(menu);
-
-        // `return true` displays the menu;
-        return true;
-    }*/
-
     @Override
     public void onCreateBookmarkCancel(DialogFragment createBookmarkDialogFragment) {
-        // Do nothing because the user selected "Cancel".
+        // Do nothing because the user selected `Cancel`.
     }
 
     @Override
     public void onCreateBookmarkCreate(DialogFragment createBookmarkDialogFragment) {
-        // Get the EditTexts from the DialogFragment and extract the strings.
+        // Get the `EditText`s from the `createBookmarkDialogFragment` and extract the strings.
         EditText createBookmarkNameEditText = (EditText) createBookmarkDialogFragment.getDialog().findViewById(R.id.create_bookmark_name_edittext);
         String bookmarkNameString = createBookmarkNameEditText.getText().toString();
-        EditText createBookmarkURLEditText = (EditText) createBookmarkDialogFragment.getDialog().findViewById(R.id.create_bookmark_url_edittext);
-        String bookmarkURLString = createBookmarkURLEditText.getText().toString();
+        EditText createBookmarkUrlEditText = (EditText) createBookmarkDialogFragment.getDialog().findViewById(R.id.create_bookmark_url_edittext);
+        String bookmarkUrlString = createBookmarkUrlEditText.getText().toString();
 
-        // Convert the favoriteIcon Bitmap to a byte array.
+        // Convert the favoriteIcon Bitmap to a byte array.  `0` is for lossless compression (the only option for a PNG).
         ByteArrayOutputStream favoriteIconByteArrayOutputStream = new ByteArrayOutputStream();
         MainWebViewActivity.favoriteIcon.compress(Bitmap.CompressFormat.PNG, 0, favoriteIconByteArrayOutputStream);
         byte[] favoriteIconByteArray = favoriteIconByteArrayOutputStream.toByteArray();
 
         // Create the bookmark.
-        bookmarksDatabaseHandler.createBookmark(bookmarkNameString, bookmarkURLString, favoriteIconByteArray);
+        bookmarksDatabaseHandler.createBookmark(bookmarkNameString, bookmarkUrlString, favoriteIconByteArray);
 
         // Refresh the ListView.
         updateBookmarksListView();
     }
 
+    @Override
+    public void onEditBookmarkCancel(DialogFragment editBookmarkDialogFragment) {
+        // Do nothing because the user selected `Cancel`.
+    }
+
+    @Override
+    public void onEditBookmarkSave(DialogFragment editBookmarkDialogFragment) {
+        // Get the `EditText`s from the `editBookmarkDialogFragment` and extract the strings.
+        EditText editBookmarkNameEditText = (EditText) editBookmarkDialogFragment.getDialog().findViewById(R.id.edit_bookmark_name_edittext);
+        String bookmarkNameString = editBookmarkNameEditText.getText().toString();
+        EditText editBookmarkUrlEditText = (EditText) editBookmarkDialogFragment.getDialog().findViewById(R.id.edit_bookmark_url_edittext);
+        String bookmarkUrlString = editBookmarkUrlEditText.getText().toString();
+
+        CheckBox useNewFavoriteIconBitmap = (CheckBox) editBookmarkDialogFragment.getDialog().findViewById(R.id.edit_bookmark_use_new_favorite_icon_checkbox);
+        byte[] favoriteIconByteArray;
+
+        // Get a long array with the the databaseId of the selected bookmark and convert it to an `int`.
+        long[] selectedBookmarksLongArray = bookmarksListView.getCheckedItemIds();
+        int selectedBookmarkDatabaseId = (int) selectedBookmarksLongArray[0];
+
+        if (useNewFavoriteIconBitmap.isChecked()) {
+            ImageView newFavoriteIconImageView = (ImageView) editBookmarkDialogFragment.getDialog().findViewById(R.id.edit_bookmark_new_favorite_icon);
+            Drawable favoriteIconDrawable = newFavoriteIconImageView.getDrawable();
+            Bitmap favoriteIconBitmap = ((BitmapDrawable) favoriteIconDrawable).getBitmap();
+            ByteArrayOutputStream favoriteIconByteArrayOutputStream = new ByteArrayOutputStream();
+            favoriteIconBitmap.compress(Bitmap.CompressFormat.PNG, 0, favoriteIconByteArrayOutputStream);
+            favoriteIconByteArray = favoriteIconByteArrayOutputStream.toByteArray();
+            bookmarksDatabaseHandler.updateBookmark(selectedBookmarkDatabaseId, bookmarkNameString, bookmarkUrlString, favoriteIconByteArray);
+
+        } else {
+            // Update the bookmark.
+            bookmarksDatabaseHandler.updateBookmark(selectedBookmarkDatabaseId, bookmarkNameString, bookmarkUrlString);
+        }
+
+        contextualActionMode.finish();
+
+        // Refresh the `ListView`.
+        updateBookmarksListView();
+    }
+
     private void updateBookmarksListView() {
         // Get a Cursor with the current contents of the bookmarks database.
-        final Cursor bookmarksCursor = bookmarksDatabaseHandler.getBookmarksCursor();
+        final Cursor bookmarksCursor = bookmarksDatabaseHandler.getAllBookmarksCursor();
 
         // Setup bookmarksCursorAdapter with `this` context.  The `false` disables autoRequery.
         CursorAdapter bookmarksCursorAdapter = new CursorAdapter(this, bookmarksCursor, false) {
@@ -266,10 +313,10 @@ public class BookmarksActivity extends AppCompatActivity implements CreateBookma
 
             @Override
             public void bindView(View view, Context context, Cursor cursor) {
-                // Get the favorite icon byte array from the cursor.
-                byte[] favoriteIconByteArray = cursor.getBlob(cursor.getColumnIndex(BookmarksDatabaseHandler.FAVORITEICON));
+                // Get the favorite icon byte array from the `Cursor`.
+                byte[] favoriteIconByteArray = cursor.getBlob(cursor.getColumnIndex(BookmarksDatabaseHandler.FAVORITE_ICON));
 
-                // Convert the byte array to a Bitmap beginning at the first byte and ending at the last.
+                // Convert the byte array to a `Bitmap` beginning at the first byte and ending at the last.
                 Bitmap favoriteIconBitmap = BitmapFactory.decodeByteArray(favoriteIconByteArray, 0, favoriteIconByteArray.length);
 
                 // Display the bitmap in `bookmarkFavoriteIcon`.
@@ -304,7 +351,7 @@ public class BookmarksActivity extends AppCompatActivity implements CreateBookma
             @Override
             public void bindView(View view, Context context, Cursor cursor) {
                 // Get the favorite icon byte array from the cursor.
-                byte[] favoriteIconByteArray = cursor.getBlob(cursor.getColumnIndex(BookmarksDatabaseHandler.FAVORITEICON));
+                byte[] favoriteIconByteArray = cursor.getBlob(cursor.getColumnIndex(BookmarksDatabaseHandler.FAVORITE_ICON));
 
                 // Convert the byte array to a Bitmap beginning at the first byte and ending at the last.
                 Bitmap favoriteIconBitmap = BitmapFactory.decodeByteArray(favoriteIconByteArray, 0, favoriteIconByteArray.length);
diff --git a/app/src/main/java/com/stoutner/privacybrowser/BookmarksDatabaseHandler.java b/app/src/main/java/com/stoutner/privacybrowser/BookmarksDatabaseHandler.java
index cacc8530..2194bc99 100644
--- a/app/src/main/java/com/stoutner/privacybrowser/BookmarksDatabaseHandler.java
+++ b/app/src/main/java/com/stoutner/privacybrowser/BookmarksDatabaseHandler.java
@@ -31,12 +31,12 @@ public class BookmarksDatabaseHandler extends SQLiteOpenHelper {
     private static final String BOOKMARKS_TABLE = "bookmarks";
 
     public static final String _ID = "_id";
-    public static final String DISPLAYORDER = "displayorder";
+    public static final String DISPLAY_ORDER = "displayorder";
     public static final String BOOKMARK_NAME = "bookmarkname";
     public static final String BOOKMARK_URL = "bookmarkurl";
-    public static final String PARENTFOLDER = "parentfolder";
-    public static final String ISFOLDER = "isfolder";
-    public static final String FAVORITEICON = "favoriteicon";
+    public static final String PARENT_FOLDER = "parentfolder";
+    public static final String IS_FOLDER = "isfolder";
+    public static final String FAVORITE_ICON = "favoriteicon";
 
     public BookmarksDatabaseHandler(Context context, String name, SQLiteDatabase.CursorFactory factory, int version) {
         super(context, BOOKMARKS_DATABASE, factory, SCHEMA_VERSION);
@@ -47,12 +47,12 @@ public class BookmarksDatabaseHandler extends SQLiteOpenHelper {
         // Create the database if it doesn't exist.
         String CREATE_BOOKMARKS_TABLE = "CREATE TABLE " + BOOKMARKS_TABLE + " (" +
                 _ID + " integer primary key, " +
-                DISPLAYORDER + " integer, " +
+                DISPLAY_ORDER + " integer, " +
                 BOOKMARK_NAME + " text, " +
                 BOOKMARK_URL + " text, " +
-                PARENTFOLDER + " text, " +
-                ISFOLDER + " boolean, " +
-                FAVORITEICON + " blob);";
+                PARENT_FOLDER + " text, " +
+                IS_FOLDER + " boolean, " +
+                FAVORITE_ICON + " blob);";
 
         bookmarksDatabase.execSQL(CREATE_BOOKMARKS_TABLE);
     }
@@ -68,9 +68,9 @@ public class BookmarksDatabaseHandler extends SQLiteOpenHelper {
         // ID is created automatically.
         bookmarkContentValues.put(BOOKMARK_NAME, bookmarkName);
         bookmarkContentValues.put(BOOKMARK_URL, bookmarkURL);
-        bookmarkContentValues.put(PARENTFOLDER, "");
-        bookmarkContentValues.put(ISFOLDER, false);
-        bookmarkContentValues.put(FAVORITEICON, favoriteIcon);
+        bookmarkContentValues.put(PARENT_FOLDER, "");
+        bookmarkContentValues.put(IS_FOLDER, false);
+        bookmarkContentValues.put(FAVORITE_ICON, favoriteIcon);
 
         // Get a writable database handle.
         SQLiteDatabase bookmarksDatabase = this.getWritableDatabase();
@@ -82,16 +82,17 @@ public class BookmarksDatabaseHandler extends SQLiteOpenHelper {
         bookmarksDatabase.close();
     }
 
-    public Cursor getBookmarksCursor() {
+    public Cursor getBookmarkCursor(int databaseId) {
         // Get a readable database handle.
         SQLiteDatabase bookmarksDatabase = this.getReadableDatabase();
 
-        // Get everything in the BOOKMARKS_TABLE.
-        final String GET_ALL_BOOKMARKS = "Select * FROM " + BOOKMARKS_TABLE;
+        // Prepare the SQL statement to get the cursor for `databaseId`.
+        final String GET_ONE_BOOKMARK = "Select * FROM " + BOOKMARKS_TABLE +
+                " WHERE " + _ID + " = " + databaseId;
 
-        // Return the results as a Cursor.  The second argument is `null` because there are no selectionArgs.
-        // We can't close the Cursor because we need to use it in the parent activity.
-        return bookmarksDatabase.rawQuery(GET_ALL_BOOKMARKS, null);
+        // Return the results as a `Cursor`.  The second argument is `null` because there are no selectionArgs.
+        // We can't close the `Cursor` because we need to use it in the parent activity.
+        return bookmarksDatabase.rawQuery(GET_ONE_BOOKMARK, null);
     }
 
     public Cursor getBookmarksCursorExcept(long[] exceptIdLongArray) {
@@ -114,9 +115,21 @@ public class BookmarksDatabaseHandler extends SQLiteOpenHelper {
         final String GET_All_BOOKMARKS_EXCEPT_SPECIFIED = "Select * FROM " + BOOKMARKS_TABLE +
                 " WHERE " + _ID + " NOT IN (" + doNotGetIdsString + ")";
 
+        // Return the results as a `Cursor`.  The second argument is `null` because there are no selectionArgs.
+        // We can't close the `Cursor` because we need to use it in the parent activity.
+        return bookmarksDatabase.rawQuery(GET_All_BOOKMARKS_EXCEPT_SPECIFIED, null);
+    }
+
+    public Cursor getAllBookmarksCursor() {
+        // Get a readable database handle.
+        SQLiteDatabase bookmarksDatabase = this.getReadableDatabase();
+
+        // Get everything in the BOOKMARKS_TABLE.
+        final String GET_ALL_BOOKMARKS = "Select * FROM " + BOOKMARKS_TABLE;
+
         // Return the results as a Cursor.  The second argument is `null` because there are no selectionArgs.
         // We can't close the Cursor because we need to use it in the parent activity.
-        return bookmarksDatabase.rawQuery(GET_All_BOOKMARKS_EXCEPT_SPECIFIED, null);
+        return bookmarksDatabase.rawQuery(GET_ALL_BOOKMARKS, null);
     }
 
     public String getBookmarkURL(int databaseId) {
@@ -143,6 +156,41 @@ public class BookmarksDatabaseHandler extends SQLiteOpenHelper {
         return bookmarkURLString;
     }
 
+    public void updateBookmark(int databaseId, String bookmarkName, String bookmarkUrl) {
+        // Store the updated values in `bookmarkContentValues`.
+        ContentValues bookmarkContentValues = new ContentValues();
+
+        bookmarkContentValues.put(BOOKMARK_NAME, bookmarkName);
+        bookmarkContentValues.put(BOOKMARK_URL, bookmarkUrl);
+
+        // Get a writable database handle.
+        SQLiteDatabase bookmarksDatabase = this.getWritableDatabase();
+
+        // Update the database.  The last argument is `null` because there are no `whereArgs`.
+        bookmarksDatabase.update(BOOKMARKS_TABLE, bookmarkContentValues, _ID + " = " + databaseId, null);
+
+        // Close the database handle.
+        bookmarksDatabase.close();
+    }
+
+    public void updateBookmark(int databaseId, String bookmarkName, String bookmarkUrl, byte[] favoriteIcon) {
+        // Store the updated values in `bookmarkContentValues`.
+        ContentValues bookmarkContentValues = new ContentValues();
+
+        bookmarkContentValues.put(BOOKMARK_NAME, bookmarkName);
+        bookmarkContentValues.put(BOOKMARK_URL, bookmarkUrl);
+        bookmarkContentValues.put(FAVORITE_ICON, favoriteIcon);
+
+        // Get a writable database handle.
+        SQLiteDatabase bookmarksDatabase = this.getWritableDatabase();
+
+        // Update the database.  The last argument is `null` because there are no `whereArgs`.
+        bookmarksDatabase.update(BOOKMARKS_TABLE, bookmarkContentValues, _ID + " = " + databaseId, null);
+
+        // Close the database handle.
+        bookmarksDatabase.close();
+    }
+
     public void deleteBookmark(int databaseId) {
         // Get a writable database handle.
         SQLiteDatabase bookmarksDatabase = this.getWritableDatabase();
diff --git a/app/src/main/java/com/stoutner/privacybrowser/CreateBookmark.java b/app/src/main/java/com/stoutner/privacybrowser/CreateBookmark.java
index f844ca34..64714358 100644
--- a/app/src/main/java/com/stoutner/privacybrowser/CreateBookmark.java
+++ b/app/src/main/java/com/stoutner/privacybrowser/CreateBookmark.java
@@ -26,11 +26,9 @@ import android.content.DialogInterface;
 import android.graphics.drawable.BitmapDrawable;
 import android.graphics.drawable.Drawable;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-// If we don't use android.support.v7.app.AlertDialog instead of android.app.AlertDialog then the dialog will be covered by the keyboard.
+// If we don't use `android.support.v7.app.AlertDialog` instead of `android.app.AlertDialog` then the dialog will be covered by the keyboard.
 import android.support.v7.app.AlertDialog;
 import android.view.KeyEvent;
-import android.view.LayoutInflater;
 import android.view.View;
 import android.view.WindowManager;
 import android.widget.EditText;
@@ -43,12 +41,14 @@ public class CreateBookmark extends DialogFragment {
         void onCreateBookmarkCreate(DialogFragment createBookmarkDialogFragment);
     }
 
-    // createBookmarkListener is used in onAttach() and onCreateDialog()
+    // `createBookmarkListener` is used in `onAttach()` and `onCreateDialog()`
     private CreateBookmarkListener createBookmarkListener;
 
-    // Check to make sure the parent activity implements the listener.
+
     public void onAttach(Activity parentActivity) {
         super.onAttach(parentActivity);
+
+        // Get a handle for `CreateBookmarkListener` from the `parentActivity`.
         try {
             createBookmarkListener = (CreateBookmarkListener) parentActivity;
         } catch(ClassCastException exception) {
@@ -56,62 +56,57 @@ public class CreateBookmark extends DialogFragment {
         }
     }
 
-    // onCreateDialog requires @NonNull.
     @Override
-    @NonNull
     public Dialog onCreateDialog(Bundle savedInstanceState) {
         // Create a drawable version of the favorite icon.
         Drawable favoriteIconDrawable = new BitmapDrawable(getResources(), MainWebViewActivity.favoriteIcon);
 
-        // Get the activity's layout inflater.
-        LayoutInflater customDialogInflater = getActivity().getLayoutInflater();
-
-        // Use AlertDialog.Builder to create the AlertDialog.  The style formats the color of the button text.
+        // Use `AlertDialog.Builder` to create the `AlertDialog`.  The style formats the color of the button text.
         AlertDialog.Builder createBookmarkDialogBuilder = new AlertDialog.Builder(getActivity(), R.style.PrivacyBrowser_AlertDialog);
         createBookmarkDialogBuilder.setTitle(R.string.create_bookmark);
         createBookmarkDialogBuilder.setIcon(favoriteIconDrawable);
-        // The parent view is "null" because it will be assigned by AlertDialog.
-        createBookmarkDialogBuilder.setView(customDialogInflater.inflate(R.layout.create_bookmark_dialog, null));
+        // The parent view is `null` because it will be assigned by `AlertDialog`.
+        createBookmarkDialogBuilder.setView(getActivity().getLayoutInflater().inflate(R.layout.create_bookmark_dialog, null));
 
-        // Set an onClick listener on the negative button.
+        // Set an `onClick()` listener for the negative button.
         createBookmarkDialogBuilder.setNegativeButton(R.string.cancel, new DialogInterface.OnClickListener() {
             @Override
             public void onClick(DialogInterface dialog, int which) {
+                // Return the `DialogFragment` to the parent activity on cancel.
                 createBookmarkListener.onCreateBookmarkCancel(CreateBookmark.this);
             }
         });
 
-        // Set an onClick listener on the positive button.
+        // Set an `onClick()` listener for the positive button.
         createBookmarkDialogBuilder.setPositiveButton(R.string.create, new DialogInterface.OnClickListener() {
             @Override
             public void onClick(DialogInterface dialog, int which) {
+                // Return the `DialogFragment` to the parent activity on create.
                 createBookmarkListener.onCreateBookmarkCreate(CreateBookmark.this);
             }
         });
 
 
-        // Create an AlertDialog from the AlertDialog.Builder.
+        // Create an `AlertDialog` from the `AlertDialog.Builder`.
         final AlertDialog createBookmarkDialog = createBookmarkDialogBuilder.create();
 
-        // Show the keyboard when the Dialog is displayed on the screen.
+        // Show the keyboard when the `Dialog` is displayed on the screen.
         createBookmarkDialog.getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_VISIBLE);
 
-        // We need to show the AlertDialog before we can call setOnKeyListener() below.
+        // We need to show the `AlertDialog` before we can call `setOnKeyListener()` below.
         createBookmarkDialog.show();
 
-        // Allow the "enter" key on the keyboard to create the bookmark from "create_bookmark_name_edittext".
+        // Allow the `enter` key on the keyboard to create the bookmark from `create_bookmark_name_edittext`.
         EditText createBookmarkNameEditText = (EditText) createBookmarkDialog.findViewById(R.id.create_bookmark_name_edittext);
         assert createBookmarkNameEditText != null;  // Remove the warning below that createBookmarkNameEditText might be null.
         createBookmarkNameEditText.setOnKeyListener(new View.OnKeyListener() {
             public boolean onKey(View v, int keyCode, KeyEvent event) {
-                // If the event is a key-down on the "enter" button, select the PositiveButton "Create".
+                // If the event is a key-down on the `enter` button, select the PositiveButton `Create`.
                 if ((event.getAction() == KeyEvent.ACTION_DOWN) && (keyCode == KeyEvent.KEYCODE_ENTER)) {
-                    // Trigger the createBookmarkListener.
+                    // Trigger `createBookmarkListener` and return the DialogFragment to the parent activity.
                     createBookmarkListener.onCreateBookmarkCreate(CreateBookmark.this);
-
-                    // Manually dismiss the AlertDialog.
+                    // Manually dismiss the `AlertDialog`.
                     createBookmarkDialog.dismiss();
-
                     // Consume the event.
                     return true;
                 } else {  // If any other key was pressed, do not consume the event.
@@ -120,22 +115,20 @@ public class CreateBookmark extends DialogFragment {
             }
         });
 
-        // Set the formattedUrlString as the initial text of "create_bookmark_url_edittext".
+        // Set the formattedUrlString as the initial text of `create_bookmark_url_edittext`.
         EditText createBookmarkUrlEditText = (EditText) createBookmarkDialog.findViewById(R.id.create_bookmark_url_edittext);
-        assert createBookmarkUrlEditText != null;// Remove the warning below that createBookmarkUrlEditText might be null.
+        assert createBookmarkUrlEditText != null;// Remove the warning below that `createBookmarkUrlEditText` might be null.
         createBookmarkUrlEditText.setText(MainWebViewActivity.formattedUrlString);
 
-        // Allow the "enter" key on the keyboard to create the bookmark from "create_bookmark_url_edittext".
+        // Allow the `enter` key on the keyboard to create the bookmark from `create_bookmark_url_edittext`.
         createBookmarkUrlEditText.setOnKeyListener(new View.OnKeyListener() {
             public boolean onKey(View v, int keyCode, KeyEvent event) {
                 // If the event is a key-down on the "enter" button, select the PositiveButton "Create".
                 if ((event.getAction() == KeyEvent.ACTION_DOWN) && (keyCode == KeyEvent.KEYCODE_ENTER)) {
-                    // Trigger the create listener.
+                    // Trigger `createBookmarkListener` and return the DialogFragment to the parent activity.
                     createBookmarkListener.onCreateBookmarkCreate(CreateBookmark.this);
-
-                    // Manually dismiss the AlertDialog.
+                    // Manually dismiss the `AlertDialog`.
                     createBookmarkDialog.dismiss();
-
                     // Consume the event.
                     return true;
                 } else { // If any other key was pressed, do not consume the event.
@@ -144,7 +137,7 @@ public class CreateBookmark extends DialogFragment {
             }
         });
 
-        // onCreateDialog requires the return of an AlertDialog
+        // `onCreateDialog()` requires the return of an `AlertDialog`.
         return createBookmarkDialog;
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/stoutner/privacybrowser/CreateHomeScreenShortcut.java b/app/src/main/java/com/stoutner/privacybrowser/CreateHomeScreenShortcut.java
index f4f4034e..ea225ca3 100644
--- a/app/src/main/java/com/stoutner/privacybrowser/CreateHomeScreenShortcut.java
+++ b/app/src/main/java/com/stoutner/privacybrowser/CreateHomeScreenShortcut.java
@@ -26,7 +26,6 @@ import android.content.DialogInterface;
 import android.graphics.drawable.BitmapDrawable;
 import android.graphics.drawable.Drawable;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
 // If we don't use android.support.v7.app.AlertDialog instead of android.app.AlertDialog then the dialog will be covered by the keyboard.
 import android.support.v7.app.AlertDialog;
 import android.view.KeyEvent;
@@ -56,9 +55,7 @@ public class CreateHomeScreenShortcut extends DialogFragment {
         }
     }
 
-    // onCreateDialog requires @NonNull.
     @Override
-    @NonNull
     public Dialog onCreateDialog(Bundle savedInstanceState) {
         // Create a drawable version of the favorite icon.
         Drawable favoriteIconDrawable = new BitmapDrawable(getResources(), MainWebViewActivity.favoriteIcon);
diff --git a/app/src/main/java/com/stoutner/privacybrowser/EditBookmark.java b/app/src/main/java/com/stoutner/privacybrowser/EditBookmark.java
new file mode 100644
index 00000000..27d522b8
--- /dev/null
+++ b/app/src/main/java/com/stoutner/privacybrowser/EditBookmark.java
@@ -0,0 +1,166 @@
+/**
+ * Copyright 2016 Soren Stoutner <soren@stoutner.com>.
+ *
+ * This file is part of Privacy Browser <https://www.stoutner.com/privacy-browser>.
+ *
+ * Privacy Browser is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Privacy Browser is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Privacy Browser.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.stoutner.privacybrowser;
+
+import android.app.Activity;
+import android.app.Dialog;
+import android.app.DialogFragment;
+import android.content.DialogInterface;
+import android.database.Cursor;
+import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
+import android.graphics.drawable.BitmapDrawable;
+import android.graphics.drawable.Drawable;
+import android.os.Bundle;
+// If we don't use `android.support.v7.app.AlertDialog` instead of `android.app.AlertDialog` then the dialog will be covered by the keyboard.
+import android.support.v7.app.AlertDialog;
+import android.view.KeyEvent;
+import android.view.View;
+import android.view.WindowManager;
+import android.widget.EditText;
+import android.widget.ImageView;
+
+public class EditBookmark extends DialogFragment {
+    // The public interface is used to send information back to the parent activity.
+    public interface EditBookmarkListener {
+        void onEditBookmarkCancel(DialogFragment editBookmarkDialogFragment);
+
+        void onEditBookmarkSave(DialogFragment editBookmarkDialogFragment);
+    }
+
+    // `editBookmarkListener` is used in `onAttach()` and `onCreateDialog()`
+    private EditBookmarkListener editBookmarkListener;
+
+    public void onAttach(Activity parentActivity) {
+        super.onAttach(parentActivity);
+
+        // Get a handle for `EditBookmarkListener` from the `parentActivity`.
+        try {
+            editBookmarkListener = (EditBookmarkListener) parentActivity;
+        } catch(ClassCastException exception) {
+            throw new ClassCastException(parentActivity.toString() + " must implement EditBookmarkListener.");
+        }
+    }
+
+    @Override
+    public Dialog onCreateDialog(Bundle savedInstanceState) {
+        // Get a long array with the the databaseId of the selected bookmark and convert it to an `int`.
+        long[] selectedBookmarksLongArray = BookmarksActivity.bookmarksListView.getCheckedItemIds();
+        int selectedBookmarkDatabaseId = (int) selectedBookmarksLongArray[0];
+
+        // Get a `Cursor` with the specified bookmark and move it to the first position.
+        Cursor bookmarkCursor = BookmarksActivity.bookmarksDatabaseHandler.getBookmarkCursor(selectedBookmarkDatabaseId);
+        bookmarkCursor.moveToFirst();
+
+        // Get the favorite icon byte array from the `Cursor`.
+        byte[] favoriteIconByteArray = bookmarkCursor.getBlob(bookmarkCursor.getColumnIndex(BookmarksDatabaseHandler.FAVORITE_ICON));
+        // Convert the byte array to a `Bitmap` beginning at the first byte and ending at the last.
+        Bitmap favoriteIconBitmap = BitmapFactory.decodeByteArray(favoriteIconByteArray, 0, favoriteIconByteArray.length);
+        // Convert the `Bitmap` to a `Drawable`.
+        Drawable favoriteIconDrawable = new BitmapDrawable(getResources(), favoriteIconBitmap);
+
+        // Use `AlertDialog.Builder` to create the `AlertDialog`.  The style formats the color of the button text.
+        AlertDialog.Builder editBookmarkDialogBuilder = new AlertDialog.Builder(getActivity(), R.style.PrivacyBrowser_AlertDialog);
+        editBookmarkDialogBuilder.setTitle(R.string.edit_bookmark);
+        editBookmarkDialogBuilder.setIcon(favoriteIconDrawable);
+        // The parent view is `null` because it will be assigned by `AlertDialog`.
+        editBookmarkDialogBuilder.setView(getActivity().getLayoutInflater().inflate(R.layout.edit_bookmark_dialog, null));
+
+        // Set an `onClick()` listener for the negative button.
+        editBookmarkDialogBuilder.setNegativeButton(R.string.cancel, new Dialog.OnClickListener() {
+            @Override
+            public void onClick(DialogInterface dialog, int which) {
+                // Return the `DialogFragment` to the parent activity on cancel.
+                editBookmarkListener.onEditBookmarkCancel(EditBookmark.this);
+            }
+        });
+
+        // Set the `onClick()` listener fo the positive button.
+        editBookmarkDialogBuilder.setPositiveButton(R.string.save, new Dialog.OnClickListener() {
+            @Override
+            public void onClick(DialogInterface dialog, int which) {
+                // Return the `DialogFragment` to the parent activity on save.
+                editBookmarkListener.onEditBookmarkSave(EditBookmark.this);
+            }
+        });
+
+
+        // Create an `AlertDialog` from the `AlertDialog.Builder`.
+        final AlertDialog editBookmarkDialog = editBookmarkDialogBuilder.create();
+
+        // Show the keyboard when the `Dialog` is displayed on the screen.
+        editBookmarkDialog.getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_VISIBLE);
+
+        // We need to show the `AlertDialog` before we can call `setOnKeyListener()` below.
+        editBookmarkDialog.show();
+
+        // Get a `Drawable` of the favorite icon from `mainWebView` and display it in `edit_bookmark_new_favorite_icon`.
+        ImageView newFavoriteIcon = (ImageView) editBookmarkDialog.findViewById(R.id.edit_bookmark_new_favorite_icon);
+        assert newFavoriteIcon != null;  // Remove the warning below that `newFavoriteIcon` might be null.
+        newFavoriteIcon.setImageBitmap(MainWebViewActivity.favoriteIcon);
+
+        // Load the text for `edit_bookmark_name_edittext`.
+        EditText bookmarkNameEditText = (EditText) editBookmarkDialog.findViewById(R.id.edit_bookmark_name_edittext);
+        assert bookmarkNameEditText != null;  // Remove the warning below that `bookmarkNameEditText` might be null.
+        bookmarkNameEditText.setText(bookmarkCursor.getString(bookmarkCursor.getColumnIndex(BookmarksDatabaseHandler.BOOKMARK_NAME)));
+
+        // Allow the `enter` key on the keyboard to save the bookmark from `edit_bookmark_name_edittext`.
+        bookmarkNameEditText.setOnKeyListener(new View.OnKeyListener() {
+            public boolean onKey(View v, int keyCode, KeyEvent event) {
+                // If the event is a key-down on the "enter" button, select the PositiveButton `Save`.
+                if ((event.getAction() == KeyEvent.ACTION_DOWN) && (keyCode == KeyEvent.KEYCODE_ENTER)) {
+                    // Trigger `editBookmarkListener` and return the DialogFragment to the parent activity.
+                    editBookmarkListener.onEditBookmarkSave(EditBookmark.this);
+                    // Manually dismiss the `AlertDialog`.
+                    editBookmarkDialog.dismiss();
+                    // Consume the event.
+                    return true;
+                } else {  // If any other key was pressed, do not consume the event.
+                    return false;
+                }
+            }
+        });
+
+        // Load the text for `create_bookmark_url_edittext`.
+        EditText bookmarkUrlEditText = (EditText) editBookmarkDialog.findViewById(R.id.edit_bookmark_url_edittext);
+        assert bookmarkUrlEditText != null;// Remove the warning below that `bookmarkUrlEditText` might be null.
+        bookmarkUrlEditText.setText(bookmarkCursor.getString(bookmarkCursor.getColumnIndex(BookmarksDatabaseHandler.BOOKMARK_URL)));
+
+        // Allow the "enter" key on the keyboard to save the bookmark from `edit_bookmark_url_edittext`.
+        bookmarkUrlEditText.setOnKeyListener(new View.OnKeyListener() {
+            public boolean onKey(View v, int keyCode, KeyEvent event) {
+                // If the event is a key-down on the `enter` button, select the PositiveButton `Save`.
+                if ((event.getAction() == KeyEvent.ACTION_DOWN) && (keyCode == KeyEvent.KEYCODE_ENTER)) {
+                    // Trigger `editBookmarkListener` and return the DialogFragment to the parent activity.
+                    editBookmarkListener.onEditBookmarkSave(EditBookmark.this);
+                    // Manually dismiss the `AlertDialog`.
+                    editBookmarkDialog.dismiss();
+                    // Consume the event.
+                    return true;
+                } else { // If any other key was pressed, do not consume the event.
+                    return false;
+                }
+            }
+        });
+
+        // `onCreateDialog` requires the return of an `AlertDialog`.
+        return editBookmarkDialog;
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/stoutner/privacybrowser/MainWebViewActivity.java b/app/src/main/java/com/stoutner/privacybrowser/MainWebViewActivity.java
index 5f549b25..e59168fe 100644
--- a/app/src/main/java/com/stoutner/privacybrowser/MainWebViewActivity.java
+++ b/app/src/main/java/com/stoutner/privacybrowser/MainWebViewActivity.java
@@ -65,8 +65,8 @@ import java.net.URLEncoder;
 
 // We need to use AppCompatActivity from android.support.v7.app.AppCompatActivity to have access to the SupportActionBar until the minimum API is >= 21.
 public class MainWebViewActivity extends AppCompatActivity implements NavigationView.OnNavigationItemSelectedListener, CreateHomeScreenShortcut.CreateHomeScreenSchortcutListener {
-    // favoriteIcon is public static so it can be accessed from CreateHomeScreenShortcut and BookmarksActivity.
-    // It is also used in onCreate() and onCreateHomeScreenShortcutCreate().
+    // `favoriteIcon` is public static so it can be accessed from `CreateHomeScreenShortcut`, `BookmarksActivity`, and `EditBookmark`.
+    // It is also used in `onCreate()` and `onCreateHomeScreenShortcutCreate()`.
     public static Bitmap favoriteIcon;
 
     // mainWebView is public static so it can be accessed from SettingsFragment.
diff --git a/app/src/main/res/drawable/back.xml b/app/src/main/res/drawable/back.xml
index 28da543b..e69b5ad5 100644
--- a/app/src/main/res/drawable/back.xml
+++ b/app/src/main/res/drawable/back.xml
@@ -3,6 +3,7 @@
 
 <vector
     xmlns:android="http://schemas.android.com/apk/res/android"
+    android:autoMirrored="true"
     android:height="24dp"
     android:width="24dp"
     android:viewportHeight="24.0"
diff --git a/app/src/main/res/drawable/edit.xml b/app/src/main/res/drawable/edit.xml
new file mode 100644
index 00000000..d5164881
--- /dev/null
+++ b/app/src/main/res/drawable/edit.xml
@@ -0,0 +1,15 @@
+<!-- edit.xml comes from the Android Material icon set, where it is called ic_edit.
+  It is released under the CC-BY license <https://creativecommons.org/licenses/by/4.0/>. -->
+
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:autoMirrored="true"
+    android:height="24dp"
+    android:width="24dp"
+    android:viewportHeight="24.0"
+    android:viewportWidth="24.0" >
+
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M3,17.25V21h3.75L17.81,9.94l-3.75,-3.75L3,17.25zM20.71,7.04c0.39,-0.39 0.39,-1.02 0,-1.41l-2.34,-2.34c-0.39,-0.39 -1.02,-0.39 -1.41,0l-1.83,1.83 3.75,3.75 1.83,-1.83z"/>
+</vector>
diff --git a/app/src/main/res/drawable/exit.xml b/app/src/main/res/drawable/exit.xml
index f50586d2..89d4faff 100644
--- a/app/src/main/res/drawable/exit.xml
+++ b/app/src/main/res/drawable/exit.xml
@@ -3,6 +3,7 @@
 
 <vector
     xmlns:android="http://schemas.android.com/apk/res/android"
+    android:autoMirrored="true"
     android:height="24dp"
     android:width="24dp"
     android:viewportHeight="24.0"
diff --git a/app/src/main/res/drawable/forward.xml b/app/src/main/res/drawable/forward.xml
index af4e5176..e8ccd370 100644
--- a/app/src/main/res/drawable/forward.xml
+++ b/app/src/main/res/drawable/forward.xml
@@ -3,6 +3,7 @@
 
 <vector
     xmlns:android="http://schemas.android.com/apk/res/android"
+    android:autoMirrored="true"
     android:height="24dp"
     android:width="24dp"
     android:viewportHeight="24.0"
diff --git a/app/src/main/res/layout/create_bookmark_dialog.xml b/app/src/main/res/layout/create_bookmark_dialog.xml
index 35a5e020..48e7cc79 100644
--- a/app/src/main/res/layout/create_bookmark_dialog.xml
+++ b/app/src/main/res/layout/create_bookmark_dialog.xml
@@ -19,38 +19,50 @@
   along with Privacy Browser.  If not, see <http://www.gnu.org/licenses/>. -->
 
 <LinearLayout
-    android:id="@+id/create_bookmark_dialog_linearlayout"
     xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
     android:layout_height="wrap_content"
-    android:layout_width="match_parent" >
-
-    <!-- android:imeOptions="actionGo" sets the keyboard to have a "go" key instead of a "new line" key.
-        android:imeOptions=flagNoExtractUi" doesn't cover up the entire UI when typing in landscape orientation.
-        android:inputType="textUri" disables spell check in the EditText.
-        android:singleLine="true" is not needed in a Dialog.-->
-    <EditText
-        android:id="@+id/create_bookmark_name_edittext"
+    android:layout_width="match_parent"
+    android:orientation="vertical" >
+
+    <!-- `android.support.design.widget.TextInputLayout` makes the `android:hint` float above the `EditText`. -->
+    <android.support.design.widget.TextInputLayout
         android:layout_height="wrap_content"
         android:layout_width="match_parent"
-        android:layout_marginTop="16dp"
-        android:layout_marginLeft="4dp"
-        android:layout_marginRight="4dp"
-        android:layout_marginBottom="4dp"
-        android:hint="@string/bookmark_name"
-        android:imeOptions="actionGo|flagNoExtractUi"
-        android:inputType="textUri" />
-
-    <EditText
-        android:id="@+id/create_bookmark_url_edittext"
+        android:layout_marginTop="12dp"
+        android:layout_marginBottom="6dp"
+        android:layout_marginStart="4dp"
+        android:layout_marginEnd="4dp">
+
+        <!-- `android:imeOptions="actionGo"` sets the keyboard to have a "go" key instead of a "new line" key.
+            `android:inputType="textUri"` disables spell check in the EditText.
+            `android:singleLine="true"` is not needed in a Dialog.-->
+        <android.support.design.widget.TextInputEditText
+            android:id="@+id/create_bookmark_name_edittext"
+            android:layout_height="wrap_content"
+            android:layout_width="match_parent"
+            android:hint="@string/bookmark_name"
+            android:imeOptions="actionGo"
+            android:inputType="textUri" />
+        </android.support.design.widget.TextInputLayout>
+
+    <!-- `android.support.design.widget.TextInputLayout` makes the `android:hint` float above the `EditText`. -->
+    <android.support.design.widget.TextInputLayout
         android:layout_height="wrap_content"
         android:layout_width="match_parent"
-        android:layout_marginTop="4dp"
-        android:layout_marginLeft="4dp"
-        android:layout_marginRight="4dp"
-        android:layout_marginBottom="16dp"
-        android:hint="@string/bookmark_url"
-        android:imeOptions="actionGo|flagNoExtractUi"
-        android:inputType="textUri" />
+        android:layout_marginTop="6dp"
+        android:layout_marginBottom="12dp"
+        android:layout_marginStart="4dp"
+        android:layout_marginEnd="4dp" >
 
+        <!-- `android:imeOptions="actionGo"` sets the keyboard to have a "go" key instead of a "new line" key.
+            `android:inputType="textUri"` disables spell check in the EditText.
+            `android:singleLine="true"` is not needed in a Dialog.-->
+        <EditText
+            android:id="@+id/create_bookmark_url_edittext"
+            android:layout_height="wrap_content"
+            android:layout_width="match_parent"
+            android:hint="@string/bookmark_url"
+            android:imeOptions="actionGo"
+            android:inputType="textUri" />
+    </android.support.design.widget.TextInputLayout>
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/create_home_screen_shortcut_dialog.xml b/app/src/main/res/layout/create_home_screen_shortcut_dialog.xml
index 32d2eb4d..5e924111 100644
--- a/app/src/main/res/layout/create_home_screen_shortcut_dialog.xml
+++ b/app/src/main/res/layout/create_home_screen_shortcut_dialog.xml
@@ -21,23 +21,22 @@
 <RelativeLayout
     android:id="@+id/create_home_screen_shortcut_dialog_relativelayout"
     xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content" >
+    android:layout_height="wrap_content"
+    android:layout_width="match_parent" >
 
-    <!-- android:imeOptions="actionGo" sets the keyboard to have a "go" key instead of a "new line" key.
-        android:imeOptions=flagNoExtractUi" doesn't cover up the entire UI when typing in landscape orientation.
-        android:inputType="textUri" disables spell check in the EditText.
-        android:singleLine="true" is not needed in a Dialog.-->
+    <!-- `android:imeOptions="actionGo"` sets the keyboard to have a "go" key instead of a "new line" key.
+        `android:inputType="textUri"` disables spell check in the EditText.
+        `android:singleLine="true"` is not needed in a Dialog.
+        We can't use `android:imeOptions=flagNoExtractUi"` because it disables tapping to select in landscape orientation on small devices.-->
     <EditText
         android:id="@+id/shortcut_name_edittext"
-        android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:layout_width="match_parent"
         android:layout_marginTop="16dp"
         android:layout_marginLeft="4dp"
         android:layout_marginRight="4dp"
         android:layout_marginBottom="16dp"
         android:hint="@string/shortcut_name"
-        android:imeOptions="actionGo|flagNoExtractUi"
+        android:imeOptions="actionGo"
         android:inputType="textUri" />
-
 </RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/edit_bookmark_dialog.xml b/app/src/main/res/layout/edit_bookmark_dialog.xml
new file mode 100644
index 00000000..1768ca08
--- /dev/null
+++ b/app/src/main/res/layout/edit_bookmark_dialog.xml
@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+  Copyright 2016 Soren Stoutner <soren@stoutner.com>.
+
+  This file is part of Privacy Browser <https://www.stoutner.com/privacy-browser>.
+
+  Privacy Browser is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  Privacy Browser is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with Privacy Browser.  If not, see <http://www.gnu.org/licenses/>. -->
+
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    android:paddingStart="4dp"
+    android:paddingEnd="4dp" >
+
+    <LinearLayout
+        android:layout_height="wrap_content"
+        android:layout_width="match_parent"
+        android:orientation="horizontal"
+        android:paddingTop="12dp"
+        android:paddingBottom="4dp"
+        android:paddingStart="20dp"
+        android:paddingEnd="0dp" >
+
+        <ImageView
+            android:id="@+id/edit_bookmark_new_favorite_icon"
+            android:layout_width="32dp"
+            android:layout_height="32dp"
+            android:contentDescription="@string/new_favorite_icon" />
+
+        <TextView
+            android:layout_height="wrap_content"
+            android:layout_width="wrap_content"
+            android:text="@string/use_new_icon"
+            android:textColor="@color/black"
+            android:textSize="20sp"
+            android:paddingStart="8dp"
+            android:paddingEnd="4dp" />
+
+        <CheckBox
+            android:id="@+id/edit_bookmark_use_new_favorite_icon_checkbox"
+            android:layout_height="wrap_content"
+            android:layout_width="wrap_content" />
+    </LinearLayout>
+
+    <!-- `android.support.design.widget.TextInputLayout` makes the `android:hint` float above the `EditText`. -->
+    <android.support.design.widget.TextInputLayout
+        android:layout_height="wrap_content"
+        android:layout_width="match_parent"
+        android:layout_marginTop="12dp"
+        android:layout_marginBottom="6dp" >
+
+        <!-- `android:imeOptions="actionGo"` sets the keyboard to have a "go" key instead of a "new line" key.
+            `android:inputType="textUri"` disables spell check in the EditText.
+            `android:singleLine="true"` is not needed in a Dialog.-->
+        <android.support.design.widget.TextInputEditText
+            android:id="@+id/edit_bookmark_name_edittext"
+            android:layout_height="wrap_content"
+            android:layout_width="match_parent"
+            android:hint="@string/bookmark_name"
+            android:imeOptions="actionGo"
+            android:inputType="textUri" />
+    </android.support.design.widget.TextInputLayout>
+
+    <!-- `android.support.design.widget.TextInputLayout` makes the `android:hint` float above the `EditText`. -->
+    <android.support.design.widget.TextInputLayout
+        android:layout_height="wrap_content"
+        android:layout_width="match_parent"
+        android:layout_marginTop="6dp"
+        android:layout_marginBottom="12dp" >
+
+        <!-- `android:imeOptions="actionGo"` sets the keyboard to have a "go" key instead of a "new line" key.
+            `android:inputType="textUri"` disables spell check in the EditText.
+            `android:singleLine="true"` is not needed in a Dialog.-->
+        <EditText
+            android:id="@+id/edit_bookmark_url_edittext"
+            android:layout_height="wrap_content"
+            android:layout_width="match_parent"
+            android:hint="@string/bookmark_url"
+            android:imeOptions="actionGo"
+            android:inputType="textUri" />
+    </android.support.design.widget.TextInputLayout>
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/main_coordinatorlayout.xml b/app/src/main/res/layout/main_coordinatorlayout.xml
index b59aeb45..520f450e 100644
--- a/app/src/main/res/layout/main_coordinatorlayout.xml
+++ b/app/src/main/res/layout/main_coordinatorlayout.xml
@@ -71,7 +71,8 @@
         android:layout_height="match_parent"
         android:layout_gravity="start"
         app:headerLayout="@layout/navigation_header"
-        app:menu="@menu/webview_navigation_menu"/>
+        app:menu="@menu/webview_navigation_menu"
+        app:itemIconTint="@color/blue_gray" />
 
     <!-- fullScreenVideoFrameLayout is used to display full screen videos.  It is initially android:visibility="gone" to hide it from view. -->
     <FrameLayout
diff --git a/app/src/main/res/layout/url_bar.xml b/app/src/main/res/layout/url_bar.xml
index 8b6e3761..4ee8cbda 100644
--- a/app/src/main/res/layout/url_bar.xml
+++ b/app/src/main/res/layout/url_bar.xml
@@ -18,7 +18,7 @@
   You should have received a copy of the GNU General Public License
   along with Privacy Browser.  If not, see <http://www.gnu.org/licenses/>. -->
 
-<!-- FrameLayout lets the ProgressBar float on top of urlTextBox. -->
+<!-- FrameLayout lets the ProgressBar float on top of `urlTextBox`. -->
 <FrameLayout
     android:id="@+id/addressBarFrameLayout"
     xmlns:android="http://schemas.android.com/apk/res/android"
@@ -31,32 +31,31 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
 
-        <!-- Set the program icon as the initial favoriteIcon. -->
-        <!-- layout_width and layout_height of 26dp matches the AppBar icons. -->
+        <!-- Set the program icon as the initial favoriteIcon.
+            `layout_height` and `layout_width` and of 26dp matches the AppBar icons. -->
         <ImageView
             android:id="@+id/favoriteIcon"
             android:src="@drawable/world"
-            android:layout_width="26dp"
             android:layout_height="26dp"
+            android:layout_width="26dp"
             android:layout_centerVertical="true"
             android:contentDescription="@string/favorite_icon"/>
 
-        <!-- android:imeOptions="actionGo" sets the keyboard to have a "go" key instead of a "new line" key. -->
-        <!-- android:imeOptions=flagNoExtractUi" doesn't cover up the entire UI when typing in landscape orientation. -->
-        <!-- android:inputType="textUri" disables spell check in the EditText. -->
-        <!-- android:layout_toEndOf requires API >= 17, but is compatible with right-to-left layouts.  android:layout_toRightOf is required for previous APIs. -->
+        <!-- `android:imeOptions="actionGo"` sets the keyboard to have a "go" key instead of a "new line" key.
+            `android:inputType="textUri"` disables spell check in the EditText.
+            We can't use `android:imeOptions=flagNoExtractUi"` because it disables tapping to select in landscape orientation on small devices. -->
         <EditText
             android:id="@+id/urlTextBox"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_toEndOf="@id/favoriteIcon"
-            android:layout_toRightOf="@id/favoriteIcon"
-            android:imeOptions="actionGo|flagNoExtractUi"
+            android:hint="@string/url_or_search_terms"
+            android:imeOptions="actionGo"
             android:inputType="textUri" />
     </RelativeLayout>
 
-    <!-- android:max changes the maximum ProgressBar value from 10000 to 100 to match progress percentage. -->
-    <!-- android:layout_height="2dp" works best for API 23 "Marshmallow", but "3dp" is required for visibility on API <= 22. -->
+    <!-- android:max changes the maximum ProgressBar value from 10000 to 100 to match progress percentage.
+        android:layout_height="2dp" works best for API 23 "Marshmallow", but "3dp" is required for visibility on API <= 22. -->
     <ProgressBar
         android:id="@+id/progressBar"
         style="?android:attr/progressBarStyleHorizontal"
@@ -67,5 +66,4 @@
         android:progressTint="@color/blue"
         android:progressBackgroundTint="@color/white"
         android:visibility="gone" />
-
 </FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/menu/bookmarks_context_menu.xml b/app/src/main/res/menu/bookmarks_context_menu.xml
index 0d64adc0..6b2fc748 100644
--- a/app/src/main/res/menu/bookmarks_context_menu.xml
+++ b/app/src/main/res/menu/bookmarks_context_menu.xml
@@ -22,10 +22,17 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
+    <item
+        android:id="@+id/edit_bookmark"
+        android:title="@string/edit"
+        android:orderInCategory="10"
+        android:icon="@drawable/edit"
+        app:showAsAction="ifRoom" />
+
     <item
         android:id="@+id/delete_bookmark"
         android:title="@string/delete"
-        android:orderInCategory="10"
+        android:orderInCategory="20"
         android:icon="@drawable/delete"
         app:showAsAction="ifRoom" />
 </menu>
\ No newline at end of file
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index dad5ef3f..02fa590f 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -22,7 +22,8 @@
 <resources>
     <color name="black">#FF000000</color>
     <color name="blue">#FF1976D2</color>
-    <color name="dark_blue">#FF0D4781</color>
+    <color name="dark_blue">#FF0D47A1</color>
+    <color name="blue_gray">#FF607d8b</color>
     <color name="green">#FF64DD17</color>
     <color name="light_blue">#FFBBDEFB</color>
     <color name="red">#FFD50000</color>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 6c87a126..5b5ad90d 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -35,6 +35,7 @@
 
     <!-- Custom App Bar. -->
     <string name="favorite_icon">Favorite Icon</string>
+    <string name="url_or_search_terms">URL or Search Terms</string>
 
     <!-- Main WebView Navigation Drawer. -->
     <string name="navigation_drawer">Navigation Drawer</string>
@@ -70,11 +71,16 @@
 
     <!-- Bookmarks. -->
     <string name="create_bookmark">Create bookmark</string>
+    <string name="edit_bookmark">Edit bookmark</string>
+    <string name="save">Save</string>
     <string name="bookmark_name">Bookmark name</string>
     <string name="bookmark_url">Bookmark URL</string>
+    <string name="new_favorite_icon">New favorite icon</string>
+    <string name="use_new_icon">Use new icon</string>
 
     <!-- Bookmarks Contextual App Bar. -->
     <string name="selected">Selected</string>
+    <string name="edit">Edit</string>
     <string name="delete">Delete</string>
     <string name="one_bookmark_deleted">1 Bookmark Deleted</string>
     <string name="bookmarks_deleted">Bookmarks Deleted</string>
@@ -191,7 +197,7 @@
     <string name="permissions">Permissions</string>
     <string name="privacy_policy">Privacy Policy</string>
     <string name="changelog">Changelog</string>
-    <string name="license">License</string>
+    <string name="licenses">Licenses</string>
     <string name="contributors">Contributors</string>
     <string name="links">Links</string>
 
-- 
2.45.2