diff --git a/MyTracks/res/values/keys.xml b/MyTracks/res/values/keys.xml index 5f80fc37e..bada8ef81 100644 --- a/MyTracks/res/values/keys.xml +++ b/MyTracks/res/values/keys.xml @@ -35,7 +35,6 @@ limitations under the License. defaultActivity defaultMapPublic defaultTablePublic - driveSync googleAccount mapType maxRecordingDistance @@ -69,6 +68,7 @@ limitations under the License. autoResumeTrackCurrentRetry driveDeletedList driveLargestChangeId + driveSync recordingTrackId recordingTrackPaused selectedTrackId diff --git a/MyTracks/src/com/google/android/apps/mytracks/io/backup/PreferenceBackupHelper.java b/MyTracks/src/com/google/android/apps/mytracks/io/backup/PreferenceBackupHelper.java index f5d8be071..8be9c86ff 100644 --- a/MyTracks/src/com/google/android/apps/mytracks/io/backup/PreferenceBackupHelper.java +++ b/MyTracks/src/com/google/android/apps/mytracks/io/backup/PreferenceBackupHelper.java @@ -47,6 +47,7 @@ public class PreferenceBackupHelper { doNotBackup.add(context.getString(R.string.auto_resume_track_current_retry_key)); doNotBackup.add(context.getString(R.string.drive_deleted_list_key)); doNotBackup.add(context.getString(R.string.drive_largest_change_id_key)); + doNotBackup.add(context.getString(R.string.drive_sync_key)); doNotBackup.add(context.getString(R.string.recording_track_id_key)); doNotBackup.add(context.getString(R.string.recording_track_paused_key)); doNotBackup.add(context.getString(R.string.selected_track_id_key)); diff --git a/MyTracks/src/com/google/android/apps/mytracks/io/backup/RestoreAsyncTask.java b/MyTracks/src/com/google/android/apps/mytracks/io/backup/RestoreAsyncTask.java index 4464667bf..586937e37 100644 --- a/MyTracks/src/com/google/android/apps/mytracks/io/backup/RestoreAsyncTask.java +++ b/MyTracks/src/com/google/android/apps/mytracks/io/backup/RestoreAsyncTask.java @@ -16,6 +16,8 @@ package com.google.android.apps.mytracks.io.backup; +import com.google.android.apps.mytracks.io.sync.SyncUtils; +import com.google.android.apps.mytracks.util.PreferencesUtils; import com.google.android.maps.mytracks.R; import android.os.AsyncTask; @@ -84,7 +86,11 @@ public class RestoreAsyncTask extends AsyncTask { @Override protected Boolean doInBackground(Void... params) { try { + PreferencesUtils.setBoolean( + restoreActivity, R.string.drive_sync_key, PreferencesUtils.DRIVE_SYNC_DEFAULT); + SyncUtils.disableSync(restoreActivity); externalFileBackup.restoreFromDate(date); + SyncUtils.clearSyncState(restoreActivity); messageId = R.string.settings_backup_restore_success; return true; } catch (IOException e) {