When restore from backup, disable sync to Google Drive.

This commit is contained in:
Jimmy Shih
2013-03-01 11:14:46 -08:00
parent d94673279a
commit 8a1b4274a0
3 changed files with 8 additions and 1 deletions
+1 -1
View File
@@ -35,7 +35,6 @@ limitations under the License.
<string name="default_activity_key">defaultActivity</string>
<string name="default_map_public_key">defaultMapPublic</string>
<string name="default_table_public_key">defaultTablePublic</string>
<string name="drive_sync_key">driveSync</string>
<string name="google_account_key">googleAccount</string>
<string name="map_type_key">mapType</string>
<string name="max_recording_distance_key">maxRecordingDistance</string>
@@ -69,6 +68,7 @@ limitations under the License.
<string name="auto_resume_track_current_retry_key">autoResumeTrackCurrentRetry</string>
<string name="drive_deleted_list_key">driveDeletedList</string>
<string name="drive_largest_change_id_key">driveLargestChangeId</string>
<string name="drive_sync_key">driveSync</string>
<string name="recording_track_id_key">recordingTrackId</string>
<string name="recording_track_paused_key">recordingTrackPaused</string>
<string name="selected_track_id_key">selectedTrackId</string>
@@ -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));
@@ -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<Void, Integer, Boolean> {
@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) {