[Android] SyncService related changes
Chromium change: https://chromium.googlesource.com/chromium/src/+/21667acc2a3c5fe6738899fb494248c583bcc230 Rename ProfileSyncService to SyncServiceImpl in Android code No behavior is changed. Do the following renamings: - ProfileSyncService.java -> SyncServiceImpl.java - profile_sync_service_android.h -> sync_service_android_bridge.h - FakeProfileSyncService.java -> FakeSyncServiceImpl.java (and corresponding *WithFakeProfileSyncService test files) Moreover - Update the documentation of *sync_service_android_bridge.h Bug: 1201272
This commit is contained in:
@@ -19,7 +19,7 @@ import org.chromium.chrome.browser.infobar.InfoBarIdentifier;
|
||||
import org.chromium.chrome.browser.preferences.BravePrefServiceBridge;
|
||||
import org.chromium.chrome.browser.settings.BraveSyncScreensPreference;
|
||||
import org.chromium.chrome.browser.settings.SettingsLauncherImpl;
|
||||
import org.chromium.chrome.browser.sync.ProfileSyncService;
|
||||
import org.chromium.chrome.browser.sync.SyncService;
|
||||
import org.chromium.chrome.browser.tab.Tab;
|
||||
import org.chromium.chrome.browser.ui.messages.infobar.BraveSimpleConfirmInfoBarBuilder;
|
||||
import org.chromium.chrome.browser.ui.messages.infobar.SimpleConfirmInfoBarBuilder;
|
||||
@@ -43,7 +43,7 @@ public class BraveSyncInformers {
|
||||
return;
|
||||
}
|
||||
|
||||
boolean isV2User = ProfileSyncService.get() != null && ProfileSyncService.get().isFirstSetupComplete();
|
||||
boolean isV2User = SyncService.get() != null && SyncService.get().isFirstSetupComplete();
|
||||
if (isV2User) {
|
||||
braveSyncWorker.setSyncV2MigrateNoticeDismissed(true);
|
||||
return;
|
||||
|
||||
+2
-2
@@ -16,7 +16,7 @@ import org.chromium.base.Log;
|
||||
import org.chromium.chrome.R;
|
||||
import org.chromium.chrome.browser.app.BraveActivity;
|
||||
import org.chromium.chrome.browser.infobar.InfoBarIdentifier;
|
||||
import org.chromium.chrome.browser.sync.ProfileSyncService;
|
||||
import org.chromium.chrome.browser.sync.SyncService;
|
||||
import org.chromium.chrome.browser.tab.Tab;
|
||||
import org.chromium.chrome.browser.ui.messages.infobar.BraveSimpleConfirmInfoBarBuilder;
|
||||
import org.chromium.chrome.browser.ui.messages.infobar.SimpleConfirmInfoBarBuilder;
|
||||
@@ -49,7 +49,7 @@ public class BraveAndroidSyncDisabledInformer {
|
||||
return;
|
||||
}
|
||||
|
||||
boolean brave_sync_is_enabled = ProfileSyncService.get().isFirstSetupComplete();
|
||||
boolean brave_sync_is_enabled = SyncService.get().isFirstSetupComplete();
|
||||
boolean android_system_sync_disabled = !ContentResolver.getMasterSyncAutomatically();
|
||||
|
||||
if (!brave_sync_is_enabled || !android_system_sync_disabled) {
|
||||
|
||||
@@ -82,7 +82,7 @@ import org.chromium.chrome.browser.qrreader.CameraSourcePreview;
|
||||
import org.chromium.chrome.browser.settings.BravePreferenceFragment;
|
||||
import org.chromium.chrome.browser.settings.SettingsActivity;
|
||||
import org.chromium.chrome.browser.sync.BraveSyncDevices;
|
||||
import org.chromium.chrome.browser.sync.ProfileSyncService;
|
||||
import org.chromium.chrome.browser.sync.SyncService;
|
||||
import org.chromium.chrome.browser.sync.settings.BraveManageSyncSettings;
|
||||
import org.chromium.chrome.browser.sync.settings.SyncSettingsUtils;
|
||||
import org.chromium.chrome.browser.sync.settings.SyncSettingsUtils.SyncError;
|
||||
@@ -104,7 +104,7 @@ public class BraveSyncScreensPreference extends BravePreferenceFragment
|
||||
implements View.OnClickListener, SettingsActivity.OnBackPressedListener,
|
||||
BarcodeTracker.BarcodeGraphicTrackerCallback,
|
||||
BraveSyncDevices.DeviceInfoChangedListener,
|
||||
ProfileSyncService.SyncStateChangedListener {
|
||||
SyncService.SyncStateChangedListener {
|
||||
public static final int BIP39_WORD_COUNT = 24;
|
||||
private static final String TAG = "SYNC";
|
||||
// Permission request codes need to be < 256
|
||||
@@ -194,7 +194,7 @@ public class BraveSyncScreensPreference extends BravePreferenceFragment
|
||||
@Override
|
||||
public View onCreateView(
|
||||
LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
|
||||
ProfileSyncService.get().addSyncStateChangedListener(this);
|
||||
SyncService.get().addSyncStateChangedListener(this);
|
||||
|
||||
InvalidateCodephrase();
|
||||
|
||||
@@ -883,7 +883,7 @@ public class BraveSyncScreensPreference extends BravePreferenceFragment
|
||||
mCameraSourcePreview.release();
|
||||
}
|
||||
|
||||
ProfileSyncService.get().removeSyncStateChangedListener(this);
|
||||
SyncService.get().removeSyncStateChangedListener(this);
|
||||
|
||||
if (deviceInfoObserverSet) {
|
||||
BraveSyncDevices.get().removeDeviceInfoChangedListener(this);
|
||||
@@ -1021,7 +1021,7 @@ public class BraveSyncScreensPreference extends BravePreferenceFragment
|
||||
|
||||
@Override
|
||||
public void syncStateChanged() {
|
||||
if (ProfileSyncService.get().isFirstSetupComplete() == false) {
|
||||
if (SyncService.get().isFirstSetupComplete() == false) {
|
||||
if (mLeaveSyncChainInProgress) {
|
||||
leaveSyncChainComplete();
|
||||
} else {
|
||||
|
||||
@@ -15,7 +15,7 @@ import org.chromium.base.annotations.CalledByNative;
|
||||
import org.chromium.chrome.browser.AppHooks;
|
||||
import org.chromium.chrome.browser.signin.services.SigninManager;
|
||||
import org.chromium.components.signin.base.CoreAccountInfo;
|
||||
import org.chromium.components.signin.identitymanager.AccountInfoService;
|
||||
import org.chromium.components.signin.identitymanager.AccountInfoServiceImpl;
|
||||
import org.chromium.components.signin.identitymanager.AccountTrackerService;
|
||||
import org.chromium.components.signin.identitymanager.IdentityManager;
|
||||
import org.chromium.components.signin.identitymanager.IdentityMutator;
|
||||
@@ -55,10 +55,6 @@ public class BraveSigninManager implements SigninManager {
|
||||
@MainThread
|
||||
public void runAfterOperationInProgress(Runnable runnable) {}
|
||||
|
||||
@Override
|
||||
public void signinAndEnableSync(@SigninAccessPoint int accessPoint, CoreAccountInfo accountInfo,
|
||||
@Nullable SignInCallback callback) {}
|
||||
|
||||
@Override
|
||||
@Deprecated
|
||||
public void signinAndEnableSync(@SigninAccessPoint int accessPoint, Account account,
|
||||
@@ -106,12 +102,12 @@ public class BraveSigninManager implements SigninManager {
|
||||
static SigninManager create(long nativeSigninManagerAndroid,
|
||||
AccountTrackerService accountTrackerService, IdentityManager identityManager,
|
||||
IdentityMutator identityMutator) {
|
||||
AccountInfoService.init(identityManager, accountTrackerService);
|
||||
AccountInfoServiceImpl.init(identityManager, accountTrackerService);
|
||||
return new BraveSigninManager(identityManager);
|
||||
}
|
||||
|
||||
@CalledByNative
|
||||
void destroy() {
|
||||
AccountInfoService.get().destroy();
|
||||
AccountInfoServiceImpl.get().destroy();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -8,7 +8,7 @@ package org.chromium.chrome.browser.sync;
|
||||
import android.accounts.Account;
|
||||
import android.annotation.SuppressLint;
|
||||
|
||||
import org.chromium.chrome.browser.sync.ProfileSyncService;
|
||||
import org.chromium.chrome.browser.sync.SyncService;
|
||||
|
||||
// see org.brave.bytecode.BraveAndroidSyncSettingsAdapter
|
||||
public class BraveAndroidSyncSettings extends AndroidSyncSettings {
|
||||
@@ -28,7 +28,7 @@ public class BraveAndroidSyncSettings extends AndroidSyncSettings {
|
||||
// so pretend sync for Brave "account" is always on when sync is configured
|
||||
@Override
|
||||
public boolean isChromeSyncEnabled() {
|
||||
ProfileSyncService profileSyncService = ProfileSyncService.get();
|
||||
SyncService profileSyncService = SyncService.get();
|
||||
return profileSyncService != null && profileSyncService.isFirstSetupComplete();
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user