diff --git a/src/androidTest/java/de/dennisguse/opentracks/data/CustomSQLiteOpenHelperTest.java b/src/androidTest/java/de/dennisguse/opentracks/data/CustomSQLiteOpenHelperTest.java index cdfd90d5d..289b969e7 100644 --- a/src/androidTest/java/de/dennisguse/opentracks/data/CustomSQLiteOpenHelperTest.java +++ b/src/androidTest/java/de/dennisguse/opentracks/data/CustomSQLiteOpenHelperTest.java @@ -48,10 +48,8 @@ public class CustomSQLiteOpenHelperTest { public static Map getSQL(SQLiteDatabase db, String type) { HashMap sqlMap = new HashMap<>(); try (Cursor cursor = db.query("sqlite_master", new String[]{"name", "SQL"}, "type=?", new String[]{type}, null, null, "name")) { - if (cursor != null) { - while (cursor.moveToNext()) { - sqlMap.put(cursor.getString(0), cursor.getString(1)); - } + while (cursor.moveToNext()) { + sqlMap.put(cursor.getString(0), cursor.getString(1)); } } return sqlMap; @@ -64,12 +62,10 @@ public class CustomSQLiteOpenHelperTest { */ private static boolean hasSqlCreate(SQLiteDatabase db, String sqlCreate) { try (Cursor cursor = db.rawQuery("SELECT SQL FROM sqlite_master", null)) { - if (cursor != null) { - while (cursor.moveToNext()) { - String sql = cursor.getString(0); - if (sqlCreate.equals(sql)) { - return true; - } + while (cursor.moveToNext()) { + String sql = cursor.getString(0); + if (sqlCreate.equals(sql)) { + return true; } } } diff --git a/src/main/java/de/dennisguse/opentracks/chart/ChartView.java b/src/main/java/de/dennisguse/opentracks/chart/ChartView.java index cb0b61dd1..bf8413d2a 100644 --- a/src/main/java/de/dennisguse/opentracks/chart/ChartView.java +++ b/src/main/java/de/dennisguse/opentracks/chart/ChartView.java @@ -17,7 +17,6 @@ package de.dennisguse.opentracks.chart; import android.content.Context; -import android.content.Intent; import android.graphics.Canvas; import android.graphics.DashPathEffect; import android.graphics.Paint; @@ -49,10 +48,8 @@ import de.dennisguse.opentracks.R; import de.dennisguse.opentracks.data.models.Marker; import de.dennisguse.opentracks.settings.UnitSystem; import de.dennisguse.opentracks.stats.ExtremityMonitor; -import de.dennisguse.opentracks.ui.markers.MarkerDetailActivity; import de.dennisguse.opentracks.ui.markers.MarkerUtils; import de.dennisguse.opentracks.ui.util.ThemeUtils; -import de.dennisguse.opentracks.util.IntentUtils; import de.dennisguse.opentracks.util.StringUtils; /** @@ -857,7 +854,7 @@ public class ChartView extends View { * @param chartValueSeries the chart value series * @param canvas the canvas * @param xPosition the right most x position - * @parm yOffset offset to apply to y position + * @param yOffset offset to apply to y position * @param yValue the y value * @return the marker width. */ diff --git a/src/main/java/de/dennisguse/opentracks/fragments/ChooseActivityTypeDialogFragment.java b/src/main/java/de/dennisguse/opentracks/fragments/ChooseActivityTypeDialogFragment.java index 8571c8ecd..e6967d633 100644 --- a/src/main/java/de/dennisguse/opentracks/fragments/ChooseActivityTypeDialogFragment.java +++ b/src/main/java/de/dennisguse/opentracks/fragments/ChooseActivityTypeDialogFragment.java @@ -23,7 +23,6 @@ public class ChooseActivityTypeDialogFragment extends DialogFragment implements private static final String CHOOSE_ACTIVITY_TYPE_DIALOG_TAG = "chooseActivityType"; - @Deprecated public static void showDialog(FragmentManager fragmentManager, Context context, String activityTypeLocalized) { ActivityType activityType = ActivityType.findByLocalizedString(context, activityTypeLocalized); showDialog(fragmentManager, activityType); diff --git a/src/main/java/de/dennisguse/opentracks/io/file/importer/ImportActivity.java b/src/main/java/de/dennisguse/opentracks/io/file/importer/ImportActivity.java index a3c33f20c..2267ae123 100644 --- a/src/main/java/de/dennisguse/opentracks/io/file/importer/ImportActivity.java +++ b/src/main/java/de/dennisguse/opentracks/io/file/importer/ImportActivity.java @@ -97,7 +97,7 @@ public class ImportActivity extends AbstractActivity { importer = new Importer(this, documentFiles); importer.getLiveData() - .observe(this, summary -> setProgress(summary)); + .observe(this, this::setProgress); importer.startImport(); //Works for a directory, but we might have received multiple files via SEND_MULTIPLE. diff --git a/src/main/java/de/dennisguse/opentracks/services/TrackRecordingServiceNotificationManager.java b/src/main/java/de/dennisguse/opentracks/services/TrackRecordingServiceNotificationManager.java index 7c9eb13ee..fc79a594d 100644 --- a/src/main/java/de/dennisguse/opentracks/services/TrackRecordingServiceNotificationManager.java +++ b/src/main/java/de/dennisguse/opentracks/services/TrackRecordingServiceNotificationManager.java @@ -105,8 +105,7 @@ class TrackRecordingServiceNotificationManager implements SharedPreferences.OnSh Notification setGPSonlyStarted(Context context) { Intent intent = IntentUtils.newIntent(context, TrackListActivity.class); - int pendingIntentFlags = 0; - pendingIntentFlags = PendingIntent.FLAG_IMMUTABLE | PendingIntent.FLAG_UPDATE_CURRENT; + int pendingIntentFlags = PendingIntent.FLAG_IMMUTABLE | PendingIntent.FLAG_UPDATE_CURRENT; PendingIntent pendingIntent = TaskStackBuilder.create(context) .addParentStack(TrackListActivity.class) .addNextIntent(intent) diff --git a/src/main/java/de/dennisguse/opentracks/ui/intervals/IntervalStatisticsAdapter.java b/src/main/java/de/dennisguse/opentracks/ui/intervals/IntervalStatisticsAdapter.java index 1e9e0fd5b..8de4d8ae1 100644 --- a/src/main/java/de/dennisguse/opentracks/ui/intervals/IntervalStatisticsAdapter.java +++ b/src/main/java/de/dennisguse/opentracks/ui/intervals/IntervalStatisticsAdapter.java @@ -21,7 +21,7 @@ public class IntervalStatisticsAdapter extends RecyclerView.Adapter intervalList; private final Context context; private final StackMode stackMode; - private UnitSystem unitSystem = UnitSystem.defaultUnitSystem(); + private UnitSystem unitSystem; private boolean isReportSpeed; public IntervalStatisticsAdapter(Context context, StackMode stackMode, UnitSystem unitSystem, boolean isReportSpeed) { diff --git a/src/main/res/drawable/ic_logo_108dp.xml b/src/main/res/drawable/ic_logo_108dp.xml index 15d824f4a..d8ae97a81 100644 --- a/src/main/res/drawable/ic_logo_108dp.xml +++ b/src/main/res/drawable/ic_logo_108dp.xml @@ -10,6 +10,6 @@ android:translateY="24"> + android:fillColor="#FFFFFF" /> diff --git a/src/main/res/values/do_not_translate.xml b/src/main/res/values/do_not_translate.xml index 06318f666..dd27dcbfb 100644 --- a/src/main/res/values/do_not_translate.xml +++ b/src/main/res/values/do_not_translate.xml @@ -44,7 +44,7 @@ limitations under the License. w - - + https://codeberg.org/OpenTracksApp/OpenTracks/issues/new?labels=bug&template=bug_report.md&body=%1$s