From 2ef74eb908bb2b4c50feb4b0b6c091fb6bc48c2e Mon Sep 17 00:00:00 2001 From: Dennis Guse Date: Thu, 2 Apr 2020 08:21:04 +0200 Subject: [PATCH] Automated code cleanup using AndroidStudio. --- .../content/DescriptionGeneratorTest.java | 2 +- .../opentracks/content/SearchEngineTest.java | 4 +-- .../provider/CustomContentProviderTest.java | 2 +- .../CustomContentProviderUtilsTest.java | 5 ++-- .../provider/CustomSQLiteOpenHelperTest.java | 2 +- .../io/file/importer/ExportImportTest.java | 6 ++--- .../importer/GpxFileTrackImporterTest.java | 4 +-- ...cordingServiceNotificationManagerTest.java | 2 +- .../services/TrackRecordingServiceTest.java | 2 +- .../TrackRecordingServiceTestLooper.java | 2 +- .../AnnouncementPeriodicTaskFactoryTest.java | 2 +- .../util/AnnouncementUtilsTest.java | 2 +- .../opentracks/util/FileUtilsTest.java | 5 ++-- .../opentracks/util/StringUtilsTest.java | 2 +- .../opentracks/MarkerEditActivity.java | 6 ++--- .../opentracks/SearchListActivity.java | 2 +- .../opentracks/TrackDetailActivity.java | 2 +- .../opentracks/TrackEditActivity.java | 2 +- .../opentracks/TrackListActivity.java | 2 +- .../opentracks/content/TrackDataHub.java | 27 +++++++------------ .../opentracks/content/data/TrackPoint.java | 2 +- .../opentracks/fragments/StatsFragment.java | 4 +-- .../TrackRecordingServiceConnection.java | 3 +-- .../opentracks/util/AnnouncementUtils.java | 2 +- .../dennisguse/opentracks/util/FileUtils.java | 6 ++--- 25 files changed, 43 insertions(+), 57 deletions(-) diff --git a/src/androidTest/java/de/dennisguse/opentracks/content/DescriptionGeneratorTest.java b/src/androidTest/java/de/dennisguse/opentracks/content/DescriptionGeneratorTest.java index 0ef47e658..2daf4007d 100644 --- a/src/androidTest/java/de/dennisguse/opentracks/content/DescriptionGeneratorTest.java +++ b/src/androidTest/java/de/dennisguse/opentracks/content/DescriptionGeneratorTest.java @@ -42,7 +42,7 @@ public class DescriptionGeneratorTest { private static final long START_TIME = 1288721514000L; private DescriptionGenerator descriptionGenerator; - private Context context = ApplicationProvider.getApplicationContext(); + private final Context context = ApplicationProvider.getApplicationContext(); @Before public void setUp() { diff --git a/src/androidTest/java/de/dennisguse/opentracks/content/SearchEngineTest.java b/src/androidTest/java/de/dennisguse/opentracks/content/SearchEngineTest.java index 569feabe7..eb5d882b9 100644 --- a/src/androidTest/java/de/dennisguse/opentracks/content/SearchEngineTest.java +++ b/src/androidTest/java/de/dennisguse/opentracks/content/SearchEngineTest.java @@ -56,7 +56,7 @@ public class SearchEngineTest { private ContentProviderUtils providerUtils; private SearchEngine engine; - private Context context = ApplicationProvider.getApplicationContext(); + private final Context context = ApplicationProvider.getApplicationContext(); @Before @@ -66,7 +66,7 @@ public class SearchEngineTest { } @After - public void tearDown() throws Exception { + public void tearDown() { providerUtils.deleteAllTracks(context); } diff --git a/src/androidTest/java/de/dennisguse/opentracks/content/provider/CustomContentProviderTest.java b/src/androidTest/java/de/dennisguse/opentracks/content/provider/CustomContentProviderTest.java index ef417471f..2e1484073 100644 --- a/src/androidTest/java/de/dennisguse/opentracks/content/provider/CustomContentProviderTest.java +++ b/src/androidTest/java/de/dennisguse/opentracks/content/provider/CustomContentProviderTest.java @@ -38,7 +38,7 @@ import de.dennisguse.opentracks.content.data.WaypointsColumns; public class CustomContentProviderTest { private CustomContentProvider customContentProvider; - private Context context = ApplicationProvider.getApplicationContext(); + private final Context context = ApplicationProvider.getApplicationContext(); @Before public void setUp() { 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 748cae0a3..dcb7c4628 100644 --- a/src/androidTest/java/de/dennisguse/opentracks/content/provider/CustomContentProviderUtilsTest.java +++ b/src/androidTest/java/de/dennisguse/opentracks/content/provider/CustomContentProviderUtilsTest.java @@ -58,7 +58,7 @@ public class CustomContentProviderUtilsTest { private static final String TEST_DESC = "Test Desc!"; private static final String TEST_DESC_NEW = "Test Desc new!"; - private Context context = ApplicationProvider.getApplicationContext(); + private final Context context = ApplicationProvider.getApplicationContext(); private ContentProviderUtils contentProviderUtils; @Mock @@ -107,7 +107,7 @@ public class CustomContentProviderUtilsTest { testIterator(1, 20000, 2000, false); } - private List testIterator(long trackId, int numPoints, int batchSize, boolean descending) { + private void testIterator(long trackId, int numPoints, int batchSize, boolean descending) { long lastPointId = initializeTrack(trackId, numPoints); contentProviderUtils.setDefaultCursorBatchSize(batchSize); List locations = new ArrayList<>(numPoints); @@ -122,7 +122,6 @@ public class CustomContentProviderUtilsTest { } Assert.assertEquals(numPoints, locations.size()); } - return locations; } private long initializeTrack(long id, int numPoints) { diff --git a/src/androidTest/java/de/dennisguse/opentracks/content/provider/CustomSQLiteOpenHelperTest.java b/src/androidTest/java/de/dennisguse/opentracks/content/provider/CustomSQLiteOpenHelperTest.java index 1296c1496..15eaa1f07 100644 --- a/src/androidTest/java/de/dennisguse/opentracks/content/provider/CustomSQLiteOpenHelperTest.java +++ b/src/androidTest/java/de/dennisguse/opentracks/content/provider/CustomSQLiteOpenHelperTest.java @@ -29,7 +29,7 @@ public class CustomSQLiteOpenHelperTest { private static final String DATABASE_NAME = "test.db"; - private Context context = ApplicationProvider.getApplicationContext(); + private final Context context = ApplicationProvider.getApplicationContext(); /** * Get the SQL create statements for all tables (ordered by name). diff --git a/src/androidTest/java/de/dennisguse/opentracks/io/file/importer/ExportImportTest.java b/src/androidTest/java/de/dennisguse/opentracks/io/file/importer/ExportImportTest.java index 617505b8f..08828ad14 100644 --- a/src/androidTest/java/de/dennisguse/opentracks/io/file/importer/ExportImportTest.java +++ b/src/androidTest/java/de/dennisguse/opentracks/io/file/importer/ExportImportTest.java @@ -40,16 +40,16 @@ public class ExportImportTest { private static final String TAG = ExportImportTest.class.getSimpleName(); - private Context context = ApplicationProvider.getApplicationContext(); + private final Context context = ApplicationProvider.getApplicationContext(); - private ContentProviderUtils contentProviderUtils = new ContentProviderUtils(context); + private final ContentProviderUtils contentProviderUtils = new ContentProviderUtils(context); private static final String TRACK_ICON = "the track icon"; private static final String TRACK_CATEGORY = "the category"; private static final String TRACK_DESCRIPTION = "the description"; private final List waypoints = new ArrayList<>(); private long importTrackId; - private long trackId = System.currentTimeMillis(); + private final long trackId = System.currentTimeMillis(); @Before public void setUp() { diff --git a/src/androidTest/java/de/dennisguse/opentracks/io/file/importer/GpxFileTrackImporterTest.java b/src/androidTest/java/de/dennisguse/opentracks/io/file/importer/GpxFileTrackImporterTest.java index e40c1665a..da1c20750 100644 --- a/src/androidTest/java/de/dennisguse/opentracks/io/file/importer/GpxFileTrackImporterTest.java +++ b/src/androidTest/java/de/dennisguse/opentracks/io/file/importer/GpxFileTrackImporterTest.java @@ -73,9 +73,9 @@ public class GpxFileTrackImporterTest extends AbstractTestFileTrackImporter { String longitude = Double.toString(TRACK_LONGITUDE + index); String elevation = Double.toString(TRACK_ELEVATION + index); StringBuilder buffer = new StringBuilder(); - buffer.append("" + elevation + ""); + buffer.append("").append(elevation).append(""); if (time != null) { - buffer.append(""); + buffer.append(""); } buffer.append(""); return buffer.toString(); diff --git a/src/androidTest/java/de/dennisguse/opentracks/services/TrackRecordingServiceNotificationManagerTest.java b/src/androidTest/java/de/dennisguse/opentracks/services/TrackRecordingServiceNotificationManagerTest.java index 6c5351501..27359fbe7 100644 --- a/src/androidTest/java/de/dennisguse/opentracks/services/TrackRecordingServiceNotificationManagerTest.java +++ b/src/androidTest/java/de/dennisguse/opentracks/services/TrackRecordingServiceNotificationManagerTest.java @@ -22,7 +22,7 @@ import static org.mockito.Mockito.when; @RunWith(MockitoJUnitRunner.class) public class TrackRecordingServiceNotificationManagerTest { - private Context context = ApplicationProvider.getApplicationContext(); + private final Context context = ApplicationProvider.getApplicationContext(); @Mock private TrackPoint locationMock; diff --git a/src/androidTest/java/de/dennisguse/opentracks/services/TrackRecordingServiceTest.java b/src/androidTest/java/de/dennisguse/opentracks/services/TrackRecordingServiceTest.java index 0986b4322..fafb8abbd 100644 --- a/src/androidTest/java/de/dennisguse/opentracks/services/TrackRecordingServiceTest.java +++ b/src/androidTest/java/de/dennisguse/opentracks/services/TrackRecordingServiceTest.java @@ -66,7 +66,7 @@ public class TrackRecordingServiceTest { @Rule public GrantPermissionRule mRuntimePermissionRule = GrantPermissionRule.grant(android.Manifest.permission.ACCESS_FINE_LOCATION); - private Context context = ApplicationProvider.getApplicationContext(); + private final Context context = ApplicationProvider.getApplicationContext(); private ContentProviderUtils contentProviderUtils; private final long trackId = Math.abs(new Random().nextLong()); diff --git a/src/androidTest/java/de/dennisguse/opentracks/services/TrackRecordingServiceTestLooper.java b/src/androidTest/java/de/dennisguse/opentracks/services/TrackRecordingServiceTestLooper.java index cf92b3a60..872988780 100644 --- a/src/androidTest/java/de/dennisguse/opentracks/services/TrackRecordingServiceTestLooper.java +++ b/src/androidTest/java/de/dennisguse/opentracks/services/TrackRecordingServiceTestLooper.java @@ -45,7 +45,7 @@ public class TrackRecordingServiceTestLooper { @Rule public final ServiceTestRule mServiceRule = ServiceTestRule.withTimeout(5, TimeUnit.SECONDS); - private Context context = ApplicationProvider.getApplicationContext(); + private final Context context = ApplicationProvider.getApplicationContext(); private ContentProviderUtils contentProviderUtils; diff --git a/src/androidTest/java/de/dennisguse/opentracks/services/tasks/AnnouncementPeriodicTaskFactoryTest.java b/src/androidTest/java/de/dennisguse/opentracks/services/tasks/AnnouncementPeriodicTaskFactoryTest.java index a58c52dce..b46670ef6 100644 --- a/src/androidTest/java/de/dennisguse/opentracks/services/tasks/AnnouncementPeriodicTaskFactoryTest.java +++ b/src/androidTest/java/de/dennisguse/opentracks/services/tasks/AnnouncementPeriodicTaskFactoryTest.java @@ -36,7 +36,7 @@ import org.junit.runner.RunWith; @RunWith(AndroidJUnit4.class) public class AnnouncementPeriodicTaskFactoryTest { - private Context context = ApplicationProvider.getApplicationContext(); + private final Context context = ApplicationProvider.getApplicationContext(); @BeforeClass public static void preSetUp() { diff --git a/src/androidTest/java/de/dennisguse/opentracks/util/AnnouncementUtilsTest.java b/src/androidTest/java/de/dennisguse/opentracks/util/AnnouncementUtilsTest.java index 0ce8fc671..50920da0d 100644 --- a/src/androidTest/java/de/dennisguse/opentracks/util/AnnouncementUtilsTest.java +++ b/src/androidTest/java/de/dennisguse/opentracks/util/AnnouncementUtilsTest.java @@ -14,7 +14,7 @@ import de.dennisguse.opentracks.stats.TrackStatistics; @RunWith(AndroidJUnit4.class) public class AnnouncementUtilsTest { - private Context context = ApplicationProvider.getApplicationContext(); + private final Context context = ApplicationProvider.getApplicationContext(); @Test public void getAnnouncement() { diff --git a/src/androidTest/java/de/dennisguse/opentracks/util/FileUtilsTest.java b/src/androidTest/java/de/dennisguse/opentracks/util/FileUtilsTest.java index d058e8e9e..956d9c7d5 100644 --- a/src/androidTest/java/de/dennisguse/opentracks/util/FileUtilsTest.java +++ b/src/androidTest/java/de/dennisguse/opentracks/util/FileUtilsTest.java @@ -21,6 +21,7 @@ import org.junit.runner.RunWith; import org.junit.runners.JUnit4; import java.io.File; +import java.util.Arrays; /** * Tests for {@link FileUtils}. @@ -108,9 +109,7 @@ public class FileUtilsTest { File directory = new File("/dir1/dir2/"); String suffix = ".gpx"; char[] name = new char[FileUtils.MAX_FAT32_PATH_LENGTH]; - for (int i = 0; i < name.length; i++) { - name[i] = 'a'; - } + Arrays.fill(name, 'a'); String nameString = new String(name); String truncated = FileUtils.truncateFileName(directory, nameString, suffix); diff --git a/src/androidTest/java/de/dennisguse/opentracks/util/StringUtilsTest.java b/src/androidTest/java/de/dennisguse/opentracks/util/StringUtilsTest.java index e4c66ffce..b900c06d4 100644 --- a/src/androidTest/java/de/dennisguse/opentracks/util/StringUtilsTest.java +++ b/src/androidTest/java/de/dennisguse/opentracks/util/StringUtilsTest.java @@ -36,7 +36,7 @@ import java.util.TimeZone; @RunWith(AndroidJUnit4.class) public class StringUtilsTest { - private Context context = ApplicationProvider.getApplicationContext(); + private final Context context = ApplicationProvider.getApplicationContext(); /** diff --git a/src/main/java/de/dennisguse/opentracks/MarkerEditActivity.java b/src/main/java/de/dennisguse/opentracks/MarkerEditActivity.java index 08fb32b18..82c7fafe7 100644 --- a/src/main/java/de/dennisguse/opentracks/MarkerEditActivity.java +++ b/src/main/java/de/dennisguse/opentracks/MarkerEditActivity.java @@ -88,7 +88,7 @@ public class MarkerEditActivity extends AbstractActivity { trackId = getIntent().getLongExtra(EXTRA_TRACK_ID, -1L); markerId = getIntent().getLongExtra(EXTRA_MARKER_ID, -1L); - trackRecordingServiceConnection = new TrackRecordingServiceConnection(this, null); + trackRecordingServiceConnection = new TrackRecordingServiceConnection(null); hasCamera = getPackageManager().hasSystemFeature(PackageManager.FEATURE_CAMERA_ANY); @@ -254,8 +254,8 @@ public class MarkerEditActivity extends AbstractActivity { private void hideAndShowOptions() { boolean isPhotoSet = (waypoint != null && waypoint.hasPhoto()) || photoUri != null; if (insertPhotoMenuItem != null && insertGalleryImgMenuItem != null) { - insertPhotoMenuItem.setVisible(isPhotoSet ? false : true); - insertGalleryImgMenuItem.setVisible(isPhotoSet ? false : true); + insertPhotoMenuItem.setVisible(!isPhotoSet); + insertGalleryImgMenuItem.setVisible(!isPhotoSet); } waypointDeletePhotoBtn.setVisibility(isPhotoSet ? View.VISIBLE : View.GONE); } diff --git a/src/main/java/de/dennisguse/opentracks/SearchListActivity.java b/src/main/java/de/dennisguse/opentracks/SearchListActivity.java index 52dff3cdf..6dc35c35c 100644 --- a/src/main/java/de/dennisguse/opentracks/SearchListActivity.java +++ b/src/main/java/de/dennisguse/opentracks/SearchListActivity.java @@ -172,7 +172,7 @@ public class SearchListActivity extends AbstractListActivity implements DeleteMa contentProviderUtils = new ContentProviderUtils(this); sharedPreferences = PreferencesUtils.getSharedPreferences(this); - trackRecordingServiceConnection = new TrackRecordingServiceConnection(this, null); + trackRecordingServiceConnection = new TrackRecordingServiceConnection(null); searchEngine = new SearchEngine(contentProviderUtils); arrayAdapter = new ArrayAdapter>(this, R.layout.list_item, R.id.list_item_name) { diff --git a/src/main/java/de/dennisguse/opentracks/TrackDetailActivity.java b/src/main/java/de/dennisguse/opentracks/TrackDetailActivity.java index 50ffbc9fa..fe8dd2529 100644 --- a/src/main/java/de/dennisguse/opentracks/TrackDetailActivity.java +++ b/src/main/java/de/dennisguse/opentracks/TrackDetailActivity.java @@ -199,7 +199,7 @@ public class TrackDetailActivity extends AbstractListActivity implements ChooseA sharedPreferences = PreferencesUtils.getSharedPreferences(this); - trackRecordingServiceConnection = new TrackRecordingServiceConnection(this, bindChangedCallback); + trackRecordingServiceConnection = new TrackRecordingServiceConnection(bindChangedCallback); trackDataHub = new TrackDataHub(this); FragmentPagerAdapter adapter = new FragmentPagerAdapter(getSupportFragmentManager(), 1) { diff --git a/src/main/java/de/dennisguse/opentracks/TrackEditActivity.java b/src/main/java/de/dennisguse/opentracks/TrackEditActivity.java index 99d0064a1..4b49a086f 100644 --- a/src/main/java/de/dennisguse/opentracks/TrackEditActivity.java +++ b/src/main/java/de/dennisguse/opentracks/TrackEditActivity.java @@ -65,7 +65,7 @@ public class TrackEditActivity extends AbstractActivity implements ChooseActivit protected void onCreate(Bundle bundle) { super.onCreate(bundle); - trackRecordingServiceConnection = new TrackRecordingServiceConnection(this, null); + trackRecordingServiceConnection = new TrackRecordingServiceConnection(null); long trackId = getIntent().getLongExtra(EXTRA_TRACK_ID, -1L); if (trackId == -1L) { Log.e(TAG, "invalid trackId"); diff --git a/src/main/java/de/dennisguse/opentracks/TrackListActivity.java b/src/main/java/de/dennisguse/opentracks/TrackListActivity.java index 85dedbd29..2000ec8ec 100644 --- a/src/main/java/de/dennisguse/opentracks/TrackListActivity.java +++ b/src/main/java/de/dennisguse/opentracks/TrackListActivity.java @@ -231,7 +231,7 @@ public class TrackListActivity extends AbstractListActivity implements ConfirmDe contentProviderUtils = new ContentProviderUtils(this); sharedPreferences = PreferencesUtils.getSharedPreferences(this); - trackRecordingServiceConnection = new TrackRecordingServiceConnection(this, bindChangedCallback); + trackRecordingServiceConnection = new TrackRecordingServiceConnection(bindChangedCallback); trackController = new TrackController(this, trackRecordingServiceConnection, true, recordListener, stopListener); setDefaultKeyMode(DEFAULT_KEYS_SEARCH_LOCAL); diff --git a/src/main/java/de/dennisguse/opentracks/content/TrackDataHub.java b/src/main/java/de/dennisguse/opentracks/content/TrackDataHub.java index 7ef1e4525..e103d2db8 100644 --- a/src/main/java/de/dennisguse/opentracks/content/TrackDataHub.java +++ b/src/main/java/de/dennisguse/opentracks/content/TrackDataHub.java @@ -78,8 +78,8 @@ public class TrackDataHub implements DataSourceManager.DataSourceListener, Share // Track points sampling state private int numLoadedPoints; - private long firstSeenLocationId; - private long lastSeenLocationId; + private long firstSeenTrackPointId; + private long lastSeenTrackPointId; public TrackDataHub(Context context) { this(context, new TrackDataManager(), new ContentProviderUtils(context), TARGET_DISPLAYED_TRACK_POINTS); @@ -380,9 +380,9 @@ public class TrackDataHub implements DataSourceManager.DataSourceListener, Share } int localNumLoadedPoints = updateSamplingState ? numLoadedPoints : 0; - long localFirstSeenLocationId = updateSamplingState ? firstSeenLocationId : -1L; - long localLastSeenLocationId = updateSamplingState ? lastSeenLocationId : -1L; - long maxPointId = updateSamplingState ? -1L : lastSeenLocationId; + long localFirstSeenLocationId = updateSamplingState ? firstSeenTrackPointId : -1L; + long localLastSeenLocationId = updateSamplingState ? lastSeenTrackPointId : -1L; + long maxPointId = updateSamplingState ? -1L : lastSeenTrackPointId; long lastTrackPointId = contentProviderUtils.getLastTrackPointId(selectedTrackId); int samplingFrequency = -1; @@ -431,8 +431,8 @@ public class TrackDataHub implements DataSourceManager.DataSourceListener, Share if (updateSamplingState) { numLoadedPoints = localNumLoadedPoints; - firstSeenLocationId = localFirstSeenLocationId; - lastSeenLocationId = localLastSeenLocationId; + firstSeenTrackPointId = localFirstSeenLocationId; + lastSeenTrackPointId = localLastSeenLocationId; } for (TrackDataListener listener : sampledInListeners) { @@ -445,8 +445,8 @@ public class TrackDataHub implements DataSourceManager.DataSourceListener, Share */ private void resetSamplingState() { numLoadedPoints = 0; - firstSeenLocationId = -1L; - lastSeenLocationId = -1L; + firstSeenTrackPointId = -1L; + lastSeenTrackPointId = -1L; } /** @@ -463,13 +463,4 @@ public class TrackDataHub implements DataSourceManager.DataSourceListener, Share } handler.post(runnable); } - - /** - * Gets the value selectedTrackId. - * - * @return the selectedTrackId - */ - public long getSelectedTrackId() { - return selectedTrackId; - } } \ No newline at end of file diff --git a/src/main/java/de/dennisguse/opentracks/content/data/TrackPoint.java b/src/main/java/de/dennisguse/opentracks/content/data/TrackPoint.java index 9e5149f82..9569bffca 100644 --- a/src/main/java/de/dennisguse/opentracks/content/data/TrackPoint.java +++ b/src/main/java/de/dennisguse/opentracks/content/data/TrackPoint.java @@ -29,7 +29,7 @@ import de.dennisguse.opentracks.content.sensor.SensorDataSet; */ public class TrackPoint { - private Location location; + private final Location location; public TrackPoint() { this.location = new Location(""); diff --git a/src/main/java/de/dennisguse/opentracks/fragments/StatsFragment.java b/src/main/java/de/dennisguse/opentracks/fragments/StatsFragment.java index a17a0caa9..b6372261c 100644 --- a/src/main/java/de/dennisguse/opentracks/fragments/StatsFragment.java +++ b/src/main/java/de/dennisguse/opentracks/fragments/StatsFragment.java @@ -100,7 +100,7 @@ public class StatsFragment extends Fragment implements TrackDataListener { // A recording track id has been set -> Resumes track and starts timer. resumeTrackDataHub(); if (trackRecordingServiceConnection == null) { - trackRecordingServiceConnection = new TrackRecordingServiceConnection(getContext(), null); + trackRecordingServiceConnection = new TrackRecordingServiceConnection(null); } trackRecordingServiceConnection.startConnection(getContext()); @@ -244,7 +244,7 @@ public class StatsFragment extends Fragment implements TrackDataListener { resumeTrackDataHub(); PreferencesUtils.register(getContext(), sharedPreferenceChangeListener); - trackRecordingServiceConnection = new TrackRecordingServiceConnection(getContext(), null); + trackRecordingServiceConnection = new TrackRecordingServiceConnection(null); trackRecordingServiceConnection.startConnection(getContext()); handlerUpdateUI.post(updateUIeachSecond); diff --git a/src/main/java/de/dennisguse/opentracks/services/TrackRecordingServiceConnection.java b/src/main/java/de/dennisguse/opentracks/services/TrackRecordingServiceConnection.java index e61036fb2..d729421e5 100644 --- a/src/main/java/de/dennisguse/opentracks/services/TrackRecordingServiceConnection.java +++ b/src/main/java/de/dennisguse/opentracks/services/TrackRecordingServiceConnection.java @@ -54,10 +54,9 @@ public class TrackRecordingServiceConnection implements ServiceConnection, Death /** * Constructor. * - * @param context the context * @param callback the callback to invoke when the service binding changes */ - public TrackRecordingServiceConnection(Context context, Runnable callback) { + public TrackRecordingServiceConnection(Runnable callback) { this.callback = callback; } diff --git a/src/main/java/de/dennisguse/opentracks/util/AnnouncementUtils.java b/src/main/java/de/dennisguse/opentracks/util/AnnouncementUtils.java index b057ca466..553d30521 100644 --- a/src/main/java/de/dennisguse/opentracks/util/AnnouncementUtils.java +++ b/src/main/java/de/dennisguse/opentracks/util/AnnouncementUtils.java @@ -81,7 +81,7 @@ public class AnnouncementUtils { } else { //TODO This seems weird; why not use Math.round(d) or Math.ceil()? int count = (int) d; - return count < 3 ? 3 : count; + return Math.max(count, 3); } } } diff --git a/src/main/java/de/dennisguse/opentracks/util/FileUtils.java b/src/main/java/de/dennisguse/opentracks/util/FileUtils.java index 3a3679c15..71368a196 100644 --- a/src/main/java/de/dennisguse/opentracks/util/FileUtils.java +++ b/src/main/java/de/dennisguse/opentracks/util/FileUtils.java @@ -27,7 +27,6 @@ import java.io.File; import java.io.FileDescriptor; import java.io.FileInputStream; import java.io.FileOutputStream; -import java.io.IOException; import java.nio.channels.FileChannel; import java.text.SimpleDateFormat; import java.util.Date; @@ -231,9 +230,8 @@ public class FileUtils { * * @param src source file. * @param dst destination file. - * @throws IOException - */ - public static void copy(FileDescriptor src, File dst) throws IOException { + */ + public static void copy(FileDescriptor src, File dst) { try (FileChannel in = new FileInputStream(src).getChannel(); FileChannel out = new FileOutputStream(dst).getChannel()) { in.transferTo(0, in.size(), out);