From a50b1ac78ea3ee0fd32f7a7856a2abcff2a61d08 Mon Sep 17 00:00:00 2001 From: Dennis Guse Date: Tue, 28 Apr 2020 07:11:17 +0200 Subject: [PATCH] Cleanup using Android Studio code analyzer. --- .../dennisguse/opentracks/TrackStubUtils.java | 2 -- .../opentracks/content/SearchEngineTest.java | 10 ++---- .../opentracks/content/data/TestDataUtil.java | 12 +++---- .../TrackRecordingServiceTestLocation.java | 2 +- .../opentracks/fragments/StatsFragment.java | 1 - .../io/file/exporter/KmlTrackWriter.java | 2 +- .../io/file/exporter/KmzTrackExporter.java | 2 +- .../io/file/importer/KmzTrackImporter.java | 8 ++--- .../services/TrackRecordingService.java | 2 +- .../TrackRecordingServiceInterface.java | 2 -- .../tasks/AnnouncementPeriodicTask.java | 1 - .../BluetoothLeSensorPreference.java | 6 ++-- .../opentracks/util/IntentDashboardUtils.java | 4 +-- src/main/res/drawable-hdpi/tab_selected.9.png | Bin 100 -> 0 bytes .../drawable-hdpi/tab_selected_focused.9.png | Bin 105 -> 0 bytes .../drawable-hdpi/tab_selected_pressed.9.png | Bin 105 -> 0 bytes .../res/drawable-hdpi/tab_unselected.9.png | Bin 102 -> 0 bytes .../tab_unselected_focused.9.png | Bin 111 -> 0 bytes .../tab_unselected_pressed.9.png | Bin 111 -> 0 bytes src/main/res/drawable-mdpi/tab_selected.9.png | Bin 96 -> 0 bytes .../drawable-mdpi/tab_selected_focused.9.png | Bin 102 -> 0 bytes .../drawable-mdpi/tab_selected_pressed.9.png | Bin 102 -> 0 bytes .../res/drawable-mdpi/tab_unselected.9.png | Bin 103 -> 0 bytes .../tab_unselected_focused.9.png | Bin 107 -> 0 bytes .../tab_unselected_pressed.9.png | Bin 110 -> 0 bytes .../res/drawable-xhdpi/tab_selected.9.png | Bin 104 -> 0 bytes .../drawable-xhdpi/tab_selected_focused.9.png | Bin 110 -> 0 bytes .../drawable-xhdpi/tab_selected_pressed.9.png | Bin 110 -> 0 bytes .../res/drawable-xhdpi/tab_unselected.9.png | Bin 114 -> 0 bytes .../tab_unselected_focused.9.png | Bin 122 -> 0 bytes .../tab_unselected_pressed.9.png | Bin 121 -> 0 bytes src/main/res/drawable/ic_camera_24dp.xml | 6 ---- src/main/res/drawable/tab_indicator.xml | 30 ------------------ src/main/res/values/settings.xml | 8 ++--- src/main/res/values/settings_deprecated.xml | 30 ++++++++++++------ src/main/res/values/styles.xml | 29 ----------------- 36 files changed, 41 insertions(+), 116 deletions(-) delete mode 100644 src/main/res/drawable-hdpi/tab_selected.9.png delete mode 100644 src/main/res/drawable-hdpi/tab_selected_focused.9.png delete mode 100644 src/main/res/drawable-hdpi/tab_selected_pressed.9.png delete mode 100644 src/main/res/drawable-hdpi/tab_unselected.9.png delete mode 100644 src/main/res/drawable-hdpi/tab_unselected_focused.9.png delete mode 100644 src/main/res/drawable-hdpi/tab_unselected_pressed.9.png delete mode 100644 src/main/res/drawable-mdpi/tab_selected.9.png delete mode 100644 src/main/res/drawable-mdpi/tab_selected_focused.9.png delete mode 100644 src/main/res/drawable-mdpi/tab_selected_pressed.9.png delete mode 100644 src/main/res/drawable-mdpi/tab_unselected.9.png delete mode 100644 src/main/res/drawable-mdpi/tab_unselected_focused.9.png delete mode 100644 src/main/res/drawable-mdpi/tab_unselected_pressed.9.png delete mode 100644 src/main/res/drawable-xhdpi/tab_selected.9.png delete mode 100644 src/main/res/drawable-xhdpi/tab_selected_focused.9.png delete mode 100644 src/main/res/drawable-xhdpi/tab_selected_pressed.9.png delete mode 100644 src/main/res/drawable-xhdpi/tab_unselected.9.png delete mode 100644 src/main/res/drawable-xhdpi/tab_unselected_focused.9.png delete mode 100644 src/main/res/drawable-xhdpi/tab_unselected_pressed.9.png delete mode 100644 src/main/res/drawable/ic_camera_24dp.xml delete mode 100644 src/main/res/drawable/tab_indicator.xml diff --git a/src/androidTest/java/de/dennisguse/opentracks/TrackStubUtils.java b/src/androidTest/java/de/dennisguse/opentracks/TrackStubUtils.java index 2894dbcbc..27de9da79 100644 --- a/src/androidTest/java/de/dennisguse/opentracks/TrackStubUtils.java +++ b/src/androidTest/java/de/dennisguse/opentracks/TrackStubUtils.java @@ -35,8 +35,6 @@ public class TrackStubUtils { private static final float INITIAL_ACCURACY = 5; private static final float INITIAL_SPEED = 10; private static final float INITIAL_BEARING = 3.0f; - // Used to change the value of latitude, longitude, and altitude. - private static final double DIFFERENCE = 0.01; /** * Create a MyTracks location with default values. diff --git a/src/androidTest/java/de/dennisguse/opentracks/content/SearchEngineTest.java b/src/androidTest/java/de/dennisguse/opentracks/content/SearchEngineTest.java index eb5d882b9..138a52d69 100644 --- a/src/androidTest/java/de/dennisguse/opentracks/content/SearchEngineTest.java +++ b/src/androidTest/java/de/dennisguse/opentracks/content/SearchEngineTest.java @@ -70,7 +70,7 @@ public class SearchEngineTest { providerUtils.deleteAllTracks(context); } - private long insertTrack(String title, String description, String category, double distance, long hoursAgo) { + private long insertTrack(String title, String description, String category, long hoursAgo) { Track track = new Track(); track.setName(title); track.setDescription(description); @@ -88,15 +88,11 @@ public class SearchEngineTest { } private long insertTrack(String title, String description, String category) { - return insertTrack(title, description, category, 0, -1); - } - - private long insertTrack(String title, double distance) { - return insertTrack(title, "", "", distance, -1); + return insertTrack(title, description, category, -1); } private long insertTrack(String title, long hoursAgo) { - return insertTrack(title, "", "", 0.0, hoursAgo); + return insertTrack(title, "", "", hoursAgo); } private long insertWaypoint(String title, String description, String category, double distance, long hoursAgo, long trackId) { 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 f9ceac3ad..e6c9cc278 100644 --- a/src/androidTest/java/de/dennisguse/opentracks/content/data/TestDataUtil.java +++ b/src/androidTest/java/de/dennisguse/opentracks/content/data/TestDataUtil.java @@ -90,14 +90,10 @@ public class TestDataUtil { */ public static Waypoint createWaypointWithPhoto(Context context, long trackId, Location location) throws IOException { String photoUrl = ""; - try { - File dstFile = new File(FileUtils.getImageUrl(context, trackId)); - dstFile.createNewFile(); - Uri photoUri = FileUtils.getUriForFile(context, dstFile); - photoUrl = photoUri.toString(); - } catch (IOException ioe) { - throw ioe; - } + File dstFile = new File(FileUtils.getImageUrl(context, trackId)); + dstFile.createNewFile(); + Uri photoUri = FileUtils.getUriForFile(context, dstFile); + photoUrl = photoUri.toString(); return new Waypoint("Waypoint name", "Waypoint description", "Waypoint category", "", trackId, 0.0, 0, location, photoUrl); } diff --git a/src/androidTest/java/de/dennisguse/opentracks/services/TrackRecordingServiceTestLocation.java b/src/androidTest/java/de/dennisguse/opentracks/services/TrackRecordingServiceTestLocation.java index 372e493ae..3a07aab8e 100644 --- a/src/androidTest/java/de/dennisguse/opentracks/services/TrackRecordingServiceTestLocation.java +++ b/src/androidTest/java/de/dennisguse/opentracks/services/TrackRecordingServiceTestLocation.java @@ -77,7 +77,7 @@ public class TrackRecordingServiceTestLocation { } @After - public void tearDown() throws TimeoutException { + public void tearDown() { // Reset service (if some previous test failed) service.enableLocationExecutor(true); if (service.isRecording() || service.isPaused()) { diff --git a/src/main/java/de/dennisguse/opentracks/fragments/StatsFragment.java b/src/main/java/de/dennisguse/opentracks/fragments/StatsFragment.java index 4fd9d7fba..5ab72b4cd 100644 --- a/src/main/java/de/dennisguse/opentracks/fragments/StatsFragment.java +++ b/src/main/java/de/dennisguse/opentracks/fragments/StatsFragment.java @@ -603,7 +603,6 @@ public class StatsFragment extends Fragment implements TrackDataListener { private void setLocationValues() { boolean metricUnits = PreferencesUtils.isMetricUnits(getContext()); - boolean reportSpeed = PreferencesUtils.isReportSpeed(getContext(), category); boolean isRecording = isSelectedTrackRecording(); // Set speed/pace diff --git a/src/main/java/de/dennisguse/opentracks/io/file/exporter/KmlTrackWriter.java b/src/main/java/de/dennisguse/opentracks/io/file/exporter/KmlTrackWriter.java index 87d06c295..03704f62b 100644 --- a/src/main/java/de/dennisguse/opentracks/io/file/exporter/KmlTrackWriter.java +++ b/src/main/java/de/dennisguse/opentracks/io/file/exporter/KmlTrackWriter.java @@ -74,7 +74,7 @@ public class KmlTrackWriter implements TrackWriter { * @param context the context * @param hasMultipleTracks should encode multiple tracks into one file? * @param exportTrackDetail should detailed information about the track be exported (e.g., title, description, waypoints, timing)? - * @param exportSensorData should {@link TrackPointSensorDataSet} be exported? + * @param exportSensorData should {@link TrackPoint}'s sensor data be exported? * @param exportPhotos should pictures be exported (if true: exports to KMZ)? */ public KmlTrackWriter(Context context, boolean hasMultipleTracks, boolean exportTrackDetail, boolean exportSensorData, boolean exportPhotos) { diff --git a/src/main/java/de/dennisguse/opentracks/io/file/exporter/KmzTrackExporter.java b/src/main/java/de/dennisguse/opentracks/io/file/exporter/KmzTrackExporter.java index ca4fc59a2..26f92b77c 100644 --- a/src/main/java/de/dennisguse/opentracks/io/file/exporter/KmzTrackExporter.java +++ b/src/main/java/de/dennisguse/opentracks/io/file/exporter/KmzTrackExporter.java @@ -42,7 +42,7 @@ import de.dennisguse.opentracks.util.FileUtils; * @author Jimmy Shih */ public class KmzTrackExporter implements TrackExporter { - public static final String KMZ_IMAGES_DIR = "images"; + private static final String KMZ_IMAGES_DIR = "images"; public static final String KMZ_KML_FILE = "doc.kml"; private static final String TAG = KmzTrackExporter.class.getSimpleName(); diff --git a/src/main/java/de/dennisguse/opentracks/io/file/importer/KmzTrackImporter.java b/src/main/java/de/dennisguse/opentracks/io/file/importer/KmzTrackImporter.java index b604c25c1..ac166dd49 100644 --- a/src/main/java/de/dennisguse/opentracks/io/file/importer/KmzTrackImporter.java +++ b/src/main/java/de/dennisguse/opentracks/io/file/importer/KmzTrackImporter.java @@ -47,7 +47,7 @@ public class KmzTrackImporter implements TrackImporter { private static final String TAG = KmzTrackImporter.class.getSimpleName(); - public static final List KMZ_IMAGES_EXT = Arrays.asList("jpeg", "jpg", "png"); + private static final List KMZ_IMAGES_EXT = Arrays.asList("jpeg", "jpg", "png"); private static final int BUFFER_SIZE = 4096; @@ -154,11 +154,7 @@ public class KmzTrackImporter implements TrackImporter { return false; } - if (KMZ_IMAGES_EXT.contains(fileExt)) { - return true; - } - - return false; + return KMZ_IMAGES_EXT.contains(fileExt); } /** diff --git a/src/main/java/de/dennisguse/opentracks/services/TrackRecordingService.java b/src/main/java/de/dennisguse/opentracks/services/TrackRecordingService.java index 82b5265b6..39c53c891 100644 --- a/src/main/java/de/dennisguse/opentracks/services/TrackRecordingService.java +++ b/src/main/java/de/dennisguse/opentracks/services/TrackRecordingService.java @@ -717,7 +717,7 @@ public class TrackRecordingService extends Service { return remoteSensorManager.getSensorData(); } - void fillWithSensorDataSet(TrackPoint trackPoint) { + private void fillWithSensorDataSet(TrackPoint trackPoint) { SensorDataSet sensorData = getSensorDataSet(); if (sensorData != null) { sensorData.fillTrackPoint(trackPoint); diff --git a/src/main/java/de/dennisguse/opentracks/services/TrackRecordingServiceInterface.java b/src/main/java/de/dennisguse/opentracks/services/TrackRecordingServiceInterface.java index 951288a29..08edfc89c 100644 --- a/src/main/java/de/dennisguse/opentracks/services/TrackRecordingServiceInterface.java +++ b/src/main/java/de/dennisguse/opentracks/services/TrackRecordingServiceInterface.java @@ -47,8 +47,6 @@ public interface TrackRecordingServiceInterface { /** * Resumes the track identified by trackId. - * - * @param trackId */ void resumeTrack(long trackId); diff --git a/src/main/java/de/dennisguse/opentracks/services/tasks/AnnouncementPeriodicTask.java b/src/main/java/de/dennisguse/opentracks/services/tasks/AnnouncementPeriodicTask.java index 21b8476e5..695948c98 100644 --- a/src/main/java/de/dennisguse/opentracks/services/tasks/AnnouncementPeriodicTask.java +++ b/src/main/java/de/dennisguse/opentracks/services/tasks/AnnouncementPeriodicTask.java @@ -25,7 +25,6 @@ import android.util.Log; import java.util.Locale; -import de.dennisguse.opentracks.R; import de.dennisguse.opentracks.content.data.Track; import de.dennisguse.opentracks.content.provider.ContentProviderUtils; import de.dennisguse.opentracks.services.TrackRecordingService; diff --git a/src/main/java/de/dennisguse/opentracks/settings/bluetooth/BluetoothLeSensorPreference.java b/src/main/java/de/dennisguse/opentracks/settings/bluetooth/BluetoothLeSensorPreference.java index 275faf4c5..99a5eeed8 100644 --- a/src/main/java/de/dennisguse/opentracks/settings/bluetooth/BluetoothLeSensorPreference.java +++ b/src/main/java/de/dennisguse/opentracks/settings/bluetooth/BluetoothLeSensorPreference.java @@ -94,8 +94,6 @@ public abstract class BluetoothLeSensorPreference extends DialogPreference { private int selectedEntryIndex; private final BluetoothLeAdapter listAdapter = new BluetoothLeAdapter(); - private UUID sensorUUID; - private BluetoothLeScanner scanner = null; private final ScanCallback scanCallback = new ScanCallback() { @Override @@ -135,7 +133,7 @@ public abstract class BluetoothLeSensorPreference extends DialogPreference { public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - sensorUUID = (UUID) getArguments().getSerializable(ARG_BLUETOOTH_UUID); + UUID sensorUUID = (UUID) getArguments().getSerializable(ARG_BLUETOOTH_UUID); Log.i(TAG, "UUID: " + sensorUUID); BluetoothAdapter bluetoothAdapter = BluetoothUtils.getDefaultBluetoothAdapter(TAG); @@ -147,7 +145,7 @@ public abstract class BluetoothLeSensorPreference extends DialogPreference { } if (bluetoothAdapter.isDiscovering()) { - Log.i(TAG, "Cancelling ongoing bluetooth discovery."); + Log.i(TAG, "Cancelling ongoing B+ z|F#>?IKU#QEqQK&+6jg$c|GgqKCEXyq;!mHfp5a+ z|F#>O9Ac5wmVD(YoWhWm?{NLxhyBcng2}8G)HYnb!E$jf3xnuGac0T;%{f357(8A5 KT-G@yGywp?1Rsb1 diff --git a/src/main/res/drawable-mdpi/tab_selected.9.png b/src/main/res/drawable-mdpi/tab_selected.9.png deleted file mode 100644 index dd41ee448059abd155e17512d13778717dcf7ede..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 96 zcmeAS@N?(olHy`uVBq!ia0vp^EI`b~!3HEJ|NhShq|`lK978ywlT#WR{s+vOD0qtT uVglzHCZ7M+3Q-c;4H9em#F$R-F*D2$lVE;!#w-`8g~8L+&t;ucLK6ThHyL99 diff --git a/src/main/res/drawable-mdpi/tab_selected_focused.9.png b/src/main/res/drawable-mdpi/tab_selected_focused.9.png deleted file mode 100644 index c11de4d66438f6d92b2314f7daebfab934c17361..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 102 zcmeAS@N?(olHy`uVBq!ia0vp^EI`b~!3HEJ|NhShq;x%9978ywlT#WR{s+vOD0t-O z{c{OSLJ4b9ESf_b9@ewFa3`}0H1jTKW!Q9>;W^V~)E*8w#$c)I$ztaD0e0suc$ B9(Mo$ diff --git a/src/main/res/drawable-mdpi/tab_selected_pressed.9.png b/src/main/res/drawable-mdpi/tab_selected_pressed.9.png deleted file mode 100644 index c1bd354b96c98584302aee766cdd4bd8afacffeb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 102 zcmeAS@N?(olHy`uVBq!ia0vp^EI`b~!3HEJ|NhShq;x%9978ywlT#WR{s+vOD0t-O z{c{&Mgc8=ItT?W9;KP3AMXei|Iu5d3aALTb$Z-0K40Br5a~GgS22WQ%mvv4FO#rkR BA(#LF diff --git a/src/main/res/drawable-mdpi/tab_unselected.9.png b/src/main/res/drawable-mdpi/tab_unselected.9.png deleted file mode 100644 index 4cfb70c49fe34be89b248a019c8fb80dc5c8ccda..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 103 zcmeAS@N?(olHy`uVBq!ia0vp^EI`c0!3HFsSlX8YDLqdY#}JO_=g0$fGkCiCxvX*4==9g;nw4n27q46#81%#U)~jDZF)c)I$z JtaD0e0svQlA!Psn diff --git a/src/main/res/drawable-xhdpi/tab_selected.9.png b/src/main/res/drawable-xhdpi/tab_selected.9.png deleted file mode 100644 index 496537d28e6f00e558f41460caa12d4bbac8865a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 104 zcmeAS@N?(olHy`uVBq!ia0vp^Y(Ol;0U|59*B=E^`kpS1Arj%qDGd$(1Ekyxjht8= zO^kl{r*gLamt8TVAHUjk}n@O1TaS?83{1OVjX B8}a}E diff --git a/src/main/res/drawable-xhdpi/tab_selected_focused.9.png b/src/main/res/drawable-xhdpi/tab_selected_focused.9.png deleted file mode 100644 index 786bc6df6d7053446c4fbf150c2d74275211080f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 110 zcmeAS@N?(olHy`uVBq!ia0vp^Y(Ol;0U|59*B=E^rk*a2Arj%qDGd$(1Ekyxjha~g zZ#SNy;B63QG-u%^mc#$~LQYF+OGr4B^>`g{mXlMtp~S^dJ==`=9IKNl&;SNcS3j3^ HP6Wf~*XEx6PO}e;t|$G=Ra=)z4*} HQ$iB}vNIkY diff --git a/src/main/res/drawable-xhdpi/tab_unselected.9.png b/src/main/res/drawable-xhdpi/tab_unselected.9.png deleted file mode 100644 index fd847c5ce241e8b6b3f223a1bf38162844fde4e2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 114 zcmeAS@N?(olHy`uVBq!ia0vp^Y(UJ#0V1dK=^FznOHUWa5RT~Nl!k`?0a9*;Moz4b zCPqK}Q#nl@EA}x)|Jpx!pjqQ)n4I2&yr4SM3L;jb2fQB%5 My85}Sb4q9e0PuPrw*UYD diff --git a/src/main/res/drawable-xhdpi/tab_unselected_focused.9.png b/src/main/res/drawable-xhdpi/tab_unselected_focused.9.png deleted file mode 100644 index eed4aaa1c56c0fcd913677941b54c006deaedb46..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 122 zcmeAS@N?(olHy`uVBq!ia0vp^Y(UJ#0V1dK=^FznM^6{W5RT~Nl!k`?0a9*;MoldL zw;Rt;@HPlDnzL{d3-blOmdKI;Vst09EfKjQ{`u diff --git a/src/main/res/drawable-xhdpi/tab_unselected_pressed.9.png b/src/main/res/drawable-xhdpi/tab_unselected_pressed.9.png deleted file mode 100644 index 3540a88ecf842c22772075de92a4195004345b1c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 121 zcmeAS@N?(olHy`uVBq!ia0vp^Y(UJ#0V1dK=^Fzn2TvEr5RT~Nl!k`?0a9*;MoldL zw;P)%c^iZoT?vkCV$5)7HnW!aS8njeed3CQ0)|MwNe+d2$*j!Gb(}eJEDXo% - - - diff --git a/src/main/res/drawable/tab_indicator.xml b/src/main/res/drawable/tab_indicator.xml deleted file mode 100644 index 60a71714c..000000000 --- a/src/main/res/drawable/tab_indicator.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/main/res/values/settings.xml b/src/main/res/values/settings.xml index 7393aeec5..c0aa73951 100644 --- a/src/main/res/values/settings.xml +++ b/src/main/res/values/settings.xml @@ -29,10 +29,10 @@ 2150 - 20-622 - 23-622 - 25-622 - 28-622 + 20–622 + 23–622 + 25–622 + 28–622 defaultActivity diff --git a/src/main/res/values/settings_deprecated.xml b/src/main/res/values/settings_deprecated.xml index f2ae29e34..edc949ab8 100644 --- a/src/main/res/values/settings_deprecated.xml +++ b/src/main/res/values/settings_deprecated.xml @@ -38,20 +38,30 @@ -100 - chartShowCadence - true + chartShowCadence + + true + - chartShowElevation - true + chartShowElevation + + true + - chartShowHeartRate - true + chartShowHeartRate + + true + - chartShowPower - true + chartShowPower + + true + - chartShowSpeed - true + chartShowSpeed + + true + diff --git a/src/main/res/values/styles.xml b/src/main/res/values/styles.xml index 407450c25..326cbb156 100644 --- a/src/main/res/values/styles.xml +++ b/src/main/res/values/styles.xml @@ -62,9 +62,6 @@ limitations under the License. match_parent - - - - - - -