diff --git a/MyTracks/res/values/keys.xml b/MyTracks/res/values/keys.xml index 5b62883f2..2d8f93aa9 100644 --- a/MyTracks/res/values/keys.xml +++ b/MyTracks/res/values/keys.xml @@ -21,7 +21,7 @@ limitations under the License. antCadenceSensorId antCadenceSpeedSensorId antHeartRateSensorId - antSRMBridgeSensorId + antSrmBridgeSensorId autoResumeTrackCurrentRetry autoResumeTrackTimeout bluetoothSensor @@ -62,9 +62,9 @@ limitations under the License. trackColorMode trackName - backupToSd - restoreFromSd settingsBackup + settingsBackupNow + settingsBackupRestore settingsChart settingsMap settingsMapMediumDisplay diff --git a/MyTracks/res/values/strings.xml b/MyTracks/res/values/strings.xml index a0284c89d..7e03389db 100644 --- a/MyTracks/res/values/strings.xml +++ b/MyTracks/res/values/strings.xml @@ -1956,12 +1956,12 @@ limitations under the License. - Pace (hr/mi). + Pace (hr/mi) - Pace (hr/km). + Pace (hr/km) - Preferred Rate + Preferred rate - Time Measurement + Time measurement - Preferred Units + Preferred units diff --git a/MyTracks/res/xml/backup_settings.xml b/MyTracks/res/xml/backup_settings.xml index 80844feb2..e336832e9 100644 --- a/MyTracks/res/xml/backup_settings.xml +++ b/MyTracks/res/xml/backup_settings.xml @@ -17,11 +17,11 @@ limitations under the License. \ No newline at end of file diff --git a/MyTracks/src/com/google/android/apps/mytracks/ImportAsyncTask.java b/MyTracks/src/com/google/android/apps/mytracks/ImportAsyncTask.java index 6208a9f30..4723b36cd 100644 --- a/MyTracks/src/com/google/android/apps/mytracks/ImportAsyncTask.java +++ b/MyTracks/src/com/google/android/apps/mytracks/ImportAsyncTask.java @@ -83,7 +83,8 @@ public class ImportAsyncTask extends AsyncTask { myTracksProviderUtils = MyTracksProviderUtils.Factory.get(importActivity); // Get the wake lock if not recording - if (PreferencesUtils.getLong(importActivity, R.string.recording_track_id_key) == -1L) { + if (PreferencesUtils.getLong(importActivity, R.string.recording_track_id_key) + == PreferencesUtils.RECORDING_TRACK_ID_DEFAULT) { wakeLock = SystemUtils.acquireWakeLock(importActivity, wakeLock); } diff --git a/MyTracks/src/com/google/android/apps/mytracks/MarkerListActivity.java b/MyTracks/src/com/google/android/apps/mytracks/MarkerListActivity.java index 2fcae381b..e7cf087a3 100644 --- a/MyTracks/src/com/google/android/apps/mytracks/MarkerListActivity.java +++ b/MyTracks/src/com/google/android/apps/mytracks/MarkerListActivity.java @@ -81,16 +81,17 @@ public class MarkerListActivity extends AbstractMyTracksActivity { * Note that sharedPreferenceChangeListener cannot be an anonymous inner * class. Anonymous inner class will get garbage collected. */ - private final OnSharedPreferenceChangeListener sharedPreferenceChangeListener = - new OnSharedPreferenceChangeListener() { - @Override - public void onSharedPreferenceChanged(SharedPreferences preferences, String key) { - // Note that key can be null - if (PreferencesUtils.getKey(MarkerListActivity.this, R.string.recording_track_id_key).equals(key)) { - updateMenu(); - } - } - }; + private final OnSharedPreferenceChangeListener + sharedPreferenceChangeListener = new OnSharedPreferenceChangeListener() { + @Override + public void onSharedPreferenceChanged(SharedPreferences preferences, String key) { + // Note that key can be null + if (PreferencesUtils.getKey(MarkerListActivity.this, R.string.recording_track_id_key) + .equals(key)) { + updateMenu(); + } + } + }; private long trackId = -1; private ResourceCursorAdapter resourceCursorAdapter; @@ -113,9 +114,8 @@ public class MarkerListActivity extends AbstractMyTracksActivity { setDefaultKeyMode(DEFAULT_KEYS_SEARCH_LOCAL); setContentView(R.layout.marker_list); - SharedPreferences sharedPreferences = getSharedPreferences( - Constants.SETTINGS_NAME, Context.MODE_PRIVATE); - sharedPreferences.registerOnSharedPreferenceChangeListener(sharedPreferenceChangeListener); + getSharedPreferences(Constants.SETTINGS_NAME, Context.MODE_PRIVATE) + .registerOnSharedPreferenceChangeListener(sharedPreferenceChangeListener); ListView listView = (ListView) findViewById(R.id.marker_list); listView.setEmptyView(findViewById(R.id.marker_list_empty)); @@ -188,7 +188,8 @@ public class MarkerListActivity extends AbstractMyTracksActivity { private void updateMenu() { if (insertMarkerMenuItem != null) { - insertMarkerMenuItem.setVisible(trackId == PreferencesUtils.getLong(this, R.string.recording_track_id_key)); + insertMarkerMenuItem.setVisible( + trackId == PreferencesUtils.getLong(this, R.string.recording_track_id_key)); } } diff --git a/MyTracks/src/com/google/android/apps/mytracks/SaveAllAsyncTask.java b/MyTracks/src/com/google/android/apps/mytracks/SaveAllAsyncTask.java index b7658a5a7..b6e4b25c8 100644 --- a/MyTracks/src/com/google/android/apps/mytracks/SaveAllAsyncTask.java +++ b/MyTracks/src/com/google/android/apps/mytracks/SaveAllAsyncTask.java @@ -66,7 +66,8 @@ public class SaveAllAsyncTask extends AsyncTask { myTracksProviderUtils = MyTracksProviderUtils.Factory.get(saveAllActivity); // Get the wake lock if not recording - if (PreferencesUtils.getLong(saveAllActivity, R.string.recording_track_id_key) == -1L) { + if (PreferencesUtils.getLong(saveAllActivity, R.string.recording_track_id_key) + == PreferencesUtils.RECORDING_TRACK_ID_DEFAULT) { wakeLock = SystemUtils.acquireWakeLock(saveAllActivity, wakeLock); } success = false; diff --git a/MyTracks/src/com/google/android/apps/mytracks/SearchListActivity.java b/MyTracks/src/com/google/android/apps/mytracks/SearchListActivity.java index 0b8665f47..4fac858ba 100644 --- a/MyTracks/src/com/google/android/apps/mytracks/SearchListActivity.java +++ b/MyTracks/src/com/google/android/apps/mytracks/SearchListActivity.java @@ -83,10 +83,12 @@ public class SearchListActivity extends AbstractMyTracksActivity { private final OnSharedPreferenceChangeListener sharedPreferenceChangeListener = new OnSharedPreferenceChangeListener() { - @Override + @Override public void onSharedPreferenceChanged(SharedPreferences preferences, String key) { - if (PreferencesUtils.getKey(SearchListActivity.this, R.string.recording_track_id_key).equals(key)) { - recordingTrackId = PreferencesUtils.getLong(SearchListActivity.this, R.string.recording_track_id_key); + if (PreferencesUtils.getKey(SearchListActivity.this, R.string.recording_track_id_key) + .equals(key)) { + recordingTrackId = PreferencesUtils.getLong( + SearchListActivity.this, R.string.recording_track_id_key); arrayAdapter.notifyDataSetChanged(); } } @@ -123,9 +125,8 @@ public class SearchListActivity extends AbstractMyTracksActivity { searchEngine = new SearchEngine(myTracksProviderUtils); searchRecentSuggestions = SearchEngineProvider.newHelper(this); locationManager = (LocationManager) getSystemService(LOCATION_SERVICE); - SharedPreferences sharedPreferences = getSharedPreferences( - Constants.SETTINGS_NAME, Context.MODE_PRIVATE); - sharedPreferences.registerOnSharedPreferenceChangeListener(sharedPreferenceChangeListener); + getSharedPreferences(Constants.SETTINGS_NAME, Context.MODE_PRIVATE) + .registerOnSharedPreferenceChangeListener(sharedPreferenceChangeListener); recordingTrackId = PreferencesUtils.getLong(this, R.string.recording_track_id_key); listView = (ListView) findViewById(R.id.search_list); diff --git a/MyTracks/src/com/google/android/apps/mytracks/TrackDetailActivity.java b/MyTracks/src/com/google/android/apps/mytracks/TrackDetailActivity.java index f05398da3..2b17dc0a2 100644 --- a/MyTracks/src/com/google/android/apps/mytracks/TrackDetailActivity.java +++ b/MyTracks/src/com/google/android/apps/mytracks/TrackDetailActivity.java @@ -71,7 +71,6 @@ public class TrackDetailActivity extends AbstractMyTracksActivity { private static final String TAG = TrackDetailActivity.class.getSimpleName(); private static final String CURRENT_TAG_KEY = "tab"; - private SharedPreferences sharedPreferences; private TrackDataHub trackDataHub; private TrackRecordingServiceConnection trackRecordingServiceConnection; private TabHost tabHost; @@ -93,12 +92,13 @@ public class TrackDetailActivity extends AbstractMyTracksActivity { * Note that sharedPreferenceChangeListener cannot be an anonymous inner * class. Anonymous inner class will get garbage collected. */ - private final OnSharedPreferenceChangeListener sharedPreferenceChangeListener = - new OnSharedPreferenceChangeListener() { - @Override + private final OnSharedPreferenceChangeListener + sharedPreferenceChangeListener = new OnSharedPreferenceChangeListener() { + @Override public void onSharedPreferenceChanged(SharedPreferences preferences, String key) { // Note that key can be null - if (PreferencesUtils.getKey(TrackDetailActivity.this, R.string.recording_track_id_key).equals(key)) { + if (PreferencesUtils.getKey(TrackDetailActivity.this, R.string.recording_track_id_key) + .equals(key)) { updateMenu(); } } @@ -128,9 +128,9 @@ public class TrackDetailActivity extends AbstractMyTracksActivity { super.onCreate(savedInstanceState); ApiAdapterFactory.getApiAdapter().hideTitle(this); setContentView(R.layout.track_detail); - - sharedPreferences = getSharedPreferences(Constants.SETTINGS_NAME, Context.MODE_PRIVATE); - sharedPreferences.registerOnSharedPreferenceChangeListener(sharedPreferenceChangeListener); + + getSharedPreferences(Constants.SETTINGS_NAME, Context.MODE_PRIVATE) + .registerOnSharedPreferenceChangeListener(sharedPreferenceChangeListener); trackDataHub = ((MyTracksApplication) getApplication()).getTrackDataHub(); trackRecordingServiceConnection = new TrackRecordingServiceConnection(this, null); diff --git a/MyTracks/src/com/google/android/apps/mytracks/TrackListActivity.java b/MyTracks/src/com/google/android/apps/mytracks/TrackListActivity.java index 502dced25..36f5efdd1 100644 --- a/MyTracks/src/com/google/android/apps/mytracks/TrackListActivity.java +++ b/MyTracks/src/com/google/android/apps/mytracks/TrackListActivity.java @@ -178,9 +178,8 @@ public class TrackListActivity extends FragmentActivity { trackRecordingServiceConnection = new TrackRecordingServiceConnection( this, bindChangedCallback); - SharedPreferences sharedPreferences = getSharedPreferences( - Constants.SETTINGS_NAME, Context.MODE_PRIVATE); - sharedPreferences.registerOnSharedPreferenceChangeListener(sharedPreferenceChangeListener); + getSharedPreferences(Constants.SETTINGS_NAME, Context.MODE_PRIVATE) + .registerOnSharedPreferenceChangeListener(sharedPreferenceChangeListener); metricUnits = PreferencesUtils.getBoolean( this, R.string.metric_units_key, PreferencesUtils.METRIC_UNITS_DEFAULT); recordingTrackId = PreferencesUtils.getLong(this, R.string.recording_track_id_key); @@ -280,14 +279,16 @@ public class TrackListActivity extends FragmentActivity { EulaDialogFragment.newInstance(false) .show(getSupportFragmentManager(), EulaDialogFragment.EULA_DIALOG_TAG); } - } else if (PreferencesUtils.getBoolean(this, R.string.show_welcome_dialog_key, true)) { + } else if (PreferencesUtils.getBoolean( + this, R.string.show_welcome_dialog_key, PreferencesUtils.SHOW_WELCOME_DIALOG_DEFAULT)) { Fragment fragment = getSupportFragmentManager() .findFragmentByTag(WelcomeDialogFragment.WELCOME_DIALOG_TAG); if (fragment == null) { new WelcomeDialogFragment().show( getSupportFragmentManager(), WelcomeDialogFragment.WELCOME_DIALOG_TAG); } - } else if (PreferencesUtils.getBoolean(this, R.string.show_check_units_dialog_key, true)) { + } else if (PreferencesUtils.getBoolean(this, R.string.show_check_units_dialog_key, + PreferencesUtils.SHOW_CHECK_UNITS_DIALOG_DEFAULT)) { Fragment fragment = getSupportFragmentManager() .findFragmentByTag(CheckUnitsDialogFragment.CHECK_UNITS_DIALOG_TAG); if (fragment == null) { diff --git a/MyTracks/src/com/google/android/apps/mytracks/content/TrackDataHub.java b/MyTracks/src/com/google/android/apps/mytracks/content/TrackDataHub.java index 9ff1e7781..fc5b8b7cd 100644 --- a/MyTracks/src/com/google/android/apps/mytracks/content/TrackDataHub.java +++ b/MyTracks/src/com/google/android/apps/mytracks/content/TrackDataHub.java @@ -369,7 +369,8 @@ public class TrackDataHub { loadSharedPreferences(); } long recordingTrackId = PreferencesUtils.getLong(context, R.string.recording_track_id_key); - return recordingTrackId != -1L && recordingTrackId == selectedTrackId; + return recordingTrackId != PreferencesUtils.RECORDING_TRACK_ID_DEFAULT + && recordingTrackId == selectedTrackId; } /** diff --git a/MyTracks/src/com/google/android/apps/mytracks/fragments/MarkerAddDialogFragment.java b/MyTracks/src/com/google/android/apps/mytracks/fragments/MarkerAddDialogFragment.java index 1c1b8a267..b1548da8a 100644 --- a/MyTracks/src/com/google/android/apps/mytracks/fragments/MarkerAddDialogFragment.java +++ b/MyTracks/src/com/google/android/apps/mytracks/fragments/MarkerAddDialogFragment.java @@ -97,8 +97,8 @@ public class MarkerAddDialogFragment extends DialogFragment { dismiss(); } }); - boolean pickStatisticsMarker = PreferencesUtils.getBoolean( - getActivity(), R.string.pick_statistics_marker_key, true); + boolean pickStatisticsMarker = PreferencesUtils.getBoolean(getActivity(), + R.string.pick_statistics_marker_key, PreferencesUtils.PICK_STATISTICS_MARKER_DEFAULT); radioGroup.check(pickStatisticsMarker ? R.id.marker_add_statistics : R.id.marker_add_waypoint); return new AlertDialog.Builder(getActivity()) .setNegativeButton(R.string.generic_cancel, null) diff --git a/MyTracks/src/com/google/android/apps/mytracks/fragments/StatsFragment.java b/MyTracks/src/com/google/android/apps/mytracks/fragments/StatsFragment.java index 6e1d9a3cc..49b7b374d 100644 --- a/MyTracks/src/com/google/android/apps/mytracks/fragments/StatsFragment.java +++ b/MyTracks/src/com/google/android/apps/mytracks/fragments/StatsFragment.java @@ -74,7 +74,8 @@ public class StatsFragment extends Fragment implements TrackDataListener { @Override public void run() { Log.d(TAG, "UI update thread started"); - while (PreferencesUtils.getLong(getActivity(), R.string.recording_track_id_key) != -1L) { + while (PreferencesUtils.getLong(getActivity(), R.string.recording_track_id_key) + != PreferencesUtils.RECORDING_TRACK_ID_DEFAULT) { getActivity().runOnUiThread(updateTotalTime); try { Thread.sleep(1000L); diff --git a/MyTracks/src/com/google/android/apps/mytracks/io/sendtogoogle/AccountChooserActivity.java b/MyTracks/src/com/google/android/apps/mytracks/io/sendtogoogle/AccountChooserActivity.java index 6e8cbffbc..f4d31ec07 100644 --- a/MyTracks/src/com/google/android/apps/mytracks/io/sendtogoogle/AccountChooserActivity.java +++ b/MyTracks/src/com/google/android/apps/mytracks/io/sendtogoogle/AccountChooserActivity.java @@ -24,8 +24,8 @@ import com.google.android.apps.mytracks.io.gdata.docs.SpreadsheetsClient; import com.google.android.apps.mytracks.io.gdata.maps.MapsConstants; import com.google.android.apps.mytracks.io.maps.ChooseMapActivity; import com.google.android.apps.mytracks.io.maps.SendMapsActivity; -import com.google.android.apps.mytracks.util.ApiAdapterFactory; import com.google.android.apps.mytracks.util.IntentUtils; +import com.google.android.apps.mytracks.util.PreferencesUtils; import com.google.android.maps.mytracks.R; import android.accounts.Account; @@ -37,11 +37,8 @@ import android.accounts.OperationCanceledException; import android.app.Activity; import android.app.AlertDialog; import android.app.Dialog; -import android.content.Context; import android.content.DialogInterface; import android.content.Intent; -import android.content.SharedPreferences; -import android.content.SharedPreferences.Editor; import android.os.Bundle; import android.util.Log; @@ -93,8 +90,8 @@ public class AccountChooserActivity extends Activity { return; } - SharedPreferences prefs = getSharedPreferences(Constants.SETTINGS_NAME, Context.MODE_PRIVATE); - String preferredAccount = prefs.getString(getString(R.string.preferred_account_key), ""); + String preferredAccount = PreferencesUtils.getString(this, R.string.preferred_account_key, + PreferencesUtils.PREFERRED_ACCOUNT_DEFAULT); selectedAccountIndex = 0; for (int i = 0; i < accounts.length; i++) { @@ -166,12 +163,8 @@ public class AccountChooserActivity extends Activity { .setPositiveButton(R.string.generic_ok, new DialogInterface.OnClickListener() { public void onClick(DialogInterface dialog, int which) { Account account = accounts[selectedAccountIndex]; - SharedPreferences sharedPreferences = getSharedPreferences( - Constants.SETTINGS_NAME, Context.MODE_PRIVATE); - Editor editor = sharedPreferences.edit(); - editor.putString(getString(R.string.preferred_account_key), account.name); - ApiAdapterFactory.getApiAdapter().applyPreferenceChanges(editor); - + PreferencesUtils.setString( + AccountChooserActivity.this, R.string.preferred_account_key, account.name); sendRequest.setAccount(account); getPermission(MapsConstants.SERVICE_NAME, sendRequest.isSendMaps(), mapsCallback); } diff --git a/MyTracks/src/com/google/android/apps/mytracks/io/sendtogoogle/UploadServiceChooserActivity.java b/MyTracks/src/com/google/android/apps/mytracks/io/sendtogoogle/UploadServiceChooserActivity.java index 63b646f23..80d4455db 100644 --- a/MyTracks/src/com/google/android/apps/mytracks/io/sendtogoogle/UploadServiceChooserActivity.java +++ b/MyTracks/src/com/google/android/apps/mytracks/io/sendtogoogle/UploadServiceChooserActivity.java @@ -15,21 +15,17 @@ */ package com.google.android.apps.mytracks.io.sendtogoogle; -import com.google.android.apps.mytracks.Constants; import com.google.android.apps.mytracks.util.AnalyticsUtils; -import com.google.android.apps.mytracks.util.ApiAdapterFactory; import com.google.android.apps.mytracks.util.IntentUtils; +import com.google.android.apps.mytracks.util.PreferencesUtils; import com.google.android.maps.mytracks.R; import com.google.common.annotations.VisibleForTesting; import android.app.Activity; import android.app.AlertDialog; import android.app.Dialog; -import android.content.Context; import android.content.DialogInterface; import android.content.Intent; -import android.content.SharedPreferences; -import android.content.SharedPreferences.Editor; import android.os.Bundle; import android.view.View; import android.widget.CheckBox; @@ -153,16 +149,18 @@ public class UploadServiceChooserActivity extends Activity { */ @VisibleForTesting void initState() { - SharedPreferences prefs = getSharedPreferences(Constants.SETTINGS_NAME, Context.MODE_PRIVATE); - boolean pickExistingMap = prefs.getBoolean(getString(R.string.pick_existing_map_key), false); + boolean pickExistingMap = PreferencesUtils.getBoolean( + this, R.string.pick_existing_map_key, PreferencesUtils.PICK_EXISTING_MAP_DEFAULT); newMapRadioButton.setChecked(!pickExistingMap); existingMapRadioButton.setChecked(pickExistingMap); - mapsCheckBox.setChecked(prefs.getBoolean(getString(R.string.send_to_maps_key), true)); - fusionTablesCheckBox.setChecked( - prefs.getBoolean(getString(R.string.send_to_fusion_tables_key), true)); - docsCheckBox.setChecked(prefs.getBoolean(getString(R.string.send_to_docs_key), true)); + mapsCheckBox.setChecked(PreferencesUtils.getBoolean( + this, R.string.send_to_maps_key, PreferencesUtils.SEND_TO_MAPS_DEFAULT)); + fusionTablesCheckBox.setChecked(PreferencesUtils.getBoolean( + this, R.string.send_to_fusion_tables_key, PreferencesUtils.SEND_TO_FUSION_TABLES_DEFAULT)); + docsCheckBox.setChecked(PreferencesUtils.getBoolean( + this, R.string.send_to_docs_key, PreferencesUtils.SEND_TO_DOCS_DEFAULT)); } /** @@ -195,16 +193,13 @@ public class UploadServiceChooserActivity extends Activity { */ @VisibleForTesting void saveState() { - SharedPreferences prefs = getSharedPreferences(Constants.SETTINGS_NAME, Context.MODE_PRIVATE); - Editor editor = prefs.edit(); - editor.putBoolean( - getString(R.string.pick_existing_map_key), existingMapRadioButton.isChecked()); + PreferencesUtils.setBoolean( + this, R.string.pick_existing_map_key, existingMapRadioButton.isChecked()); if (sendRequest.isShowAll()) { - editor.putBoolean(getString(R.string.send_to_maps_key), sendMaps()); - editor.putBoolean(getString(R.string.send_to_fusion_tables_key), sendFusionTables()); - editor.putBoolean(getString(R.string.send_to_docs_key), sendDocs()); + PreferencesUtils.setBoolean(this, R.string.send_to_maps_key, sendMaps()); + PreferencesUtils.setBoolean(this, R.string.send_to_fusion_tables_key, sendFusionTables()); + PreferencesUtils.setBoolean(this, R.string.send_to_docs_key, sendDocs()); } - ApiAdapterFactory.getApiAdapter().applyPreferenceChanges(editor); } /** diff --git a/MyTracks/src/com/google/android/apps/mytracks/maps/DynamicSpeedTrackPathDescriptor.java b/MyTracks/src/com/google/android/apps/mytracks/maps/DynamicSpeedTrackPathDescriptor.java index f5ba2c58d..84a07d5d8 100644 --- a/MyTracks/src/com/google/android/apps/mytracks/maps/DynamicSpeedTrackPathDescriptor.java +++ b/MyTracks/src/com/google/android/apps/mytracks/maps/DynamicSpeedTrackPathDescriptor.java @@ -49,9 +49,8 @@ public class DynamicSpeedTrackPathDescriptor implements TrackPathDescriptor, public DynamicSpeedTrackPathDescriptor(Context context) { this.context = context; - SharedPreferences prefs = context.getSharedPreferences(Constants.SETTINGS_NAME, - Context.MODE_PRIVATE); - prefs.registerOnSharedPreferenceChangeListener(this); + context.getSharedPreferences(Constants.SETTINGS_NAME, Context.MODE_PRIVATE) + .registerOnSharedPreferenceChangeListener(this); speedMargin = PreferencesUtils.getInt(context, R.string.track_color_mode_percentage_key, PreferencesUtils.TRACK_COLOR_MODE_PERCENTAGE_DEFAULT); @@ -89,7 +88,7 @@ public class DynamicSpeedTrackPathDescriptor implements TrackPathDescriptor, @Override public boolean needsRedraw() { long selectedTrackId = PreferencesUtils.getLong(context, R.string.selected_track_id_key); - if (selectedTrackId == -1L) { + if (selectedTrackId == PreferencesUtils.SELECTED_TRACK_ID_DEFAULT) { // Could not find track. return false; } diff --git a/MyTracks/src/com/google/android/apps/mytracks/maps/FixedSpeedTrackPathDescriptor.java b/MyTracks/src/com/google/android/apps/mytracks/maps/FixedSpeedTrackPathDescriptor.java index 0b79081f9..4034fec57 100644 --- a/MyTracks/src/com/google/android/apps/mytracks/maps/FixedSpeedTrackPathDescriptor.java +++ b/MyTracks/src/com/google/android/apps/mytracks/maps/FixedSpeedTrackPathDescriptor.java @@ -38,9 +38,8 @@ public class FixedSpeedTrackPathDescriptor public FixedSpeedTrackPathDescriptor(Context context) { this.context = context; - SharedPreferences sharedPreferences = context.getSharedPreferences( - Constants.SETTINGS_NAME, Context.MODE_PRIVATE); - sharedPreferences.registerOnSharedPreferenceChangeListener(this); + context.getSharedPreferences(Constants.SETTINGS_NAME, Context.MODE_PRIVATE) + .registerOnSharedPreferenceChangeListener(this); slowSpeed = PreferencesUtils.getInt(context, R.string.track_color_mode_slow_key, PreferencesUtils.TRACK_COLOR_MODE_SLOW_DEFAULT); diff --git a/MyTracks/src/com/google/android/apps/mytracks/services/PreferenceManager.java b/MyTracks/src/com/google/android/apps/mytracks/services/PreferenceManager.java index ebf147fb4..1e92b11d8 100644 --- a/MyTracks/src/com/google/android/apps/mytracks/services/PreferenceManager.java +++ b/MyTracks/src/com/google/android/apps/mytracks/services/PreferenceManager.java @@ -63,7 +63,7 @@ public class PreferenceManager implements OnSharedPreferenceChangeListener { * Only set the id if it is valid. Setting it to -1L should only happen * in TrackRecordingService.endCurrentTrack() */ - if (recordingTrackId != -1L) { + if (recordingTrackId != PreferencesUtils.RECORDING_TRACK_ID_DEFAULT) { service.setRecordingTrackId(recordingTrackId); } } diff --git a/MyTracks/src/com/google/android/apps/mytracks/services/sensors/SensorManagerFactory.java b/MyTracks/src/com/google/android/apps/mytracks/services/sensors/SensorManagerFactory.java index c76b0bade..40fa7b2b6 100644 --- a/MyTracks/src/com/google/android/apps/mytracks/services/sensors/SensorManagerFactory.java +++ b/MyTracks/src/com/google/android/apps/mytracks/services/sensors/SensorManagerFactory.java @@ -18,10 +18,10 @@ package com.google.android.apps.mytracks.services.sensors; import com.google.android.apps.mytracks.Constants; import com.google.android.apps.mytracks.services.sensors.ant.AntDirectSensorManager; import com.google.android.apps.mytracks.services.sensors.ant.AntSrmBridgeSensorManager; +import com.google.android.apps.mytracks.util.PreferencesUtils; import com.google.android.maps.mytracks.R; import android.content.Context; -import android.content.SharedPreferences; import android.util.Log; /** @@ -53,17 +53,10 @@ public class SensorManagerFactory { * @return The sensor manager that corresponds to the sensor type setting. */ public SensorManager getSensorManager(Context context) { - SharedPreferences prefs = context.getSharedPreferences( - Constants.SETTINGS_NAME, Context.MODE_PRIVATE); - if (prefs == null) { - return null; - } - context = context.getApplicationContext(); - String sensorTypeValueNone = context.getString(R.string.sensor_type_value_none); - String sensorType = prefs.getString( - context.getString(R.string.sensor_type_key), sensorTypeValueNone); + String sensorType = PreferencesUtils.getString( + context, R.string.sensor_type_key, sensorTypeValueNone); Log.i(Constants.TAG, "Creating sensor of type: " + sensorType); if (sensorTypeValueNone.equals(sensorType)) { diff --git a/MyTracks/src/com/google/android/apps/mytracks/services/sensors/ant/AntSrmBridgeSensorManager.java b/MyTracks/src/com/google/android/apps/mytracks/services/sensors/ant/AntSrmBridgeSensorManager.java index 3f9cb8e8c..be6c172ec 100644 --- a/MyTracks/src/com/google/android/apps/mytracks/services/sensors/ant/AntSrmBridgeSensorManager.java +++ b/MyTracks/src/com/google/android/apps/mytracks/services/sensors/ant/AntSrmBridgeSensorManager.java @@ -20,14 +20,12 @@ import static com.google.android.apps.mytracks.Constants.TAG; import com.dsi.ant.AntDefine; import com.dsi.ant.AntMesg; import com.dsi.ant.exception.AntInterfaceException; -import com.google.android.apps.mytracks.Constants; import com.google.android.apps.mytracks.content.Sensor; import com.google.android.apps.mytracks.util.PreferencesUtils; import com.google.android.maps.mytracks.BuildConfig; import com.google.android.maps.mytracks.R; import android.content.Context; -import android.content.SharedPreferences; import android.util.Log; /** @@ -68,12 +66,8 @@ public class AntSrmBridgeSensorManager extends AntSensorManager { deviceNumber = WILDCARD; // First read the the device id that we will be pairing with. - SharedPreferences prefs = context.getSharedPreferences( - Constants.SETTINGS_NAME, Context.MODE_PRIVATE); - if (prefs != null) { - deviceNumber = (short) PreferencesUtils.getInt( - context, R.string.ant_srm_bridge_sensor_id_key, WILDCARD); - } + deviceNumber = (short) PreferencesUtils.getInt( + context, R.string.ant_srm_bridge_sensor_id_key, WILDCARD); Log.i(TAG, "Will pair with device: " + deviceNumber); } diff --git a/MyTracks/src/com/google/android/apps/mytracks/settings/BackupSettingsActivity.java b/MyTracks/src/com/google/android/apps/mytracks/settings/BackupSettingsActivity.java index eb6493f17..416ce4978 100644 --- a/MyTracks/src/com/google/android/apps/mytracks/settings/BackupSettingsActivity.java +++ b/MyTracks/src/com/google/android/apps/mytracks/settings/BackupSettingsActivity.java @@ -41,10 +41,10 @@ import android.preference.Preference.OnPreferenceClickListener; */ public class BackupSettingsActivity extends AbstractSettingsActivity { - private static final int DIALOG_CONFIRM_RESTORE_NOW_ID = 0; + private static final int DIALOG_CONFIRM_RESTORE_ID = 0; - Preference backupNowPreference; - Preference restoreNowPreference; + Preference backupPreference; + Preference restorePreference; /* * Note that sharedPreferenceChangeListenr cannot be an anonymous inner class. @@ -66,13 +66,12 @@ public class BackupSettingsActivity extends AbstractSettingsActivity { @Override protected void onCreate(Bundle bundle) { super.onCreate(bundle); - SharedPreferences sharedPreferences = getSharedPreferences( - Constants.SETTINGS_NAME, Context.MODE_PRIVATE); - sharedPreferences.registerOnSharedPreferenceChangeListener(sharedPreferenceChangeListener); + getSharedPreferences(Constants.SETTINGS_NAME, Context.MODE_PRIVATE) + .registerOnSharedPreferenceChangeListener(sharedPreferenceChangeListener); addPreferencesFromResource(R.xml.backup_settings); - backupNowPreference = findPreference(getString(R.string.backup_to_sd_key)); - backupNowPreference.setOnPreferenceClickListener(new OnPreferenceClickListener() { + backupPreference = findPreference(getString(R.string.settings_backup_now_key)); + backupPreference.setOnPreferenceClickListener(new OnPreferenceClickListener() { @Override public boolean onPreferenceClick(Preference preference) { Intent intent = IntentUtils.newIntent(BackupSettingsActivity.this, BackupActivity.class); @@ -80,11 +79,11 @@ public class BackupSettingsActivity extends AbstractSettingsActivity { return true; } }); - restoreNowPreference = findPreference(getString(R.string.restore_from_sd_key)); - restoreNowPreference.setOnPreferenceClickListener(new OnPreferenceClickListener() { + restorePreference = findPreference(getString(R.string.settings_backup_restore_key)); + restorePreference.setOnPreferenceClickListener(new OnPreferenceClickListener() { @Override public boolean onPreferenceClick(Preference preference) { - showDialog(DIALOG_CONFIRM_RESTORE_NOW_ID); + showDialog(DIALOG_CONFIRM_RESTORE_ID); return true; } }); @@ -92,7 +91,7 @@ public class BackupSettingsActivity extends AbstractSettingsActivity { @Override protected Dialog onCreateDialog(int id) { - if (id != DIALOG_CONFIRM_RESTORE_NOW_ID) { + if (id != DIALOG_CONFIRM_RESTORE_ID) { return null; } return DialogUtils.createConfirmationDialog(this, @@ -118,11 +117,11 @@ public class BackupSettingsActivity extends AbstractSettingsActivity { private void updateUi() { boolean isRecording = PreferencesUtils.getLong(this, R.string.recording_track_id_key) != PreferencesUtils.RECORDING_TRACK_ID_DEFAULT; - backupNowPreference.setEnabled(!isRecording); - restoreNowPreference.setEnabled(!isRecording); - backupNowPreference.setSummary(isRecording ? R.string.settings_not_while_recording + backupPreference.setEnabled(!isRecording); + restorePreference.setEnabled(!isRecording); + backupPreference.setSummary(isRecording ? R.string.settings_not_while_recording : R.string.settings_backup_now_summary); - restoreNowPreference.setSummary(isRecording ? R.string.settings_not_while_recording + restorePreference.setSummary(isRecording ? R.string.settings_not_while_recording : R.string.settings_backup_restore_summary); } } diff --git a/MyTracks/src/com/google/android/apps/mytracks/settings/MapSettingsActivity.java b/MyTracks/src/com/google/android/apps/mytracks/settings/MapSettingsActivity.java index 2f17b1392..a68efa3f4 100644 --- a/MyTracks/src/com/google/android/apps/mytracks/settings/MapSettingsActivity.java +++ b/MyTracks/src/com/google/android/apps/mytracks/settings/MapSettingsActivity.java @@ -60,7 +60,6 @@ public class MapSettingsActivity extends AbstractSettingsActivity { return true; } }); - updateUiByTrackColorMode(trackColorModeListPreference.getValue()); slowEditTextPreference = (EditTextPreference) findPreference( getString(R.string.settings_map_slow_display_key)); @@ -78,6 +77,8 @@ public class MapSettingsActivity extends AbstractSettingsActivity { configureImeActionDone(slowEditTextPreference); configureImeActionDone(mediumEditTextPreference); configureImeActionDone(percentageEditTextPreference); + + updateUiByTrackColorMode(trackColorModeListPreference.getValue()); } /** @@ -175,16 +176,14 @@ public class MapSettingsActivity extends AbstractSettingsActivity { * * @param trackColorMode the track color mode */ - @SuppressWarnings("deprecation") private void updateUiByTrackColorMode(String trackColorMode) { boolean isFixedValue = trackColorMode.equals( getString(R.string.settings_map_track_color_mode_fixed_value)); boolean isDynamicValue = trackColorMode.equals( getString(R.string.settings_map_track_color_mode_dynamic_value)); - findPreference(getString(R.string.settings_map_slow_display_key)).setEnabled(isFixedValue); - findPreference(getString(R.string.settings_map_medium_display_key)).setEnabled(isFixedValue); - findPreference(getString(R.string.settings_map_percentage_display_key)) - .setEnabled(isDynamicValue); + slowEditTextPreference.setEnabled(isFixedValue); + mediumEditTextPreference.setEnabled(isFixedValue); + percentageEditTextPreference.setEnabled(isDynamicValue); } /** diff --git a/MyTracks/src/com/google/android/apps/mytracks/settings/StatsSettingsActivity.java b/MyTracks/src/com/google/android/apps/mytracks/settings/StatsSettingsActivity.java index 9514a87c2..7b5781756 100644 --- a/MyTracks/src/com/google/android/apps/mytracks/settings/StatsSettingsActivity.java +++ b/MyTracks/src/com/google/android/apps/mytracks/settings/StatsSettingsActivity.java @@ -55,9 +55,8 @@ public class StatsSettingsActivity extends AbstractSettingsActivity { super.onCreate(bundle); addPreferencesFromResource(R.xml.stats_settings); - SharedPreferences sharedPreferences = getSharedPreferences( - Constants.SETTINGS_NAME, Context.MODE_PRIVATE); - sharedPreferences.registerOnSharedPreferenceChangeListener(sharedPreferenceChangeListener); + getSharedPreferences(Constants.SETTINGS_NAME, Context.MODE_PRIVATE) + .registerOnSharedPreferenceChangeListener(sharedPreferenceChangeListener); } @Override diff --git a/MyTracks/src/com/google/android/apps/mytracks/util/PreferencesUtils.java b/MyTracks/src/com/google/android/apps/mytracks/util/PreferencesUtils.java index b6292b5d4..527593f1a 100644 --- a/MyTracks/src/com/google/android/apps/mytracks/util/PreferencesUtils.java +++ b/MyTracks/src/com/google/android/apps/mytracks/util/PreferencesUtils.java @@ -65,10 +65,18 @@ public class PreferencesUtils { public static final int MIN_REQUIRED_ACCURACY_POOR = 5000; public static final int PERIODIC_TASK_OFF = 0; - + public static final boolean PICK_EXISTING_MAP_DEFAULT = false; + public static final boolean PICK_STATISTICS_MARKER_DEFAULT = true; + public static final String PREFERRED_ACCOUNT_DEFAULT = ""; public static final long RECORDING_TRACK_ID_DEFAULT = -1L; public static final boolean REPORT_SPEED_DEFAULT = true; + public static final long SELECTED_TRACK_ID_DEFAULT = -1L; + public static final boolean SEND_TO_DOCS_DEFAULT = true; + public static final boolean SEND_TO_FUSION_TABLES_DEFAULT = true; + public static final boolean SEND_TO_MAPS_DEFAULT = true; public static final boolean SHARE_URL_ONLY_DEFAULT = false; + public static final boolean SHOW_CHECK_UNITS_DIALOG_DEFAULT = true; + public static final boolean SHOW_WELCOME_DIALOG_DEFAULT = true; public static final int SPLIT_FREQUENCY_DEFAULT = 0; public static final boolean STATS_SHOW_COORDINATE_DEFAULT = false; diff --git a/MyTracks/src/com/google/android/apps/mytracks/util/TrackRecordingServiceConnectionUtils.java b/MyTracks/src/com/google/android/apps/mytracks/util/TrackRecordingServiceConnectionUtils.java index 6d8b9c6f9..f38309cd4 100644 --- a/MyTracks/src/com/google/android/apps/mytracks/util/TrackRecordingServiceConnectionUtils.java +++ b/MyTracks/src/com/google/android/apps/mytracks/util/TrackRecordingServiceConnectionUtils.java @@ -86,7 +86,8 @@ public class TrackRecordingServiceConnectionUtils { Log.e(TAG, "Failed to check if service is recording", e); } } - return PreferencesUtils.getLong(context, R.string.recording_track_id_key) != -1L; + return PreferencesUtils.getLong(context, R.string.recording_track_id_key) + != PreferencesUtils.RECORDING_TRACK_ID_DEFAULT; } /** @@ -108,7 +109,7 @@ public class TrackRecordingServiceConnectionUtils { */ long recordingTrackId = PreferencesUtils.getLong(context, R.string.recording_track_id_key); trackRecordingService.endCurrentTrack(); - if (recordingTrackId != -1L) { + if (recordingTrackId != PreferencesUtils.RECORDING_TRACK_ID_DEFAULT) { Intent intent = IntentUtils.newIntent(context, TrackEditActivity.class) .putExtra(TrackEditActivity.EXTRA_TRACK_ID, recordingTrackId) .putExtra(TrackEditActivity.EXTRA_NEW_TRACK, true); @@ -118,7 +119,8 @@ public class TrackRecordingServiceConnectionUtils { Log.e(TAG, "Unable to stop recording.", e); } } else { - PreferencesUtils.setLong(context, R.string.recording_track_id_key, -1L); + PreferencesUtils.setLong( + context, R.string.recording_track_id_key, PreferencesUtils.RECORDING_TRACK_ID_DEFAULT); } trackRecordingServiceConnection.stop(); } @@ -134,7 +136,8 @@ public class TrackRecordingServiceConnectionUtils { Context context, TrackRecordingServiceConnection trackRecordingServiceConnection) { trackRecordingServiceConnection.bindIfRunning(); if (!isRecordingServiceRunning(context)) { - PreferencesUtils.setLong(context, R.string.recording_track_id_key, -1L); + PreferencesUtils.setLong( + context, R.string.recording_track_id_key, PreferencesUtils.RECORDING_TRACK_ID_DEFAULT); } } diff --git a/MyTracks/src/com/google/android/apps/mytracks/widgets/TrackWidgetProvider.java b/MyTracks/src/com/google/android/apps/mytracks/widgets/TrackWidgetProvider.java index 951bcf1ed..c92f92984 100644 --- a/MyTracks/src/com/google/android/apps/mytracks/widgets/TrackWidgetProvider.java +++ b/MyTracks/src/com/google/android/apps/mytracks/widgets/TrackWidgetProvider.java @@ -81,7 +81,7 @@ public class TrackWidgetProvider public TrackWidgetProvider() { super(); contentHandler = new Handler(); - selectedTrackId = -1; + selectedTrackId = PreferencesUtils.SELECTED_TRACK_ID_DEFAULT; } private void initialize(Context aContext) { @@ -134,7 +134,7 @@ public class TrackWidgetProvider private void updateTrack(String action) { Track track = null; - if (selectedTrackId != -1) { + if (selectedTrackId != PreferencesUtils.SELECTED_TRACK_ID_DEFAULT) { Log.d(TAG, "TrackWidgetProvider.updateTrack: Retrieving specified track."); track = providerUtils.getTrack(selectedTrackId); } else { diff --git a/MyTracksTest/src/com/google/android/apps/mytracks/content/TrackDataHubTest.java b/MyTracksTest/src/com/google/android/apps/mytracks/content/TrackDataHubTest.java index 640b1e5f2..e184ef950 100644 --- a/MyTracksTest/src/com/google/android/apps/mytracks/content/TrackDataHubTest.java +++ b/MyTracksTest/src/com/google/android/apps/mytracks/content/TrackDataHubTest.java @@ -71,7 +71,7 @@ public class TrackDataHubTest extends AndroidTestCase { private TrackDataHub hub; private TrackDataListeners listeners; private DataSourcesWrapper dataSources; - private SharedPreferences prefs; + private SharedPreferences sharedPreferences; private TrackDataListener listener1; private TrackDataListener listener2; private Capture preferenceListenerCapture = @@ -88,12 +88,12 @@ public class TrackDataHubTest extends AndroidTestCase { getContext(), getContext(), "test."); context = new MockContext(mockContentResolver, targetContext); - prefs = context.getSharedPreferences(Constants.SETTINGS_NAME, Context.MODE_PRIVATE); + sharedPreferences = context.getSharedPreferences(Constants.SETTINGS_NAME, Context.MODE_PRIVATE); providerUtils = AndroidMock.createMock("providerUtils", MyTracksProviderUtils.class); dataSources = AndroidMock.createNiceMock("dataSources", DataSourcesWrapper.class); listeners = new TrackDataListeners(); - hub = new TrackDataHub(context, listeners, prefs, providerUtils, TARGET_POINTS) { + hub = new TrackDataHub(context, listeners, sharedPreferences, providerUtils, TARGET_POINTS) { @Override protected DataSourcesWrapper newDataSources() { return dataSources; @@ -826,7 +826,7 @@ public class TrackDataHubTest extends AndroidTestCase { PreferencesUtils.setBoolean(context, R.string.report_speed_key, false); OnSharedPreferenceChangeListener listener = listenerCapture.getValue(); listener.onSharedPreferenceChanged( - prefs, PreferencesUtils.getKey(context, R.string.report_speed_key)); + sharedPreferences, PreferencesUtils.getKey(context, R.string.report_speed_key)); AndroidMock.verify(dataSources, providerUtils, listener1, listener2); AndroidMock.reset(dataSources, providerUtils, listener1, listener2); @@ -838,7 +838,7 @@ public class TrackDataHubTest extends AndroidTestCase { PreferencesUtils.setBoolean(context, R.string.metric_units_key, false); listener.onSharedPreferenceChanged( - prefs, PreferencesUtils.getKey(context, R.string.metric_units_key)); + sharedPreferences, PreferencesUtils.getKey(context, R.string.metric_units_key)); verifyAndReset(); } diff --git a/MyTracksTest/src/com/google/android/apps/mytracks/io/sendtogoogle/UploadServiceChooserActivityTest.java b/MyTracksTest/src/com/google/android/apps/mytracks/io/sendtogoogle/UploadServiceChooserActivityTest.java index a4ca0b177..ff72cfb5b 100644 --- a/MyTracksTest/src/com/google/android/apps/mytracks/io/sendtogoogle/UploadServiceChooserActivityTest.java +++ b/MyTracksTest/src/com/google/android/apps/mytracks/io/sendtogoogle/UploadServiceChooserActivityTest.java @@ -15,14 +15,11 @@ */ package com.google.android.apps.mytracks.io.sendtogoogle; -import com.google.android.apps.mytracks.Constants; +import com.google.android.apps.mytracks.util.PreferencesUtils; import com.google.android.maps.mytracks.R; import android.app.Instrumentation; -import android.content.Context; import android.content.Intent; -import android.content.SharedPreferences; -import android.content.SharedPreferences.Editor; import android.test.ActivityInstrumentationTestCase2; import android.widget.CheckBox; import android.widget.RadioButton; @@ -123,14 +120,10 @@ public class UploadServiceChooserActivityTest extends public void testOnCreateDialog_initStateUnchecked() { initialActivity(true, true, true); // Initial all values to false in SharedPreferences. - SharedPreferences prefs = uploadServiceChooserActivity.getSharedPreferences( - Constants.SETTINGS_NAME, Context.MODE_PRIVATE); - Editor editor = prefs.edit(); - editor.putBoolean(uploadServiceChooserActivity.getString(R.string.send_to_maps_key), false); - editor.putBoolean(uploadServiceChooserActivity.getString(R.string.send_to_fusion_tables_key), - false); - editor.putBoolean(uploadServiceChooserActivity.getString(R.string.send_to_docs_key), false); - editor.commit(); + PreferencesUtils.setBoolean(uploadServiceChooserActivity, R.string.send_to_maps_key, false); + PreferencesUtils.setBoolean( + uploadServiceChooserActivity, R.string.send_to_fusion_tables_key, false); + PreferencesUtils.setBoolean(uploadServiceChooserActivity, R.string.send_to_docs_key, false); uploadServiceChooserActivity.runOnUiThread(new Runnable() { public void run() { uploadServiceChooserActivity.initState(); @@ -150,15 +143,11 @@ public class UploadServiceChooserActivityTest extends public void testOnCreateDialog_initStateChecked() { initialActivity(true, true, true); // Initial all values to true in SharedPreferences. - SharedPreferences prefs = uploadServiceChooserActivity.getSharedPreferences( - Constants.SETTINGS_NAME, Context.MODE_PRIVATE); - Editor editor = prefs.edit(); - editor.putBoolean(uploadServiceChooserActivity.getString(R.string.send_to_maps_key), true); - editor.putBoolean(uploadServiceChooserActivity.getString(R.string.pick_existing_map_key), true); - editor.putBoolean(uploadServiceChooserActivity.getString(R.string.send_to_fusion_tables_key), - true); - editor.putBoolean(uploadServiceChooserActivity.getString(R.string.send_to_docs_key), true); - editor.commit(); + PreferencesUtils.setBoolean(uploadServiceChooserActivity, R.string.pick_existing_map_key, true); + PreferencesUtils.setBoolean(uploadServiceChooserActivity, R.string.send_to_maps_key, true); + PreferencesUtils.setBoolean( + uploadServiceChooserActivity, R.string.send_to_fusion_tables_key, true); + PreferencesUtils.setBoolean(uploadServiceChooserActivity, R.string.send_to_docs_key, true); uploadServiceChooserActivity.runOnUiThread(new Runnable() { public void run() { uploadServiceChooserActivity.initState(); @@ -181,14 +170,10 @@ public class UploadServiceChooserActivityTest extends public void testOnCreateDialog_saveState() { initialActivity(true, true, true); // Initial all values to true in SharedPreferences. - SharedPreferences prefs = uploadServiceChooserActivity.getSharedPreferences( - Constants.SETTINGS_NAME, Context.MODE_PRIVATE); - Editor editor = prefs.edit(); - editor.putBoolean(uploadServiceChooserActivity.getString(R.string.send_to_maps_key), true); - editor.putBoolean(uploadServiceChooserActivity.getString(R.string.send_to_fusion_tables_key), - true); - editor.putBoolean(uploadServiceChooserActivity.getString(R.string.send_to_docs_key), true); - editor.commit(); + PreferencesUtils.setBoolean(uploadServiceChooserActivity, R.string.send_to_maps_key, true); + PreferencesUtils.setBoolean( + uploadServiceChooserActivity, R.string.send_to_fusion_tables_key, true); + PreferencesUtils.setBoolean(uploadServiceChooserActivity, R.string.send_to_docs_key, true); uploadServiceChooserActivity.runOnUiThread(new Runnable() { public void run() { uploadServiceChooserActivity.initState(); @@ -197,12 +182,13 @@ public class UploadServiceChooserActivityTest extends instrumentation.waitForIdleSync(); uploadServiceChooserActivity.saveState(); // All values in SharedPreferences must be changed. - assertTrue(prefs.getBoolean(uploadServiceChooserActivity.getString(R.string.send_to_maps_key), - false)); - assertTrue(prefs.getBoolean(uploadServiceChooserActivity.getString(R.string.send_to_maps_key), - false)); - assertTrue(prefs.getBoolean(uploadServiceChooserActivity.getString(R.string.send_to_maps_key), - false)); + assertTrue(PreferencesUtils.getBoolean(uploadServiceChooserActivity, R.string.send_to_maps_key, + PreferencesUtils.SEND_TO_MAPS_DEFAULT)); + assertTrue(PreferencesUtils.getBoolean( + uploadServiceChooserActivity, R.string.send_to_fusion_tables_key, + PreferencesUtils.SEND_TO_FUSION_TABLES_DEFAULT)); + assertTrue(PreferencesUtils.getBoolean(uploadServiceChooserActivity, R.string.send_to_docs_key, + PreferencesUtils.SEND_TO_DOCS_DEFAULT)); } /** @@ -213,14 +199,10 @@ public class UploadServiceChooserActivityTest extends public void testOnCreateDialog_startNextActivity() { initialActivity(true, true, true); // Initial all values to true or false in SharedPreferences. - SharedPreferences prefs = uploadServiceChooserActivity.getSharedPreferences( - Constants.SETTINGS_NAME, Context.MODE_PRIVATE); - Editor editor = prefs.edit(); - editor.putBoolean(uploadServiceChooserActivity.getString(R.string.send_to_maps_key), true); - editor.putBoolean(uploadServiceChooserActivity.getString(R.string.send_to_docs_key), true); - editor.putBoolean(uploadServiceChooserActivity.getString(R.string.send_to_fusion_tables_key), - false); - editor.commit(); + PreferencesUtils.setBoolean(uploadServiceChooserActivity, R.string.send_to_maps_key, true); + PreferencesUtils.setBoolean(uploadServiceChooserActivity, R.string.send_to_docs_key, true); + PreferencesUtils.setBoolean( + uploadServiceChooserActivity, R.string.send_to_fusion_tables_key, false); uploadServiceChooserActivity.runOnUiThread(new Runnable() { public void run() { uploadServiceChooserActivity.initState(); diff --git a/MyTracksTest/src/com/google/android/apps/mytracks/maps/DynamicSpeedTrackPathDescriptorTest.java b/MyTracksTest/src/com/google/android/apps/mytracks/maps/DynamicSpeedTrackPathDescriptorTest.java index ad6fa0afe..6d00a0162 100644 --- a/MyTracksTest/src/com/google/android/apps/mytracks/maps/DynamicSpeedTrackPathDescriptorTest.java +++ b/MyTracksTest/src/com/google/android/apps/mytracks/maps/DynamicSpeedTrackPathDescriptorTest.java @@ -124,7 +124,8 @@ public class DynamicSpeedTrackPathDescriptorTest extends AndroidTestCase { * id. */ public void testNeedsRedraw_WrongTrackId() { - PreferencesUtils.setLong(context, R.string.selected_track_id_key, -1L); + PreferencesUtils.setLong( + context, R.string.selected_track_id_key, PreferencesUtils.SELECTED_TRACK_ID_DEFAULT); DynamicSpeedTrackPathDescriptor dynamicSpeedTrackPathDescriptor = new DynamicSpeedTrackPathDescriptor( context); assertEquals(false, dynamicSpeedTrackPathDescriptor.needsRedraw()); diff --git a/MyTracksTest/src/com/google/android/apps/mytracks/services/TrackRecordingServiceTest.java b/MyTracksTest/src/com/google/android/apps/mytracks/services/TrackRecordingServiceTest.java index a596f67e7..bc3594eb4 100644 --- a/MyTracksTest/src/com/google/android/apps/mytracks/services/TrackRecordingServiceTest.java +++ b/MyTracksTest/src/com/google/android/apps/mytracks/services/TrackRecordingServiceTest.java @@ -65,7 +65,6 @@ public class TrackRecordingServiceTest extends ServiceTestCase= 0); providerUtils.insertTrack(track); assertEquals(track.getId(), providerUtils.getTrack(track.getId()).getId()); - PreferencesUtils.setLong(context, R.string.recording_track_id_key, isRecording ? track.getId() : -1L); + PreferencesUtils.setLong(context, R.string.recording_track_id_key, isRecording ? track.getId() + : PreferencesUtils.RECORDING_TRACK_ID_DEFAULT); } private void fullRecordingSession() throws Exception { diff --git a/MyTracksTest/src/com/google/android/apps/mytracks/services/sensors/SensorManagerFactoryTest.java b/MyTracksTest/src/com/google/android/apps/mytracks/services/sensors/SensorManagerFactoryTest.java index ece0b04e0..936f7f3ec 100644 --- a/MyTracksTest/src/com/google/android/apps/mytracks/services/sensors/SensorManagerFactoryTest.java +++ b/MyTracksTest/src/com/google/android/apps/mytracks/services/sensors/SensorManagerFactoryTest.java @@ -11,13 +11,11 @@ import android.test.suitebuilder.annotation.SmallTest; public class SensorManagerFactoryTest extends AndroidTestCase { - private SharedPreferences sharedPreferences; - @Override protected void setUp() throws Exception { super.setUp(); - sharedPreferences = getContext().getSharedPreferences( + SharedPreferences sharedPreferences = getContext().getSharedPreferences( Constants.SETTINGS_NAME, Context.MODE_PRIVATE); // Let's use default values. sharedPreferences.edit().clear().apply(); diff --git a/MyTracksTest/src/com/google/android/apps/mytracks/services/sensors/ant/AntDirectSensorManagerTest.java b/MyTracksTest/src/com/google/android/apps/mytracks/services/sensors/ant/AntDirectSensorManagerTest.java index 2b167e15d..01cdac80b 100644 --- a/MyTracksTest/src/com/google/android/apps/mytracks/services/sensors/ant/AntDirectSensorManagerTest.java +++ b/MyTracksTest/src/com/google/android/apps/mytracks/services/sensors/ant/AntDirectSensorManagerTest.java @@ -28,7 +28,6 @@ import android.test.suitebuilder.annotation.SmallTest; public class AntDirectSensorManagerTest extends AndroidTestCase { - private SharedPreferences sharedPreferences; private AntSensorBase heartRateSensor; private static final byte HEART_RATE_CHANNEL = 0; @@ -48,7 +47,7 @@ public class AntDirectSensorManagerTest extends AndroidTestCase { private AntDirectSensorManager manager; public void setUp() { - sharedPreferences = getContext().getSharedPreferences( + SharedPreferences sharedPreferences = getContext().getSharedPreferences( Constants.SETTINGS_NAME, Context.MODE_PRIVATE); // Let's use default values. sharedPreferences.edit().clear().apply();