Revert "Dev/waqas" (#42)

Reverts #41
rilling · Feb 16, 2024 · bcaf676 · bcaf676
2 parents 9cbd992 + 5c88ebc
commit bcaf676
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 24 deletions.
diff --git a/.github/workflows/build.gradle b/.github/workflows/build.gradle
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
diff --git a/.github/workflows/sonarcloud.yml b/.github/workflows/sonarcloud.yml
diff --git 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
@@ -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);
     }
-}
+}