From 5c88ebcd587fa4709eaaf39b8e758773f0626349 Mon Sep 17 00:00:00 2001 From: Qureshi Waqas <64982453+qureshiwaqas@users.noreply.github.com> Date: Fri, 16 Feb 2024 15:04:29 -0500 Subject: [PATCH] Revert "Dev/waqas" --- .github/workflows/build.gradle | 11 ----------- .github/workflows/build.yml | 1 - .github/workflows/sonarcloud.yml | 1 - .../opentracks/services/TrackDeleteService.java | 11 +++++------ .../opentracks/services/TrackRecordingService.java | 10 +++++----- 5 files changed, 10 insertions(+), 24 deletions(-) delete mode 100644 .github/workflows/build.gradle delete mode 100644 .github/workflows/build.yml delete mode 100644 .github/workflows/sonarcloud.yml diff --git a/.github/workflows/build.gradle b/.github/workflows/build.gradle deleted file mode 100644 index 8fc3b00ba..000000000 --- a/.github/workflows/build.gradle +++ /dev/null @@ -1,11 +0,0 @@ -plugins { - id "org.sonarqube" version "4.4.1.3373" -} - -sonar { - properties { - property "sonar.projectKey", "OmniaAlam_OpenTracks-Winter-SOEN-6431_2024" - property "sonar.organization", "omniaalam" - property "sonar.host.url", "https://sonarcloud.io" - } -} diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml deleted file mode 100644 index 8b1378917..000000000 --- a/.github/workflows/build.yml +++ /dev/null @@ -1 +0,0 @@ - diff --git a/.github/workflows/sonarcloud.yml b/.github/workflows/sonarcloud.yml deleted file mode 100644 index 8b1378917..000000000 --- a/.github/workflows/sonarcloud.yml +++ /dev/null @@ -1 +0,0 @@ - diff --git a/src/main/java/de/dennisguse/opentracks/services/TrackDeleteService.java b/src/main/java/de/dennisguse/opentracks/services/TrackDeleteService.java index 70da88275..3136ae731 100644 --- a/src/main/java/de/dennisguse/opentracks/services/TrackDeleteService.java +++ b/src/main/java/de/dennisguse/opentracks/services/TrackDeleteService.java @@ -54,13 +54,12 @@ public TrackDeleteResultReceiver(Handler handler, @NonNull Receiver receiver) { @Override protected void onReceiveResult(int resultCode, Bundle resultData) { - if(resultCode==RESULT_CODE_SUCCESS){ - receiver.onDeleteFinished(); - } else{ - throw new RuntimeException("Unknown resultCode."); - } - + switch (resultCode) { + case RESULT_CODE_SUCCESS -> receiver.onDeleteFinished(); + default -> throw new RuntimeException("Unknown resultCode."); + } } + public interface Receiver { void onDeleteFinished(); } diff --git a/src/main/java/de/dennisguse/opentracks/services/TrackRecordingService.java b/src/main/java/de/dennisguse/opentracks/services/TrackRecordingService.java index 7d4f826f2..ad2e62722 100644 --- a/src/main/java/de/dennisguse/opentracks/services/TrackRecordingService.java +++ b/src/main/java/de/dennisguse/opentracks/services/TrackRecordingService.java @@ -213,10 +213,10 @@ private synchronized void startSensors() { wakeLock = SystemUtils.acquireWakeLock(this, wakeLock); trackPointCreator.start(this, handler); - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE && !PermissionRequester.RECORDING.hasPermission(this)) { - + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE) { + if (!PermissionRequester.RECORDING.hasPermission(this)) { throw new RuntimeException("Android14: Please grant permissions LOCATION and NEARBY DEVICES (manually)"); - + } } ServiceCompat.startForeground(this, TrackRecordingServiceNotificationManager.NOTIFICATION_ID, notificationManager.setGPSonlyStarted(this), ServiceInfo.FOREGROUND_SERVICE_TYPE_LOCATION + ServiceInfo.FOREGROUND_SERVICE_TYPE_CONNECTED_DEVICE); @@ -285,7 +285,7 @@ public Marker.Id insertMarker(String name, String category, String description, return trackRecordingManager.insertMarker(name, category, description, photoUrl); } - @Deprecated(since = "14.0.0", forRemoval = true) + @Deprecated @VisibleForTesting public TrackPointCreator getTrackPointCreator() { return trackPointCreator; @@ -354,4 +354,4 @@ public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, @Null trackPointCreator.onSharedPreferenceChanged(sharedPreferences, key); notificationManager.onSharedPreferenceChanged(sharedPreferences, key); } -} +} \ No newline at end of file