diff --git a/fastlane/metadata/android/en-US/changelogs/next_release.txt b/fastlane/metadata/android/en-US/changelogs/next_release.txt index 203fabbb0..220435732 100644 --- a/fastlane/metadata/android/en-US/changelogs/next_release.txt +++ b/fastlane/metadata/android/en-US/changelogs/next_release.txt @@ -1,7 +1,7 @@ (tbd): OpenTracks Changes: -- +- Removed aggregated stats Bugfix: - diff --git a/src/main/AndroidManifest.xml b/src/main/AndroidManifest.xml index 6066c24d9..534fa6b9f 100644 --- a/src/main/AndroidManifest.xml +++ b/src/main/AndroidManifest.xml @@ -30,10 +30,6 @@ limitations under the License. - - tracks = ContentProviderUtils.Factory.get(this).getAllTracks(); - TripStatistics tripStatistics = null; - if (!tracks.isEmpty()) { - tripStatistics = new TripStatistics(tracks.iterator().next().getTripStatistics()); - for (int i = 1; i < tracks.size(); i++) { - tripStatistics.merge(tracks.get(i).getTripStatistics()); - } - } - return tripStatistics; - } -} diff --git a/src/main/java/de/dennisguse/opentracks/TrackListActivity.java b/src/main/java/de/dennisguse/opentracks/TrackListActivity.java index 188ccc312..6b4fb179a 100644 --- a/src/main/java/de/dennisguse/opentracks/TrackListActivity.java +++ b/src/main/java/de/dennisguse/opentracks/TrackListActivity.java @@ -184,7 +184,6 @@ public class TrackListActivity extends AbstractListActivity implements ConfirmDe // Menu items private MenuItem searchMenuItem; private MenuItem startGpsMenuItem; - private MenuItem aggregatedStatisticsMenuItem; private MenuItem deleteAllMenuItem; private final OnClickListener stopListener = new OnClickListener() { @@ -392,7 +391,6 @@ public class TrackListActivity extends AbstractListActivity implements ConfirmDe ActivityUtils.configureSearchWidget(this, searchMenuItem, trackController); startGpsMenuItem = menu.findItem(R.id.track_list_start_gps); - aggregatedStatisticsMenuItem = menu.findItem(R.id.track_list_aggregated_statistics); deleteAllMenuItem = menu.findItem(R.id.track_list_delete_all); return super.onCreateOptionsMenu(menu); @@ -447,10 +445,6 @@ public class TrackListActivity extends AbstractListActivity implements ConfirmDe intent = IntentUtils.newIntent(this, MarkerListActivity.class); startActivity(intent); return true; - case R.id.track_list_aggregated_statistics: - intent = IntentUtils.newIntent(this, AggregatedStatsActivity.class); - startActivity(intent); - return true; case R.id.track_list_delete_all: deleteTracks(new long[]{-1L}); return true; @@ -539,9 +533,6 @@ public class TrackListActivity extends AbstractListActivity implements ConfirmDe startGpsMenuItem.setIcon(isGpsStarted ? R.drawable.ic_gps_fixed_24dp : R.drawable.ic_gps_off_24dp); } } - if (aggregatedStatisticsMenuItem != null) { - aggregatedStatisticsMenuItem.setVisible(hasTrack); - } if (deleteAllMenuItem != null) { deleteAllMenuItem.setVisible(hasTrack && !isRecording); } diff --git a/src/main/res/menu/track_list.xml b/src/main/res/menu/track_list.xml index a8f602263..f38e9d108 100644 --- a/src/main/res/menu/track_list.xml +++ b/src/main/res/menu/track_list.xml @@ -31,10 +31,6 @@ limitations under the License. android:icon="@drawable/ic_marker_show_24dp" android:title="@string/menu_markers" app:showAsAction="ifRoom" /> -