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

In TrackDataHub, do not automatically register for preferences change.

Browse Source
This commit is contained in:
Jimmy Shih
2013-05-29 14:16:54 -07:00
parent 5a14ef080c
commit 125b21ef30
2 changed files with 0 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MyTracks/src/com/google/android/apps/mytracks/content/TrackDataManager.java
-2
View File
@@ -118,8 +118,6 @@ public class TrackDataManager {
for (EnumSet<TrackDataType> value : listenerToTypesMap.values()) { for (EnumSet<TrackDataType> value : listenerToTypesMap.values()) {
types.addAll(value); types.addAll(value);
} }
// Always include preference
types.add(TrackDataType.PREFERENCE);
return types; return types;
} }
} }
MyTracksTest/src/com/google/android/apps/mytracks/content/TrackDataHubTest.java
-9
View File
@@ -126,7 +126,6 @@ public class TrackDataHubTest extends AndroidTestCase {
Capture<ContentObserver> contentObserverCapture = new Capture<ContentObserver>(); Capture<ContentObserver> contentObserverCapture = new Capture<ContentObserver>();
Track track = new Track(); Track track = new Track();
expect(myTracksProviderUtils.getTrack(TRACK_ID)).andStubReturn(track); expect(myTracksProviderUtils.getTrack(TRACK_ID)).andStubReturn(track);
dataSource.registerOnSharedPreferenceChangeListener(capture(preferenceChangeListenerCapture));
dataSource.registerContentObserver( dataSource.registerContentObserver(
eq(TracksColumns.CONTENT_URI), capture(contentObserverCapture)); eq(TracksColumns.CONTENT_URI), capture(contentObserverCapture));
trackDataListener1.onTrackUpdated(track); trackDataListener1.onTrackUpdated(track);
@@ -192,7 +191,6 @@ public class TrackDataHubTest extends AndroidTestCase {
.andStubAnswer(new FixedSizeCursorAnswer(2)); .andStubAnswer(new FixedSizeCursorAnswer(2));
expect(myTracksProviderUtils.createWaypoint(isA(Cursor.class))) expect(myTracksProviderUtils.createWaypoint(isA(Cursor.class)))
.andReturn(waypoint1).andReturn(waypoint2).andReturn(waypoint1).andReturn(waypoint2); .andReturn(waypoint1).andReturn(waypoint2).andReturn(waypoint1).andReturn(waypoint2);
dataSource.registerOnSharedPreferenceChangeListener(capture(preferenceChangeListenerCapture));
dataSource.registerContentObserver( dataSource.registerContentObserver(
eq(WaypointsColumns.CONTENT_URI), capture(contentObserverCapture)); eq(WaypointsColumns.CONTENT_URI), capture(contentObserverCapture));
trackDataListener1.clearWaypoints(); trackDataListener1.clearWaypoints();
@@ -268,7 +266,6 @@ public class TrackDataHubTest extends AndroidTestCase {
public void testTrackPointsTableUpdate() { public void testTrackPointsTableUpdate() {
// Register one listener // Register one listener
Capture<ContentObserver> contentObserverCapture = new Capture<ContentObserver>(); Capture<ContentObserver> contentObserverCapture = new Capture<ContentObserver>();
dataSource.registerOnSharedPreferenceChangeListener(capture(preferenceChangeListenerCapture));
dataSource.registerContentObserver( dataSource.registerContentObserver(
eq(TrackPointsColumns.CONTENT_URI), capture(contentObserverCapture)); eq(TrackPointsColumns.CONTENT_URI), capture(contentObserverCapture));
@@ -339,7 +336,6 @@ public class TrackDataHubTest extends AndroidTestCase {
// Register one listener // Register one listener
Capture<ContentObserver> contentObserverCapture = new Capture<ContentObserver>(); Capture<ContentObserver> contentObserverCapture = new Capture<ContentObserver>();
dataSource.registerOnSharedPreferenceChangeListener(capture(preferenceChangeListenerCapture));
dataSource.registerContentObserver( dataSource.registerContentObserver(
eq(TrackPointsColumns.CONTENT_URI), capture(contentObserverCapture)); eq(TrackPointsColumns.CONTENT_URI), capture(contentObserverCapture));
@@ -391,7 +387,6 @@ public class TrackDataHubTest extends AndroidTestCase {
// Register one listener // Register one listener
Capture<ContentObserver> observerCapture = new Capture<ContentObserver>(); Capture<ContentObserver> observerCapture = new Capture<ContentObserver>();
dataSource.registerOnSharedPreferenceChangeListener(capture(preferenceChangeListenerCapture));
dataSource.registerContentObserver( dataSource.registerContentObserver(
eq(TrackPointsColumns.CONTENT_URI), capture(observerCapture)); eq(TrackPointsColumns.CONTENT_URI), capture(observerCapture));
@@ -442,7 +437,6 @@ public class TrackDataHubTest extends AndroidTestCase {
*/ */
public void testTrackPointsTableUpdate_largeTrackSampling() { public void testTrackPointsTableUpdate_largeTrackSampling() {
Capture<ContentObserver> contentObserverCapture = new Capture<ContentObserver>(); Capture<ContentObserver> contentObserverCapture = new Capture<ContentObserver>();
dataSource.registerOnSharedPreferenceChangeListener(capture(preferenceChangeListenerCapture));
dataSource.registerContentObserver( dataSource.registerContentObserver(
eq(TrackPointsColumns.CONTENT_URI), capture(contentObserverCapture)); eq(TrackPointsColumns.CONTENT_URI), capture(contentObserverCapture));
@@ -479,7 +473,6 @@ public class TrackDataHubTest extends AndroidTestCase {
*/ */
public void testTrackPointsTableUpdate_resampling() { public void testTrackPointsTableUpdate_resampling() {
Capture<ContentObserver> observerCapture = new Capture<ContentObserver>(); Capture<ContentObserver> observerCapture = new Capture<ContentObserver>();
dataSource.registerOnSharedPreferenceChangeListener(capture(preferenceChangeListenerCapture));
dataSource.registerContentObserver( dataSource.registerContentObserver(
eq(TrackPointsColumns.CONTENT_URI), capture(observerCapture)); eq(TrackPointsColumns.CONTENT_URI), capture(observerCapture));
@@ -716,7 +709,6 @@ public class TrackDataHubTest extends AndroidTestCase {
* Tests the method {@link TrackDataHub#start()}. * Tests the method {@link TrackDataHub#start()}.
*/ */
public void testRegisterTracksTableListener() { public void testRegisterTracksTableListener() {
dataSource.registerOnSharedPreferenceChangeListener(capture(preferenceChangeListenerCapture));
Capture<ContentObserver> observerCapture = new Capture<ContentObserver>(); Capture<ContentObserver> observerCapture = new Capture<ContentObserver>();
dataSource.registerContentObserver(eq(TracksColumns.CONTENT_URI), capture(observerCapture)); dataSource.registerContentObserver(eq(TracksColumns.CONTENT_URI), capture(observerCapture));
Track track = TrackStubUtils.createTrack(1); Track track = TrackStubUtils.createTrack(1);
@@ -735,7 +727,6 @@ public class TrackDataHubTest extends AndroidTestCase {
* Tests the method {@link TrackDataHub#start()}. * Tests the method {@link TrackDataHub#start()}.
*/ */
public void testRegisterWaypointsTableListener() { public void testRegisterWaypointsTableListener() {
dataSource.registerOnSharedPreferenceChangeListener(capture(preferenceChangeListenerCapture));
Capture<ContentObserver> observerCapture = new Capture<ContentObserver>(); Capture<ContentObserver> observerCapture = new Capture<ContentObserver>();
dataSource.registerContentObserver(eq(WaypointsColumns.CONTENT_URI), capture(observerCapture)); dataSource.registerContentObserver(eq(WaypointsColumns.CONTENT_URI), capture(observerCapture));
expect(myTracksProviderUtils.getWaypointCursor( expect(myTracksProviderUtils.getWaypointCursor(