karol/OpenTracks
1
0
Fork 0
forked from upstream-mirrors/OpenTracks
Code Pull Requests Actions Releases 2 Activity

Code cleanup, do not backup some shared preference keys.

Browse Source
This commit is contained in:
Jimmy Shih
2013-05-23 10:32:10 -07:00
parent cad06c712a
commit 8b19bd8917
3 changed files with 21 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MyTracks/res/values/keys.xml
+10 -10
View File
@@ -17,26 +17,16 @@ limitations under the License.
<resources>
<!-- Keys for persisted preferences. Sorted alphabetically. DO NOT TRANSLATE. -->
<string name="allow_access_key">allowAccess</string>
<string name="ant_bike_cadence_sensor_id_key">antBikeCadenceSensorId</string>
<string name="ant_combined_bike_sensor_id_key">antCombinedBikeSensorId</string>
<string name="ant_heart_rate_monitor_id_key">antHeartRateMonitorId</string>
<string name="ant_speed_distance_monitor_id_key">antSpeedDistanceMonitorId</string>
<string name="auto_resume_track_timeout_key">autoResumeTrackTimeout</string>
<string name="bluetooth_sensor_key">bluetoothSensor</string>
<string name="chart_by_distance_key">chartByDistance</string>
<string name="chart_show_cadence_key">chartShowCadence</string>
<string name="chart_show_elevation_key">chartShowElevation</string>
<string name="chart_show_heart_rate_key">chartShowHeartRate</string>
<string name="chart_show_power_key">chartShowPower</string>
<string name="chart_show_speed_key">chartShowSpeed</string>
<string name="confirm_play_earth_key">confirmPlayEarth</string>
<string name="confirm_share_drive_key">confirmShareDrive</string>
<string name="confirm_share_file_key">confirmShareFile</string>
<string name="confirm_share_maps_key">confirmShareMaps</string>
<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="google_account_key">googleAccount</string>
<string name="map_type_key">mapType</string>
<string name="max_recording_distance_key">maxRecordingDistance</string>
<string name="metric_units_key">metricUnits</string>
@@ -66,10 +56,20 @@ limitations under the License.
<string name="voice_frequency_key">voiceFrequency</string>
<!-- Keys for persistend preferences. But they should not get backed up or restored. -->
<string name="activity_recognition_type_key">activityRecognitionType</string>
<string name="ant_bike_cadence_sensor_id_key">antBikeCadenceSensorId</string>
<string name="ant_combined_bike_sensor_id_key">antCombinedBikeSensorId</string>
<string name="ant_heart_rate_monitor_id_key">antHeartRateMonitorId</string>
<string name="ant_speed_distance_monitor_id_key">antSpeedDistanceMonitorId</string>
<string name="auto_resume_track_current_retry_key">autoResumeTrackCurrentRetry</string>
<string name="bluetooth_sensor_key">bluetoothSensor</string>
<string name="confirm_play_earth_key">confirmPlayEarth</string>
<string name="confirm_share_drive_key">confirmShareDrive</string>
<string name="confirm_share_file_key">confirmShareFile</string>
<string name="confirm_share_maps_key">confirmShareMaps</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="google_account_key">googleAccount</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>
MyTracks/src/com/google/android/apps/mytracks/fragments/EnableSyncDialogFragment.java
+1 -8
View File
@@ -86,14 +86,7 @@ public class EnableSyncDialogFragment extends DialogFragment {
}
}).setPositiveButton(R.string.generic_yes, new OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
/*
* google_account_key can be set from the android backup service. If
* the user wants to enable sync, make sure google_account_key is
* cleared so the user can choose an account.
*/
PreferencesUtils.setString(fragmentActivity, R.string.google_account_key,
PreferencesUtils.GOOGLE_ACCOUNT_DEFAULT);
public void onClick(DialogInterface dialog, int which) {
caller.onEnableSyncDone(true);
}
}).setTitle(R.string.enable_sync_title).create();
MyTracks/src/com/google/android/apps/mytracks/io/backup/PreferenceBackupHelper.java
+10
View File
@@ -45,10 +45,20 @@ public class PreferenceBackupHelper {
public PreferenceBackupHelper(Context context) {
doNotBackup = new HashSet<String>();
doNotBackup.add(context.getString(R.string.activity_recognition_type_key));
doNotBackup.add(context.getString(R.string.ant_bike_cadence_sensor_id_key));
doNotBackup.add(context.getString(R.string.ant_combined_bike_sensor_id_key));
doNotBackup.add(context.getString(R.string.ant_heart_rate_monitor_id_key));
doNotBackup.add(context.getString(R.string.ant_speed_distance_monitor_id_key));
doNotBackup.add(context.getString(R.string.auto_resume_track_current_retry_key));
doNotBackup.add(context.getString(R.string.bluetooth_sensor_key));
doNotBackup.add(context.getString(R.string.confirm_play_earth_key));
doNotBackup.add(context.getString(R.string.confirm_share_drive_key));
doNotBackup.add(context.getString(R.string.confirm_share_file_key));
doNotBackup.add(context.getString(R.string.confirm_share_maps_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.google_account_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));