Commit b82950bc authored by Shakti Sahu's avatar Shakti Sahu Committed by Commit Bot

Read Later : Added reading list type to a few missing places

This CL adds
1- Handle reading list bookmark type in BookmarkId string serialization.
Serialized string ids will have 'r' prefix, similar to 'p' prefix
in partner bookmarks.
2- Added missing reading list type to BookmarkBridge::DoesBookmarkExist
3- Added missing reading list type to BookmarkBridge::DeleteBookmark.

Bug: 1139070
Change-Id: If34fc167ad5d92f22e13f941f55a04f9bea2bd0f
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2524704
Commit-Queue: Shakti Sahu <shaktisahu@chromium.org>
Reviewed-by: default avatarTheresa  <twellington@chromium.org>
Reviewed-by: default avatarXing Liu <xingliu@chromium.org>
Cr-Commit-Position: refs/heads/master@{#825486}
parent 8e7c02b8
...@@ -575,7 +575,8 @@ bool BookmarkBridge::DoesBookmarkExist(JNIEnv* env, ...@@ -575,7 +575,8 @@ bool BookmarkBridge::DoesBookmarkExist(JNIEnv* env,
if (!node) if (!node)
return false; return false;
if (type == BookmarkType::BOOKMARK_TYPE_NORMAL) { if (type == BookmarkType::BOOKMARK_TYPE_NORMAL ||
type == BookmarkType::BOOKMARK_TYPE_READING_LIST) {
return true; return true;
} else { } else {
DCHECK(type == BookmarkType::BOOKMARK_TYPE_PARTNER); DCHECK(type == BookmarkType::BOOKMARK_TYPE_PARTNER);
...@@ -749,10 +750,13 @@ void BookmarkBridge::DeleteBookmark( ...@@ -749,10 +750,13 @@ void BookmarkBridge::DeleteBookmark(
return; return;
} }
if (partner_bookmarks_shim_->IsPartnerBookmark(node)) if (partner_bookmarks_shim_->IsPartnerBookmark(node)) {
partner_bookmarks_shim_->RemoveBookmark(node); partner_bookmarks_shim_->RemoveBookmark(node);
else } else if (type == BookmarkType::BOOKMARK_TYPE_READING_LIST) {
reading_list_manager_->Delete(node->url());
} else {
bookmark_model_->Remove(node); bookmark_model_->Remove(node);
}
} }
void BookmarkBridge::RemoveAllUserBookmarks( void BookmarkBridge::RemoveAllUserBookmarks(
......
...@@ -18,6 +18,7 @@ public class BookmarkId { ...@@ -18,6 +18,7 @@ public class BookmarkId {
private static final String LOG_TAG = "BookmarkId"; private static final String LOG_TAG = "BookmarkId";
private static final char TYPE_PARTNER = 'p'; private static final char TYPE_PARTNER = 'p';
private static final char TYPE_READING_LIST = 'r';
private static final int ROOT_FOLDER_ID = -1; private static final int ROOT_FOLDER_ID = -1;
private final long mId; private final long mId;
...@@ -36,6 +37,8 @@ public class BookmarkId { ...@@ -36,6 +37,8 @@ public class BookmarkId {
switch (c) { switch (c) {
case TYPE_PARTNER: case TYPE_PARTNER:
return BookmarkType.PARTNER; return BookmarkType.PARTNER;
case TYPE_READING_LIST:
return BookmarkType.READING_LIST;
default: default:
return BookmarkType.NORMAL; return BookmarkType.NORMAL;
} }
...@@ -46,7 +49,7 @@ public class BookmarkId { ...@@ -46,7 +49,7 @@ public class BookmarkId {
* @return Whether the char representing the bookmark type is a valid type. * @return Whether the char representing the bookmark type is a valid type.
*/ */
private static boolean isValidBookmarkTypeFromChar(char c) { private static boolean isValidBookmarkTypeFromChar(char c) {
return c == TYPE_PARTNER; return c == TYPE_PARTNER || c == TYPE_READING_LIST;
} }
/** /**
...@@ -101,6 +104,8 @@ public class BookmarkId { ...@@ -101,6 +104,8 @@ public class BookmarkId {
switch (mType) { switch (mType) {
case BookmarkType.PARTNER: case BookmarkType.PARTNER:
return String.valueOf(TYPE_PARTNER); return String.valueOf(TYPE_PARTNER);
case BookmarkType.READING_LIST:
return String.valueOf(TYPE_READING_LIST);
case BookmarkType.NORMAL: case BookmarkType.NORMAL:
default: default:
return ""; return "";
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment