upstream-mirrors/OpenTracks
1
0
Fork 1
mirror of https://codeberg.org/OpenTracksApp/OpenTracks.git synced 2026-10-02 09:33:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

Remove selected_track_id_key.

Browse Source
This commit is contained in:
Jimmy Shih
2013-05-29 11:23:08 -07:00
parent aafe93b723
commit 0a0753c4c5
6 changed files with 11 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MyTracks/res/values/keys.xml
-1
View File
@@ -72,7 +72,6 @@ limitations under the License.
<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>
<!-- Keys for non-persisted preferences. Sorted alphabetically. DO NOT TRANSLATE. -->
<string name="settings_backup_key">settingsBackup</string>
<string name="settings_backup_reset_key">settingsBackupReset</string>
MyTracks/src/com/google/android/apps/mytracks/content/TrackDataHub.java
-12
View File
@@ -156,7 +156,6 @@ public class TrackDataHub implements DataSourceListener {
return;
}
selectedTrackId = trackId;
PreferencesUtils.setLong(context, R.string.selected_track_id_key, selectedTrackId);
loadDataForAll();
}
});
@@ -259,17 +258,6 @@ public class TrackDataHub implements DataSourceListener {
runInHanderThread(new Runnable() {
@Override
public void run() {
if (key == null
|| key.equals(PreferencesUtils.getKey(context, R.string.selected_track_id_key))) {
long trackId = PreferencesUtils.getLong(context, R.string.selected_track_id_key);
boolean hasChanged = trackId != selectedTrackId;
selectedTrackId = trackId;
if (key != null) {
if (hasChanged) {
loadDataForAll();
}
}
}
if (key == null
|| key.equals(PreferencesUtils.getKey(context, R.string.recording_track_id_key))) {
recordingTrackId = PreferencesUtils.getLong(context, R.string.recording_track_id_key);
MyTracks/src/com/google/android/apps/mytracks/io/backup/PreferenceBackupHelper.java
-1
View File
@@ -61,7 +61,6 @@ public class PreferenceBackupHelper {
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));
}
/**
MyTracks/src/com/google/android/apps/mytracks/maps/TrackPath.java
+2 -2
View File
@@ -34,10 +34,10 @@ public interface TrackPath {
/**
* Updates state.
*
* @param tripstatistics the trip statistics
* @param tripStatistics the trip statistics
* @return true if the state is updated.
*/
public boolean updateState(TripStatistics tripStatistrics);
public boolean updateState(TripStatistics tripStatistics);
/**
* Updates the path.
MyTracksTest/src/com/google/android/apps/mytracks/content/TrackDataHubTest.java
+7 -17
View File
@@ -99,7 +99,6 @@ public class TrackDataHubTest extends AndroidTestCase {
trackDataListener2 = AndroidMock.createStrictMock(
"trackDataListener2", TrackDataListener.class);
PreferencesUtils.setLong(context, R.string.recording_track_id_key, TRACK_ID);
PreferencesUtils.setLong(context, R.string.selected_track_id_key, TRACK_ID);
}
@Override
@@ -135,6 +134,7 @@ public class TrackDataHubTest extends AndroidTestCase {
replay();
trackDataHub.start();
trackDataHub.loadTrack(TRACK_ID);
trackDataHub.registerTrackDataListener(
trackDataListener1, EnumSet.of(TrackDataType.TRACKS_TABLE));
trackDataHub.registerTrackDataListener(
@@ -206,6 +206,7 @@ public class TrackDataHubTest extends AndroidTestCase {
replay();
trackDataHub.start();
trackDataHub.loadTrack(TRACK_ID);
trackDataHub.registerTrackDataListener(
trackDataListener1, EnumSet.of(TrackDataType.WAYPOINTS_TABLE));
trackDataHub.registerTrackDataListener(
@@ -281,6 +282,7 @@ public class TrackDataHubTest extends AndroidTestCase {
replay();
trackDataHub.start();
trackDataHub.loadTrack(TRACK_ID);
trackDataHub.registerTrackDataListener(
trackDataListener1, EnumSet.of(TrackDataType.SAMPLED_IN_TRACK_POINTS_TABLE));
verifyAndReset();
@@ -352,6 +354,7 @@ public class TrackDataHubTest extends AndroidTestCase {
replay();
trackDataHub.start();
trackDataHub.loadTrack(TRACK_ID);
trackDataHub.registerTrackDataListener(
trackDataListener1, EnumSet.of(TrackDataType.SAMPLED_IN_TRACK_POINTS_TABLE));
verifyAndReset();
@@ -402,6 +405,7 @@ public class TrackDataHubTest extends AndroidTestCase {
replay();
trackDataHub.start();
trackDataHub.loadTrack(TRACK_ID);
trackDataHub.registerTrackDataListener(
trackDataListener1, EnumSet.of(TrackDataType.SAMPLED_IN_TRACK_POINTS_TABLE));
verifyAndReset();
@@ -462,6 +466,7 @@ public class TrackDataHubTest extends AndroidTestCase {
replay();
trackDataHub.start();
trackDataHub.loadTrack(TRACK_ID);
trackDataHub.registerTrackDataListener(
trackDataListener1, EnumSet.of(TrackDataType.SAMPLED_IN_TRACK_POINTS_TABLE));
trackDataHub.registerTrackDataListener(trackDataListener2, EnumSet.of(
@@ -490,6 +495,7 @@ public class TrackDataHubTest extends AndroidTestCase {
replay();
trackDataHub.start();
trackDataHub.loadTrack(TRACK_ID);
trackDataHub.registerTrackDataListener(
trackDataListener1, EnumSet.of(TrackDataType.SAMPLED_IN_TRACK_POINTS_TABLE));
verifyAndReset();
@@ -809,20 +815,4 @@ public class TrackDataHubTest extends AndroidTestCase {
.getKey(context, R.string.report_speed_key));
assertEquals(!value, trackDataHub.isReportSpeed());
}
/**
* Tests the method {@link TrackDataHub#notifyPreferenceChanged(String)} when
* the key is R.string.selected_track_id_key and no listener is registered.
*/
public void testNotifyPreferenceChanged_trackIdNoListener() {
long value = 1;
PreferencesUtils.setLong(context, R.string.selected_track_id_key, value);
trackDataHub.notifyPreferenceChanged(PreferencesUtils
.getKey(context, R.string.selected_track_id_key));
assertEquals(value, trackDataHub.getSelectedTrackId());
PreferencesUtils.setLong(context, R.string.selected_track_id_key, value + 1);
trackDataHub.notifyPreferenceChanged(PreferencesUtils
.getKey(context, R.string.selected_track_id_key));
assertEquals(value + 1, trackDataHub.getSelectedTrackId());
}
}
MyTracksTest/src/com/google/android/apps/mytracks/maps/DynamicSpeedTrackPathDescriptorTest.java
+2 -2
View File
@@ -78,8 +78,8 @@ public class DynamicSpeedTrackPathDescriptorTest extends AndroidTestCase {
}
/**
* Tests {@link DynamicSpeedTrackPathDescriptor#updateState()} by different
* averageMovingSpeed.
* Tests {@link DynamicSpeedTrackPathDescriptor#updateState(com.google.android.apps.mytracks.stats.TripStatistics)}
* by different averageMovingSpeed.
*/
public void testIsDiffereceSignificant() {
DynamicSpeedTrackPathDescriptor dynamicSpeedTrackPathDescriptor = new DynamicSpeedTrackPathDescriptor(