From 55fa6d2d793bf49d6dd35ecb33fe5b6d0a9a9741 Mon Sep 17 00:00:00 2001 From: Dennis Guse Date: Sun, 13 Dec 2020 17:30:51 +0100 Subject: [PATCH] Code cleanup using AndroidStudio. --- .../opentracks/content/data/TestDataUtil.java | 2 +- .../provider/CustomContentProviderUtilsTest.java | 12 +----------- .../content/provider/ContentProviderUtils.java | 14 -------------- .../ChooseActivityTypeDialogFragment.java | 2 +- .../opentracks/io/file/ErrorListDialog.java | 6 +++--- src/main/res/drawable/ic_button_stop.xml | 2 +- 6 files changed, 7 insertions(+), 31 deletions(-) diff --git a/src/androidTest/java/de/dennisguse/opentracks/content/data/TestDataUtil.java b/src/androidTest/java/de/dennisguse/opentracks/content/data/TestDataUtil.java index ee6344bcf..577a6c7d7 100644 --- a/src/androidTest/java/de/dennisguse/opentracks/content/data/TestDataUtil.java +++ b/src/androidTest/java/de/dennisguse/opentracks/content/data/TestDataUtil.java @@ -66,7 +66,7 @@ public class TestDataUtil { trackPoint.setAccuracy((float) i / 100.0f); trackPoint.setAltitude(i * ALTITUDE_INTERVAL); trackPoint.setTime(i + 1); - trackPoint.setSpeed(5f + (i / 10)); + trackPoint.setSpeed(5f + (i / 10f)); trackPoint.setHeartRate_bpm(100f + i); trackPoint.setCyclingCadence_rpm(300f + i); diff --git a/src/androidTest/java/de/dennisguse/opentracks/content/provider/CustomContentProviderUtilsTest.java b/src/androidTest/java/de/dennisguse/opentracks/content/provider/CustomContentProviderUtilsTest.java index 792cc47bf..47cebe70e 100644 --- a/src/androidTest/java/de/dennisguse/opentracks/content/provider/CustomContentProviderUtilsTest.java +++ b/src/androidTest/java/de/dennisguse/opentracks/content/provider/CustomContentProviderUtilsTest.java @@ -198,7 +198,7 @@ public class CustomContentProviderUtilsTest { when(cursorMock.isNull(columnIndex)).thenReturn(false); when(cursorMock.getString(columnIndex)).thenReturn(name); - Track track = contentProviderUtils.createTrack(cursorMock); + Track track = ContentProviderUtils.createTrack(cursorMock); assertEquals(trackId, track.getId()); assertEquals(name, track.getName()); } @@ -380,16 +380,6 @@ public class CustomContentProviderUtilsTest { assertEquals(trackId, allTracks.get(allTracks.size() - 1).getId()); } - /** - * Tests the method {@link ContentProviderUtils#getLastTrack()} - */ - @Test - public void testGetLastTrack() { - Track.Id trackId = new Track.Id(System.currentTimeMillis()); - contentProviderUtils.insertTrack(TestDataUtil.createTrack(trackId)); - assertEquals(trackId, contentProviderUtils.getLastTrack().getId()); - } - /** * Tests the method {@link ContentProviderUtils#getTrack(Track.Id)} */ diff --git a/src/main/java/de/dennisguse/opentracks/content/provider/ContentProviderUtils.java b/src/main/java/de/dennisguse/opentracks/content/provider/ContentProviderUtils.java index 75269c680..6cb9dcf56 100644 --- a/src/main/java/de/dennisguse/opentracks/content/provider/ContentProviderUtils.java +++ b/src/main/java/de/dennisguse/opentracks/content/provider/ContentProviderUtils.java @@ -203,7 +203,6 @@ public class ContentProviderUtils { contentResolver.delete(MarkerColumns.CONTENT_URI, MarkerColumns.TRACKID + "=?", selectionArgs); } - @VisibleForTesting public List getTracks() { ArrayList tracks = new ArrayList<>(); try (Cursor cursor = getTrackCursor(null, null, TracksColumns._ID)) { @@ -217,19 +216,6 @@ public class ContentProviderUtils { return tracks; } - @Deprecated - //TODO Do not use; rather get the proper TrackId (e.g., resume a track might give you some weird effects). - @VisibleForTesting - public Track getLastTrack() { - try (Cursor cursor = getTrackCursor(null, null, TracksColumns.STARTTIME + " DESC")) { - // Using the same order as shown in the track list - if (cursor != null && cursor.moveToNext()) { - return createTrack(cursor); - } - } - return null; - } - /** * @param trackId the track id. */ diff --git a/src/main/java/de/dennisguse/opentracks/fragments/ChooseActivityTypeDialogFragment.java b/src/main/java/de/dennisguse/opentracks/fragments/ChooseActivityTypeDialogFragment.java index b03b94f12..e9bae577d 100644 --- a/src/main/java/de/dennisguse/opentracks/fragments/ChooseActivityTypeDialogFragment.java +++ b/src/main/java/de/dennisguse/opentracks/fragments/ChooseActivityTypeDialogFragment.java @@ -58,7 +58,7 @@ public class ChooseActivityTypeDialogFragment extends DialogFragment implements } @Override - public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { + public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { viewBinding = ChooseActivityTypeBinding.inflate(inflater, container, false); List imageIds = new ArrayList<>(); diff --git a/src/main/java/de/dennisguse/opentracks/io/file/ErrorListDialog.java b/src/main/java/de/dennisguse/opentracks/io/file/ErrorListDialog.java index 9453c511f..5d000f2d9 100644 --- a/src/main/java/de/dennisguse/opentracks/io/file/ErrorListDialog.java +++ b/src/main/java/de/dennisguse/opentracks/io/file/ErrorListDialog.java @@ -54,14 +54,14 @@ public class ErrorListDialog extends DialogFragment { outState.putStringArrayList(EXTRA_ERROR_LIST, errorList); } + @NonNull @Override public Dialog onCreateDialog(Bundle savedInstanceState) { - final String[] tracks = errorList.stream().toArray(String[]::new); + final String[] tracks = errorList.toArray(new String[0]); AlertDialog.Builder alertDialogBuilder = new AlertDialog.Builder(getActivity()) .setTitle(title) .setItems(tracks, null) .setPositiveButton(R.string.generic_ok, (dialog, which) -> dismiss()); - AlertDialog dialog = alertDialogBuilder.create(); - return dialog; + return alertDialogBuilder.create(); } } diff --git a/src/main/res/drawable/ic_button_stop.xml b/src/main/res/drawable/ic_button_stop.xml index 702df6135..96349fdc6 100644 --- a/src/main/res/drawable/ic_button_stop.xml +++ b/src/main/res/drawable/ic_button_stop.xml @@ -29,5 +29,5 @@ android:name="fade_out_circle" android:fillAlpha="0.0" android:fillColor="#a31a1f" - android:pathData="M62.5,62.5m-0,-62a50,50 0,1 1,-0 123a50,50 0,1 1,-0 -123"> + android:pathData="M62.5,62.5m-0,-62a50,50 0,1 1,-0 123a50,50 0,1 1,-0 -123" />