karol/OpenTracks
1
0
Fork 0
forked from upstream-mirrors/OpenTracks
Code Pull Requests Actions Releases 2 Activity

Cleanup: use Java17 switch statements.

Browse Source 
AndroidStudio code cleanup.
This commit is contained in:
Dennis Guse
2023-04-13 14:52:20 +02:00
parent 3a8e547e10
commit efddb31391
30 changed files with 355 additions and 640 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/de/dennisguse/opentracks/util/TrackIconUtils.java
+6 -12
View File
@@ -40,11 +40,9 @@ public class TrackIconUtils {
it -> it.getId().equals(activityTypeId)
).findFirst();
if (found.isEmpty()) {
return ActivityType.UNKNOWN.getIconId();
}
return found.map(ActivityType::getIconId)
.orElseGet(ActivityType.UNKNOWN::getIconId);
return found.get().getIconId();
}
public static int getIconActivityType(String activityTypeId) {
@@ -52,11 +50,9 @@ public class TrackIconUtils {
it -> it.getId().equals(activityTypeId)
).findFirst();
if (found.isEmpty()) {
return ActivityType.UNKNOWN.getFirstLocalizedStringId();
}
return found.map(ActivityType::getFirstLocalizedStringId)
.orElseGet(ActivityType.UNKNOWN::getFirstLocalizedStringId);
return found.get().getFirstLocalizedStringId();
}
/**
@@ -96,10 +92,8 @@ public class TrackIconUtils {
)
.findFirst();
if (selected.isEmpty()) {
return false;
}
return selected.map(ActivityType::isShowSpeedPreferred)
.orElse(false);
return selected.get().isShowSpeedPreferred();
}
}