Merge pull request #5361 from brave/android-sync-v2

Adapt Android for sync v2
brave · Jun 29, 2020 · d07cbe6 · d07cbe6
2 parents 0327f32 + 0f0b680
commit d07cbe6
Show file tree

Hide file tree

Showing 48 changed files with 1,950 additions and 99,746 deletions.
diff --git a/BUILD.gn b/BUILD.gn
@@ -104,10 +104,6 @@ if (is_android) {
     sources = [
       "$root_build_dir/brave_resources.pak",
       "$root_build_dir/brave_100_percent.pak",
-      "//brave/android/sync/android_sync.js",
-      "//brave/android/sync/android_sync_words.js",
-      "//brave/android/sync/crypto.js",
-      "//brave/components/brave_sync/extension/brave-sync-android/bundles/bundle.js",
       "//brave/LICENSE.html",
     ]
     deps = [

diff --git a/DEPS b/DEPS
@@ -13,14 +13,6 @@ deps = {
   "vendor/bip39wally-core-native": "https://github.com/brave-intl/bip39wally-core-native.git@13bb40a215248cfbdd87d0a6b425c8397402e9e6",
   "vendor/bat-native-anonize": "https://github.com/brave-intl/bat-native-anonize.git@e3742ba3e8942eea9e4755d91532491871bd3116",
   "vendor/bat-native-tweetnacl": "https://github.com/brave-intl/bat-native-tweetnacl.git@800f9d40b7409239ff192e0be634764e747c7a75",
-  "components/brave_sync/extension/brave-sync": {
-    'url': 'https://github.com/brave/sync.git@5da4fc903f9cf0a627bbca28b49fcb09bb479f88',
-    'condition': 'not checkout_android',
-  },
-  "components/brave_sync/extension/brave-sync-android": {
-    'url': 'https://github.com/brave/sync.git@4098493496b19f46c33a66b8867c69ee6d1a4568',
-    'condition': 'checkout_android',
-  },
   "vendor/bat-native-usermodel": "https://github.com/brave-intl/bat-native-usermodel.git@865ba342737c09b13ee18e45b8ece5970bb77246",
   "vendor/challenge_bypass_ristretto_ffi": "https://github.com/brave-intl/challenge-bypass-ristretto-ffi.git@c396fb4eb9e9bf63b89ae5a0ec0b5f201d43c7c5",
 }
@@ -45,20 +37,6 @@ hooks = [
     'condition': 'not checkout_android',
     'action': ['vpython3', 'src/brave/script/download_rust_deps.py'],
   },
-  {
-    # Build brave-sync
-    'name': 'build_brave_sync',
-    'pattern': '.',
-    'action': ['python', 'src/brave/script/build-simple-js-bundle.py', '--repo_dir_path', 'src/brave/components/brave_sync/extension/brave-sync'],
-    'condition': 'not checkout_android',
-  },
-  {
-    # Build brave-sync android
-    'name': 'build_brave_sync',
-    'pattern': '.',
-    'action': ['python', 'src/brave/script/build-simple-js-bundle.py', '--repo_dir_path', 'src/brave/components/brave_sync/extension/brave-sync-android'],
-    'condition': 'checkout_android',
-  },
   {
     'name': 'generate_licenses',
     'pattern': '.',

diff --git a/android/brave_java_resources.gni b/android/brave_java_resources.gni
@@ -651,7 +651,6 @@ brave_java_resources = [
   "java/res/layout/fragment_search_engine_onboarding.xml",
   "java/res/layout/brave_rewards_spinnner_item_dropdown.xml",
   "java/res/layout/brave_rewards_grants_list_item.xml",
-  "java/res/layout/add_sync_device_name_dialog.xml",
   "java/res/layout/brave_rewards_donation_sent.xml",
   "java/res/layout/ntp_bottom_sheet.xml",
   "java/res/layout/brave_shields_scripts_blocked_switcher.xml",

diff --git a/android/brave_java_sources.gni b/android/brave_java_sources.gni
@@ -31,9 +31,6 @@ brave_java_sources = [
   "../../brave/android/java/org/chromium/chrome/browser/BraveRewardsUserWalletActivity.java",
   "../../brave/android/java/org/chromium/chrome/browser/BraveRewardsVerifyWalletActivity.java",
   "../../brave/android/java/org/chromium/chrome/browser/appmenu/BraveTabbedAppMenuPropertiesDelegate.java",
-  "../../brave/android/java/org/chromium/chrome/browser/bookmarks/BraveBookmarkModel.java",
-  "../../brave/android/java/org/chromium/chrome/browser/bookmarks/BraveBookmarkUtils.java",
-  "../../brave/android/java/org/chromium/chrome/browser/bookmarks/BraveBookmarkWorker.java",
   "../../brave/android/java/org/chromium/chrome/browser/document/BraveLauncherActivity.java",
   "../../brave/android/java/org/chromium/chrome/browser/externalnav/BraveExternalNavigationHandler.java",
   "../../brave/android/java/org/chromium/chrome/browser/help/BraveHelpAndFeedback.java",
@@ -81,7 +78,6 @@ brave_java_sources = [
   "../../brave/android/java/org/chromium/chrome/browser/partnercustomizations/CloseBraveManager.java",
   "../../brave/android/java/org/chromium/chrome/browser/preferences/BravePreferenceKeys.java",
   "../../brave/android/java/org/chromium/chrome/browser/preferences/BravePrefServiceBridge.java",
-  "../../brave/android/java/org/chromium/chrome/browser/preferences/BraveSyncScreensObserver.java",
   "../../brave/android/java/org/chromium/chrome/browser/preferences/website/BraveShieldsContentSettings.java",
   "../../brave/android/java/org/chromium/chrome/browser/preferences/website/BraveShieldsContentSettingsObserver.java",
   "../../brave/android/java/org/chromium/chrome/browser/privacy/settings/BravePrivacySettings.java",
@@ -114,8 +110,8 @@ brave_java_sources = [
   "../../brave/android/java/org/chromium/chrome/browser/site_settings/BraveSiteSettingsPreferencesBase.java",
   "../../brave/android/java/org/chromium/chrome/browser/site_settings/DesktopModePreferences.java",
   "../../brave/android/java/org/chromium/chrome/browser/site_settings/PlayYTVideoInBrowserPreferences.java",
-  "../../brave/android/java/org/chromium/chrome/browser/sync/BraveSyncService.java",
-  "../../brave/android/java/org/chromium/chrome/browser/sync/BraveSyncServiceObserver.java",
+  "../../brave/android/java/org/chromium/chrome/browser/sync/BraveSyncDevices.java",
+  "../../brave/android/java/org/chromium/chrome/browser/sync/settings/BraveManageSyncSettings.java",
   "../../brave/android/java/org/chromium/chrome/browser/toolbar/BraveHomeButton.java",
   "../../brave/android/java/org/chromium/chrome/browser/toolbar/bottom/BookmarksButton.java",
   "../../brave/android/java/org/chromium/chrome/browser/toolbar/bottom/BraveBottomToolbarConfiguration.java",
@@ -124,6 +120,7 @@ brave_java_sources = [
   "../../brave/android/java/org/chromium/chrome/browser/toolbar/bottom/BraveBrowsingModeBottomToolbarCoordinator.java",
   "../../brave/android/java/org/chromium/chrome/browser/toolbar/bottom/BraveSearchAccelerator.java",
   "../../brave/android/java/org/chromium/chrome/browser/toolbar/top/BraveToolbarLayout.java",
+"../../brave/android/java/org/chromium/chrome/browser/ui/brave_tricks/checkbox_to_switch/CheckBoxPreference.java",
   "../../brave/android/java/org/chromium/chrome/browser/upgrade/BravePackageReplacedBroadcastReceiver.java",
   "../../brave/android/java/org/chromium/chrome/browser/upgrade/BraveUpgradeJobIntentService.java",
   "../../brave/android/java/org/chromium/chrome/browser/upgrade/NotificationIntent.java",

diff --git a/android/java/org/chromium/chrome/browser/BraveActivity.java b/android/java/org/chromium/chrome/browser/BraveActivity.java
@@ -230,29 +230,6 @@ public void finishNativeInitialization() {
             showBraveRateDialog();
     }
 
-    @Override
-    public void addOrEditBookmark(final Tab tabToBookmark) {
-        long tempBookmarkId = BookmarkBridge.getUserBookmarkIdForTab(tabToBookmark);
-        final boolean bCreateBookmark = (BookmarkId.INVALID_ID == tempBookmarkId);
-
-        super.addOrEditBookmark(tabToBookmark);
-
-        final long bookmarkId = BookmarkBridge.getUserBookmarkIdForTab(tabToBookmark);
-        final BookmarkModel bookmarkModel = new BookmarkModel();
-
-        bookmarkModel.finishLoadingBookmarkModel(() -> {
-            // Gives up the bookmarking if the tab is being destroyed.
-            BookmarkId newBookmarkId = new BookmarkId(bookmarkId, BookmarkType.NORMAL);
-            if (!((TabImpl)tabToBookmark).isClosing() && ((TabImpl)tabToBookmark).isInitialized()) {
-                if (null != mBraveSyncWorker && null != newBookmarkId) {
-                    mBraveSyncWorker.CreateUpdateBookmark(bCreateBookmark, bookmarkModel.getBookmarkById(newBookmarkId));
-                    bookmarkModel.destroy();
-                }
-            }
-            bookmarkModel.destroy();
-        });
-    }
-
     private void createNotificationChannel() {
         Context context = ContextUtils.getApplicationContext();
         // Create the NotificationChannel, but only on API 26+ because