-
Notifications
You must be signed in to change notification settings - Fork 868
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #7513 from brave/userlytics_feedback_android
Userlytics feedback android
- Loading branch information
Showing
21 changed files
with
398 additions
and
112 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
118 changes: 118 additions & 0 deletions
118
android/java/org/chromium/chrome/browser/bookmarks/BraveBookmarkUtils.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,118 @@ | ||
| /* Copyright (c) 2020 The Brave Authors. All rights reserved. | ||
| * 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.chromium.chrome.browser.bookmarks; | ||
|
|
||
| import android.app.Activity; | ||
| import android.content.Context; | ||
|
|
||
| import org.chromium.base.BuildInfo; | ||
| import org.chromium.chrome.R; | ||
| import org.chromium.chrome.browser.bookmarks.BookmarkUtils; | ||
| import org.chromium.chrome.browser.tab.Tab; | ||
| import org.chromium.chrome.browser.ui.messages.snackbar.Snackbar; | ||
| import org.chromium.chrome.browser.ui.messages.snackbar.SnackbarManager; | ||
| import org.chromium.chrome.browser.ui.messages.snackbar.SnackbarManager.SnackbarController; | ||
| import org.chromium.components.bookmarks.BookmarkId; | ||
| import org.chromium.components.bookmarks.BookmarkType; | ||
|
|
||
| /** | ||
| * A class holding static util functions for bookmark. | ||
| */ | ||
| public class BraveBookmarkUtils extends BookmarkUtils { | ||
| private static final String TAG = "BraveBookmarkUtils"; | ||
| /** | ||
| * If the tab has already been bookmarked, start {@link BookmarkEditActivity} for the | ||
| * bookmark. If not, add the bookmark to bookmarkmodel, and show a snackbar notifying the user. | ||
| * | ||
| * Note: Takes ownership of bookmarkModel, and will call |destroy| on it when finished. | ||
| * | ||
| * @param existingBookmarkId The bookmark ID if the tab has already been bookmarked. | ||
| * @param bookmarkModel The bookmark model. | ||
| * @param tab The tab to add or edit a bookmark. | ||
| * @param snackbarManager The SnackbarManager used to show the snackbar. | ||
| * @param activity Current activity. | ||
| * @param fromCustomTab boolean indicates whether it is called by Custom Tab. | ||
| * @return Bookmark ID of the bookmark. Could be <code>null</code> if bookmark didn't exist | ||
| * and bookmark model failed to create it. | ||
| */ | ||
| public static BookmarkId addOrEditBookmark(long existingBookmarkId, BookmarkModel bookmarkModel, | ||
| Tab tab, SnackbarManager snackbarManager, Activity activity, boolean fromCustomTab) { | ||
| if (existingBookmarkId != BookmarkId.INVALID_ID) { | ||
| BookmarkId bookmarkId = new BookmarkId(existingBookmarkId, BookmarkType.NORMAL); | ||
| if (snackbarManager.isShowing()) { | ||
| snackbarManager.dismissAllSnackbars(); | ||
| } | ||
| bookmarkModel.deleteBookmark(bookmarkId); | ||
| bookmarkModel.destroy(); | ||
| return bookmarkId; | ||
| } | ||
|
|
||
| BookmarkId bookmarkId = | ||
| addBookmarkInternal(activity, bookmarkModel, tab.getTitle(), tab.getOriginalUrl()); | ||
|
|
||
| Snackbar snackbar = null; | ||
| if (bookmarkId == null) { | ||
| snackbar = Snackbar.make(activity.getString(R.string.bookmark_page_failed), | ||
| new SnackbarController() { | ||
| @Override | ||
| public void onDismissNoAction(Object actionData) {} | ||
|
|
||
| @Override | ||
| public void onAction(Object actionData) {} | ||
| }, | ||
| Snackbar.TYPE_NOTIFICATION, Snackbar.UMA_BOOKMARK_ADDED) | ||
| .setSingleLine(false); | ||
| } else { | ||
| String folderName = bookmarkModel.getBookmarkTitle( | ||
| bookmarkModel.getBookmarkById(bookmarkId).getParentId()); | ||
| SnackbarController snackbarController = | ||
| createSnackbarControllerForEditButton(activity, bookmarkId); | ||
| if (getLastUsedParent(activity) == null) { | ||
| if (fromCustomTab) { | ||
| String packageLabel = BuildInfo.getInstance().hostPackageLabel; | ||
| snackbar = Snackbar.make( | ||
| activity.getString(R.string.bookmark_page_saved, packageLabel), | ||
| snackbarController, Snackbar.TYPE_ACTION, Snackbar.UMA_BOOKMARK_ADDED); | ||
| } else { | ||
| snackbar = Snackbar.make( | ||
| activity.getString(R.string.bookmark_page_saved_default), | ||
| snackbarController, Snackbar.TYPE_ACTION, Snackbar.UMA_BOOKMARK_ADDED); | ||
| } | ||
| } else { | ||
| snackbar = Snackbar.make(folderName, snackbarController, Snackbar.TYPE_ACTION, | ||
| Snackbar.UMA_BOOKMARK_ADDED) | ||
| .setTemplateText( | ||
| activity.getString(R.string.bookmark_page_saved_folder)); | ||
| } | ||
| snackbar.setSingleLine(false).setAction( | ||
| activity.getString(R.string.bookmark_item_edit), null); | ||
| } | ||
| snackbarManager.showSnackbar(snackbar); | ||
|
|
||
| bookmarkModel.destroy(); | ||
| return bookmarkId; | ||
| } | ||
|
|
||
| /** | ||
| * An internal version of {@link #addBookmarkSilently(Context, BookmarkModel, String, String)}. | ||
| * Will reset last used parent if it fails to add a bookmark | ||
| */ | ||
| protected static BookmarkId addBookmarkInternal( | ||
| Context context, BookmarkModel bookmarkModel, String title, String url) { | ||
| assert (false); | ||
| return null; | ||
| } | ||
|
|
||
| /** | ||
| * Creates a snackbar controller for a case where "Edit" button is shown to edit the newly | ||
| * created bookmark. | ||
| */ | ||
| protected static SnackbarController createSnackbarControllerForEditButton( | ||
| final Activity activity, final BookmarkId bookmarkId) { | ||
| assert (false); | ||
| return null; | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.