Merge pull request #6241 from brave/android_sync_fix_10861

Skip DeleteDeviceInfo if sync engine is not active (Android)
This commit is contained in:
AlexeyBarabash
2020-07-29 15:13:46 +03:00
committed by GitHub
+5 -6
View File
@@ -212,12 +212,11 @@ bool BraveSyncWorker::ResetSync(
const base::android::JavaParamRef<jobject>& jcaller) {
syncer::SyncService* sync_service = GetSyncService();
if (!sync_service ||
!sync_service->GetUserSettings()->IsFirstSetupComplete()) {
VLOG(1) << __func__
<< " sync service is not available or first setup isn't complete, "
"cannot reset sync now";
return false;
// Do not send self deleted commit if engine is not up and running
if (!sync_service || sync_service->GetTransportState() !=
syncer::SyncService::TransportState::ACTIVE) {
OnSelfDeleted();
return true;
}
syncer::DeviceInfoTracker* tracker = GetDeviceInfoTracker();