Automated code analysis improvements.

src/androidTest/java/de/dennisguse/opentracks/content/SearchEngineTest.java

@@ -153,7 +153,7 @@ public class SearchEngineTest {
         long allMatchId = insertTrack("aa", "ba", "ca");
 
         SearchQuery query = new SearchQuery("a", null, -1, NOW);
-        ArrayList<ScoredResult> results = new ArrayList<ScoredResult>(engine.search(query));
+        ArrayList<ScoredResult> results = new ArrayList<>(engine.search(query));
 
         // Title > Description > Category.
         assertTrackResults(results, allMatchId, titleDescriptionMatchId, titleCategoryMatchId, titleMatchId, descriptionMatchId, categoryMatchId);
@@ -178,7 +178,7 @@ public class SearchEngineTest {
         long allMatchId = insertWaypoint("aa", "ba", "ca");
 
         SearchQuery query = new SearchQuery("a", null, -1, NOW);
-        ArrayList<ScoredResult> results = new ArrayList<ScoredResult>(engine.search(query));
+        ArrayList<ScoredResult> results = new ArrayList<>(engine.search(query));
 
         // Title > Description > Category.
         assertWaypointResults(results, allMatchId, titleDescriptionMatchId, titleCategoryMatchId, titleMatchId, descriptionMatchId, categoryMatchId);
@@ -199,7 +199,7 @@ public class SearchEngineTest {
         long trackId = insertTrack("aa", "bb", "cc");
 
         SearchQuery query = new SearchQuery("a", null, -1, NOW);
-        ArrayList<ScoredResult> results = new ArrayList<ScoredResult>(engine.search(query));
+        ArrayList<ScoredResult> results = new ArrayList<>(engine.search(query));
 
         // Title > Description > Category.
         Assert.assertEquals(results.toString(), 3, results.size());
@@ -216,7 +216,7 @@ public class SearchEngineTest {
         long farId = insertWaypoint("ac", 0.2);
 
         SearchQuery query = new SearchQuery("a", HERE, -1, NOW);
-        ArrayList<ScoredResult> results = new ArrayList<ScoredResult>(engine.search(query));
+        ArrayList<ScoredResult> results = new ArrayList<>(engine.search(query));
 
         // Distance order.
         assertWaypointResults(results, nearId, farId, farFarAwayId);
@@ -229,7 +229,7 @@ public class SearchEngineTest {
         long oldId = insertTrack("ac", 2);
 
         SearchQuery query = new SearchQuery("a", null, -1, NOW);
-        ArrayList<ScoredResult> results = new ArrayList<ScoredResult>(engine.search(query));
+        ArrayList<ScoredResult> results = new ArrayList<>(engine.search(query));
 
         // Reverse time order.
         assertTrackResults(results, recentId, oldId, oldestId);
@@ -243,7 +243,7 @@ public class SearchEngineTest {
         long oldId = insertWaypoint("ac", 1);
 
         SearchQuery query = new SearchQuery("a", null, -1, NOW);
-        ArrayList<ScoredResult> results = new ArrayList<ScoredResult>(engine.search(query));
+        ArrayList<ScoredResult> results = new ArrayList<>(engine.search(query));
 
         // Reverse time order.
         assertWaypointResults(results, recentId, oldId, oldestId);
@@ -256,7 +256,7 @@ public class SearchEngineTest {
         long otherId = insertTrack("aa", 1);
 
         SearchQuery query = new SearchQuery("a", null, currentId, NOW);
-        ArrayList<ScoredResult> results = new ArrayList<ScoredResult>(engine.search(query));
+        ArrayList<ScoredResult> results = new ArrayList<>(engine.search(query));
 
         // Current track should be demoted.
         assertTrackResults(results, otherId, currentId);
@@ -269,7 +269,7 @@ public class SearchEngineTest {
         long currentId = insertWaypoint("ab", 1, 123);
 
         SearchQuery query = new SearchQuery("a", null, 123, NOW);
-        ArrayList<ScoredResult> results = new ArrayList<ScoredResult>(engine.search(query));
+        ArrayList<ScoredResult> results = new ArrayList<>(engine.search(query));
 
         // Waypoint in current track should be promoted.
         assertWaypointResults(results, currentId, otherId);

src/main/java/de/dennisguse/opentracks/content/provider/ShareContentProvider.java

@@ -101,7 +101,7 @@ public class ShareContentProvider extends CustomContentProvider implements ICont
 
         long[] trackIds = new long[uriTrackIds.length];
         for (int i = 0; i < trackIds.length; i++) {
-            trackIds[i] = Long.valueOf(uriTrackIds[i]);
+            trackIds[i] = Long.parseLong(uriTrackIds[i]);
         }
         return trackIds;
     }

src/main/java/de/dennisguse/opentracks/io/file/exporter/FileTrackExporter.java

@@ -206,7 +206,7 @@ public class FileTrackExporter implements TrackExporter {
      *
      * @author Jimmy Shih
      */
-    private class TrackWriterTrackPointFactory extends TrackPointFactory {
+    private static class TrackWriterTrackPointFactory extends TrackPointFactory {
         TrackPoint currentTrackPoint;
         TrackPoint lastTrackPoint;
 

src/main/java/de/dennisguse/opentracks/io/file/importer/AbstractFileTrackImporter.java

@@ -464,7 +464,7 @@ abstract class AbstractFileTrackImporter extends DefaultHandler implements Track
      * @author Jimmy Shih
      */
     // TODO Why private inner class?
-    private class TrackData {
+    private static class TrackData {
         // The current track
         final Track track = new Track();
 

src/main/java/de/dennisguse/opentracks/io/file/importer/KmlFileTrackImporter.java

@@ -297,7 +297,7 @@ public class KmlFileTrackImporter extends AbstractFileTrackImporter {
         }
         float value;
         try {
-            value = Float.valueOf(content);
+            value = Float.parseFloat(content);
         } catch (NumberFormatException e) {
             throw new SAXException(createErrorMessage("Unable to parse gx:value:" + content), e);
         }

src/main/java/de/dennisguse/opentracks/settings/BluetoothLeAdapter.java

@@ -72,7 +72,7 @@ public class BluetoothLeAdapter extends BaseAdapter {
         return devices.get(index);
     }
 
-    public class Device {
+    public static class Device {
         private String name;
         private final String address;