-
Notifications
You must be signed in to change notification settings - Fork 859
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
47 changed files
with
1,460 additions
and
12 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
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
53 changes: 53 additions & 0 deletions
53
android/java/org/chromium/chrome/browser/app/bookmarks/BraveBookmarkActivity.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,53 @@ | ||
| /* Copyright (c) 2023 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 https://mozilla.org/MPL/2.0/. */ | ||
|
|
||
| package org.chromium.chrome.browser.app.bookmarks; | ||
|
|
||
| import android.content.Intent; | ||
| import android.os.Bundle; | ||
|
|
||
| import org.chromium.chrome.browser.bookmarks.BookmarkManagerCoordinator; | ||
| import org.chromium.chrome.browser.bookmarks.BraveBookmarkManagerCoordinator; | ||
| import org.chromium.ui.base.ActivityWindowAndroid; | ||
| import org.chromium.ui.base.IntentRequestTracker; | ||
|
|
||
| public class BraveBookmarkActivity extends BookmarkActivity { | ||
| // Overridden Chromium's BookmarkActivity.mBookmarkManagerCoordinator | ||
| private BookmarkManagerCoordinator mBookmarkManagerCoordinator; | ||
| private ActivityWindowAndroid mWindowAndroid; | ||
|
|
||
| @Override | ||
| protected void onCreate(Bundle savedInstanceState) { | ||
| super.onCreate(savedInstanceState); | ||
|
|
||
| IntentRequestTracker intentRequestTracker = IntentRequestTracker.createFromActivity(this); | ||
| mWindowAndroid = new ActivityWindowAndroid(this, true, intentRequestTracker); | ||
| mWindowAndroid.getIntentRequestTracker().restoreInstanceState(savedInstanceState); | ||
| if (mBookmarkManagerCoordinator instanceof BraveBookmarkManagerCoordinator) { | ||
| ((BraveBookmarkManagerCoordinator) mBookmarkManagerCoordinator) | ||
| .setWindow(mWindowAndroid); | ||
| } | ||
| } | ||
|
|
||
| @Override | ||
| protected void onSaveInstanceState(Bundle outState) { | ||
| super.onSaveInstanceState(outState); | ||
|
|
||
| mWindowAndroid.getIntentRequestTracker().saveInstanceState(outState); | ||
| } | ||
|
|
||
| @Override | ||
| protected void onActivityResult(int requestCode, int resultCode, Intent data) { | ||
| super.onActivityResult(requestCode, resultCode, data); | ||
| mWindowAndroid.getIntentRequestTracker().onActivityResult(requestCode, resultCode, data); | ||
| } | ||
|
|
||
| @Override | ||
| public void onRequestPermissionsResult( | ||
| int requestCode, String[] permissions, int[] grantResults) { | ||
| if (mWindowAndroid.handlePermissionResult(requestCode, permissions, grantResults)) return; | ||
| super.onRequestPermissionsResult(requestCode, permissions, grantResults); | ||
| } | ||
| } |
71 changes: 71 additions & 0 deletions
71
android/java/org/chromium/chrome/browser/bookmarks/BraveBookmarkBridge.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,71 @@ | ||
| /* Copyright (c) 2023 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 https://mozilla.org/MPL/2.0/. */ | ||
|
|
||
| package org.chromium.chrome.browser.bookmarks; | ||
|
|
||
| import androidx.appcompat.app.AppCompatActivity; | ||
|
|
||
| import org.chromium.base.annotations.CalledByNative; | ||
| import org.chromium.base.annotations.NativeMethods; | ||
| import org.chromium.ui.base.WindowAndroid; | ||
|
|
||
| class BraveBookmarkBridge extends BookmarkBridge { | ||
| // Overridden Chromium's BookmarkBridge.mNativeBookmarkBridge | ||
| private long mNativeBookmarkBridge; | ||
| private WindowAndroid mWindowAndroid; | ||
|
|
||
| BraveBookmarkBridge(long nativeBookmarkBridge) { | ||
| super(nativeBookmarkBridge); | ||
| } | ||
|
|
||
| @CalledByNative | ||
| public void bookmarksImported(boolean isSuccess) { | ||
| if (mWindowAndroid != null && mWindowAndroid.getContext().get() != null | ||
| && mWindowAndroid.getContext().get() instanceof AppCompatActivity) { | ||
| ((AppCompatActivity) mWindowAndroid.getContext().get()).runOnUiThread(new Runnable() { | ||
| @Override | ||
| public void run() { | ||
| BraveBookmarkUtils.showBookmarkImportExportDialog( | ||
| (AppCompatActivity) mWindowAndroid.getContext().get(), true, isSuccess); | ||
| } | ||
| }); | ||
| } | ||
| } | ||
|
|
||
| @CalledByNative | ||
| public void bookmarksExported(boolean isSuccess) { | ||
| if (mWindowAndroid != null && mWindowAndroid.getContext().get() != null | ||
| && mWindowAndroid.getContext().get() instanceof AppCompatActivity) { | ||
| ((AppCompatActivity) mWindowAndroid.getContext().get()).runOnUiThread(new Runnable() { | ||
| @Override | ||
| public void run() { | ||
| BraveBookmarkUtils.showBookmarkImportExportDialog( | ||
| (AppCompatActivity) mWindowAndroid.getContext().get(), false, | ||
| isSuccess); | ||
| } | ||
| }); | ||
| } | ||
| } | ||
|
|
||
| public void importBookmarks(WindowAndroid windowAndroid, String importFilePath) { | ||
| mWindowAndroid = windowAndroid; | ||
| BraveBookmarkBridgeJni.get().importBookmarks( | ||
| mNativeBookmarkBridge, BraveBookmarkBridge.this, windowAndroid, importFilePath); | ||
| } | ||
|
|
||
| public void exportBookmarks(WindowAndroid windowAndroid, String exportFilePath) { | ||
| mWindowAndroid = windowAndroid; | ||
| BraveBookmarkBridgeJni.get().exportBookmarks( | ||
| mNativeBookmarkBridge, BraveBookmarkBridge.this, windowAndroid, exportFilePath); | ||
| } | ||
|
|
||
| @NativeMethods | ||
| public interface Natives { | ||
| void importBookmarks(long nativeBraveBookmarkBridge, BraveBookmarkBridge caller, | ||
| WindowAndroid window, String importFilePath); | ||
| void exportBookmarks(long nativeBraveBookmarkBridge, BraveBookmarkBridge caller, | ||
| WindowAndroid window, String exportFilePath); | ||
| } | ||
| } |
12 changes: 12 additions & 0 deletions
12
android/java/org/chromium/chrome/browser/bookmarks/BraveBookmarkDelegate.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,12 @@ | ||
| /* Copyright (c) 2023 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 https://mozilla.org/MPL/2.0/. */ | ||
|
|
||
| package org.chromium.chrome.browser.bookmarks; | ||
|
|
||
| public interface BraveBookmarkDelegate extends BookmarkDelegate { | ||
| void importBookmarks(); | ||
|
|
||
| void exportBookmarks(); | ||
| } |
99 changes: 99 additions & 0 deletions
99
...d/java/org/chromium/chrome/browser/bookmarks/BraveBookmarkImportExportDialogFragment.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,99 @@ | ||
| /* Copyright (c) 2023 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 https://mozilla.org/MPL/2.0/. */ | ||
|
|
||
| package org.chromium.chrome.browser.bookmarks; | ||
|
|
||
| import android.app.Activity; | ||
| import android.graphics.Color; | ||
| import android.graphics.drawable.ColorDrawable; | ||
| import android.os.Bundle; | ||
| import android.view.LayoutInflater; | ||
| import android.view.View; | ||
| import android.view.ViewGroup; | ||
| import android.view.Window; | ||
| import android.widget.Button; | ||
| import android.widget.ImageView; | ||
| import android.widget.TextView; | ||
|
|
||
| import androidx.annotation.Nullable; | ||
|
|
||
| import org.chromium.chrome.R; | ||
| import org.chromium.chrome.browser.BraveDialogFragment; | ||
|
|
||
| public class BraveBookmarkImportExportDialogFragment | ||
| extends BraveDialogFragment implements View.OnClickListener { | ||
| private static final String IS_IMPORT = "is_import"; | ||
| private static final String IS_SUCCESS = "is_success"; | ||
|
|
||
| private boolean mIsImport; | ||
| private boolean mIsSuccess; | ||
|
|
||
| public static BraveBookmarkImportExportDialogFragment newInstance( | ||
| boolean isImport, boolean isSuccess) { | ||
| final BraveBookmarkImportExportDialogFragment fragment = | ||
| new BraveBookmarkImportExportDialogFragment(); | ||
| final Bundle args = new Bundle(); | ||
| args.putBoolean(IS_IMPORT, isImport); | ||
| args.putBoolean(IS_SUCCESS, isSuccess); | ||
| fragment.setArguments(args); | ||
| return fragment; | ||
| } | ||
|
|
||
| @Override | ||
| public void onCreate(@Nullable Bundle savedInstanceState) { | ||
| super.onCreate(savedInstanceState); | ||
|
|
||
| if (getArguments() != null) { | ||
| mIsImport = getArguments().getBoolean(IS_IMPORT); | ||
| mIsSuccess = getArguments().getBoolean(IS_SUCCESS); | ||
| } | ||
| } | ||
|
|
||
| @Override | ||
| public View onCreateView( | ||
| LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { | ||
| View view = inflater.inflate( | ||
| R.layout.fragment_brave_bookmark_import_export_dialog, container, false); | ||
|
|
||
| if (getDialog() != null && getDialog().getWindow() != null) { | ||
| getDialog().getWindow().setBackgroundDrawable(new ColorDrawable(Color.TRANSPARENT)); | ||
| getDialog().getWindow().requestFeature(Window.FEATURE_NO_TITLE); | ||
| } | ||
| return view; | ||
| } | ||
|
|
||
| @Override | ||
| public void onViewCreated(View view, Bundle savedInstanceState) { | ||
| ImageView imageView = view.findViewById(R.id.imageView); | ||
| TextView tvDesc = view.findViewById(R.id.tv_bookmark_desc); | ||
|
|
||
| imageView.setImageResource(mIsSuccess ? R.drawable.ic_bookmark_import_export_success | ||
| : R.drawable.ic_bookmark_import_export_failed); | ||
|
|
||
| if (mIsImport) { | ||
| tvDesc.setText(mIsSuccess ? R.string.import_bookmarks_success | ||
| : R.string.import_bookmarks_failed); | ||
| } else { | ||
| tvDesc.setText(mIsSuccess ? R.string.export_bookmarks_success | ||
| : R.string.export_bookmarks_failed); | ||
| } | ||
| Button okBtn = view.findViewById(R.id.btn_ok); | ||
| okBtn.setOnClickListener(this); | ||
| } | ||
|
|
||
| @Override | ||
| public void onClick(View view) { | ||
| dismiss(); | ||
| if (mIsImport) { | ||
| Activity activity = getActivity(); | ||
| if (activity != null) { | ||
| activity.finish(); | ||
| activity.overridePendingTransition(0, 0); | ||
| activity.startActivity(activity.getIntent()); | ||
| activity.overridePendingTransition(0, 0); | ||
| } | ||
| } | ||
| } | ||
| } |
Oops, something went wrong.