From f19948e4cdb78f9f69bfced93b0057fc2dbd0948 Mon Sep 17 00:00:00 2001 From: Dennis Guse Date: Sat, 20 Jul 2019 13:37:45 +0200 Subject: [PATCH] Removed listener for map updates as there is no map anymore. --- .../apps/mytracks/content/TrackDataHub.java | 28 ++++--------------- .../mytracks/content/TrackDataListener.java | 8 ------ .../mytracks/fragments/ChartFragment.java | 9 +----- .../mytracks/fragments/StatsFragment.java | 6 ---- myTracks/src/main/res/values/keys.xml | 4 --- 5 files changed, 6 insertions(+), 49 deletions(-) diff --git a/myTracks/src/main/java/com/google/android/apps/mytracks/content/TrackDataHub.java b/myTracks/src/main/java/com/google/android/apps/mytracks/content/TrackDataHub.java index f8cd3dca3..7a4a84366 100644 --- a/myTracks/src/main/java/com/google/android/apps/mytracks/content/TrackDataHub.java +++ b/myTracks/src/main/java/com/google/android/apps/mytracks/content/TrackDataHub.java @@ -21,9 +21,10 @@ import android.database.Cursor; import android.location.Location; import android.os.Handler; import android.os.HandlerThread; -import androidx.annotation.VisibleForTesting; import android.util.Log; +import androidx.annotation.VisibleForTesting; + import com.google.android.apps.mytracks.content.MyTracksProviderUtils.LocationIterator; import com.google.android.apps.mytracks.util.LocationUtils; import com.google.android.apps.mytracks.util.PreferencesUtils; @@ -74,7 +75,6 @@ public class TrackDataHub implements DataSourceListener { private boolean reportSpeed; private int recordingGpsAccuracy; private int recordingDistanceInterval; - private int mapType; // Track points sampling state private int numLoadedPoints; @@ -320,32 +320,16 @@ public class TrackDataHub implements DataSourceListener { } } } - if (key == null || key.equals( - PreferencesUtils.getKey(context, R.string.recording_distance_interval_key))) { - recordingDistanceInterval = PreferencesUtils.getInt( - context, R.string.recording_distance_interval_key, - PreferencesUtils.RECORDING_DISTANCE_INTERVAL_DEFAULT); + if (key == null || key.equals(PreferencesUtils.getKey(context, R.string.recording_distance_interval_key))) { + recordingDistanceInterval = PreferencesUtils.getInt(context, R.string.recording_distance_interval_key, PreferencesUtils.RECORDING_DISTANCE_INTERVAL_DEFAULT); if (key != null) { - for (TrackDataListener trackDataListener : - trackDataManager.getListeners(TrackDataType.PREFERENCE)) { + for (TrackDataListener trackDataListener : trackDataManager.getListeners(TrackDataType.PREFERENCE)) { if (trackDataListener.onRecordingDistanceIntervalChanged(recordingDistanceInterval)) { loadDataForListener(trackDataListener); } } } } - if (key == null || key.equals(PreferencesUtils.getKey(context, R.string.map_type_key))) { - mapType = PreferencesUtils.getInt( - context, R.string.map_type_key, PreferencesUtils.MAP_TYPE_DEFAUlT); - if (key != null) { - for (TrackDataListener trackDataListener : - trackDataManager.getListeners(TrackDataType.PREFERENCE)) { - if (trackDataListener.onMapTypeChanged(mapType)) { - loadDataForListener(trackDataListener); - } - } - } - } } }); } @@ -364,7 +348,6 @@ public class TrackDataHub implements DataSourceListener { trackDataListener.onReportSpeedChanged(reportSpeed); trackDataListener.onRecordingGpsAccuracy(recordingGpsAccuracy); trackDataListener.onRecordingDistanceIntervalChanged(recordingDistanceInterval); - trackDataListener.onMapTypeChanged(mapType); } notifyTracksTableUpdate(trackDataManager.getListeners(TrackDataType.TRACKS_TABLE)); @@ -392,7 +375,6 @@ public class TrackDataHub implements DataSourceListener { trackDataListener.onReportSpeedChanged(reportSpeed); trackDataListener.onRecordingGpsAccuracy(recordingGpsAccuracy); trackDataListener.onRecordingDistanceIntervalChanged(recordingDistanceInterval); - trackDataListener.onMapTypeChanged(mapType); } if (trackDataTypes.contains(TrackDataType.TRACKS_TABLE)) { diff --git a/myTracks/src/main/java/com/google/android/apps/mytracks/content/TrackDataListener.java b/myTracks/src/main/java/com/google/android/apps/mytracks/content/TrackDataListener.java index e0f145e90..5d25f5f78 100644 --- a/myTracks/src/main/java/com/google/android/apps/mytracks/content/TrackDataListener.java +++ b/myTracks/src/main/java/com/google/android/apps/mytracks/content/TrackDataListener.java @@ -114,12 +114,4 @@ public interface TrackDataListener { * @return true to reload all the data, false otherwise. */ boolean onRecordingDistanceIntervalChanged(int recordingDistanceInterval); - - /** - * Called when the map type preference value is changed. - * - * @param mapType the new value - * @return true to reload all the data, false otherwise. - */ - boolean onMapTypeChanged(int mapType); } diff --git a/myTracks/src/main/java/com/google/android/apps/mytracks/fragments/ChartFragment.java b/myTracks/src/main/java/com/google/android/apps/mytracks/fragments/ChartFragment.java index 93bfdfdc2..a904ab622 100644 --- a/myTracks/src/main/java/com/google/android/apps/mytracks/fragments/ChartFragment.java +++ b/myTracks/src/main/java/com/google/android/apps/mytracks/fragments/ChartFragment.java @@ -301,12 +301,6 @@ public class ChartFragment extends Fragment implements TrackDataListener { } return false; } - - @Override - public boolean onMapTypeChanged(int mapType) { - // We don't care. - return false; - } /** * Checks the chart settings. @@ -319,8 +313,7 @@ public class ChartFragment extends Fragment implements TrackDataListener { reloadTrackDataHub(); needUpdate = true; } - if (setSeriesEnabled(ChartView.ELEVATION_SERIES, PreferencesUtils.getBoolean(getActivity(), - R.string.chart_show_elevation_key, PreferencesUtils.CHART_SHOW_ELEVATION_DEFAULT))) { + if (setSeriesEnabled(ChartView.ELEVATION_SERIES, PreferencesUtils.getBoolean(getActivity(), R.string.chart_show_elevation_key, PreferencesUtils.CHART_SHOW_ELEVATION_DEFAULT))) { needUpdate = true; } diff --git a/myTracks/src/main/java/com/google/android/apps/mytracks/fragments/StatsFragment.java b/myTracks/src/main/java/com/google/android/apps/mytracks/fragments/StatsFragment.java index aab3b19c8..316ff073f 100644 --- a/myTracks/src/main/java/com/google/android/apps/mytracks/fragments/StatsFragment.java +++ b/myTracks/src/main/java/com/google/android/apps/mytracks/fragments/StatsFragment.java @@ -263,12 +263,6 @@ public class StatsFragment extends Fragment implements TrackDataListener { return false; } - @Override - public boolean onMapTypeChanged(int mapType) { - // We don't care - return false; - } - /** * Resumes the trackDataHub. Needs to be synchronized because trackDataHub can * be accessed by multiple threads. diff --git a/myTracks/src/main/res/values/keys.xml b/myTracks/src/main/res/values/keys.xml index 1cb9dda54..4ef1f9d75 100644 --- a/myTracks/src/main/res/values/keys.xml +++ b/myTracks/src/main/res/values/keys.xml @@ -25,14 +25,11 @@ limitations under the License. chartShowSpeed chartXAxis defaultActivity - mapType maxRecordingDistance minRecordingInterval photoSize recordingDistanceInterval recordingGpsAccuracy - shareTrackInvite - shareTrackPublic splitFrequency statsRate statsShowCoordinate @@ -49,7 +46,6 @@ limitations under the License. trackWidgetItem4 voiceFrequency - activityRecognitionType autoResumeTrackCurrentRetry bluetoothSensor recordingTrackId