Update to targetSdk 35 and fix missing Notification

We need to urgently update to API 35, so the app will remain available on play store.
At the same time we had some issues on newer API Versions not showing the service
notification. This lead to people leaving tracking on unintentionally. This has been fixed.
To simplify permission handling, we handle location and notification access together.

Author: cbalster

app/build.gradle

@@ -21,12 +21,12 @@ android {
         }
     }
 
-    compileSdk 33
+    compileSdk 35
 
     defaultConfig {
         applicationId "de.stephanlindauer.criticalmaps"
         minSdkVersion 16
-        targetSdkVersion 33
+        targetSdkVersion 35
         versionCode 48
         versionName "2.9.0"
         vectorDrawables.useSupportLibrary = true
@@ -78,6 +78,7 @@ dependencies {
     implementation 'com.squareup:otto:1.3.8'
     implementation 'org.osmdroid:osmdroid-android:6.1.8'
     implementation 'com.squareup.picasso:picasso:2.8'
+    implementation 'androidx.core:core:1.12.0'
     implementation 'androidx.appcompat:appcompat:1.6.1'
     implementation 'androidx.annotation:annotation:1.9.1'
     implementation 'com.google.android.material:material:1.9.0'

app/src/main/AndroidManifest.xml

@@ -11,6 +11,10 @@
         android:name="android.permission.WRITE_EXTERNAL_STORAGE"
         android:maxSdkVersion="18" />
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_LOCATION" />
+    <uses-permission
+        android:name="android.permission.POST_NOTIFICATIONS"
+        android:minSdkVersion="33" />
 
     <uses-feature
         android:name="android.hardware.location.network"

app/src/main/java/de/stephanlindauer/criticalmaps/Main.java

@@ -2,7 +2,6 @@
 
 import android.animation.ArgbEvaluator;
 import android.animation.ValueAnimator;
-import android.annotation.TargetApi;
 import android.app.Activity;
 import android.content.Intent;
 import android.content.SharedPreferences;
@@ -23,6 +22,7 @@
 
 import androidx.annotation.IdRes;
 import androidx.annotation.NonNull;
+import androidx.annotation.RequiresApi;
 import androidx.appcompat.app.ActionBarDrawerToggle;
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.appcompat.widget.SwitchCompat;
@@ -82,7 +82,7 @@ public class Main extends AppCompatActivity implements NavigationView.OnNavigati
                         setKeepScreenOn();
                         break;
                     case SharedPrefsKeys.PRIVACY_POLICY_ACCEPTED:
-                        if (!locationUpdateManager.checkPermission()) {
+                        if (!LocationUpdateManager.checkPermission()) {
                             locationUpdateManager.requestPermission();
                         }
                         break;
@@ -143,8 +143,6 @@ public void onCreate(Bundle bundle) {
 
         setShowOnLockscreen();
         setKeepScreenOn();
-
-        ServerSyncService.startService();
     }
 
     @Override
@@ -226,15 +224,26 @@ public void onDrawerClosed(@NonNull View drawerView) {
             navigateTo(R.id.navigation_map);
         }
 
-        final boolean isPrivacyPolicyAccepted =
-                !privacyPolicyAcceptedPreference.isSet() || !privacyPolicyAcceptedPreference.get();
-        if (isPrivacyPolicyAccepted) {
+        locationUpdateManager.initialize();
+
+        final boolean isPrivacyPolicyAccepted = privacyPolicyAcceptedPreference.get();
+        if (!isPrivacyPolicyAccepted) {
             binding.introductionText.setMovementMethod(LinkMovementMethod.getInstance());
             binding.introductionText.setText(Html.fromHtml(getString(R.string.introduction_gps)));
             binding.introductionView.setVisibility(View.VISIBLE);
         }
     }
 
+    @Override
+    protected void onResume() {
+        super.onResume();
+        Timber.d("onResume() called");
+        final boolean isPrivacyPolicyAccepted = privacyPolicyAcceptedPreference.get();
+        if (isPrivacyPolicyAccepted) {
+            initiateServiceStartIfPermitted();
+        }
+    }
+
     @Override
     protected void onStop() {
         permissionCheckHandler.detachActivity();
@@ -454,7 +463,7 @@ private void animateToolbar(int durationMillis, boolean toMap) {
         radiusAnimator.start();
     }
 
-    @TargetApi(Build.VERSION_CODES.LOLLIPOP)
+    @RequiresApi(Build.VERSION_CODES.LOLLIPOP)
     private void fadeInStatusBarColor(int duration, boolean toMap) {
         int colorMap = ContextCompat.getColor(this, R.color.main_statusbarcolor_map);
         int colorOthers = ContextCompat.getColor(this, R.color.main_statusbarcolor_others);
@@ -484,4 +493,17 @@ private void handleObserverModeSwitchCheckedChanged(boolean isChecked) {
         new BooleanPreference(
                 sharedPreferences, SharedPrefsKeys.OBSERVER_MODE_ACTIVE).set(isChecked);
     }
+
+    private void initiateServiceStartIfPermitted() {
+        if (LocationUpdateManager.checkPermission()) {
+            if (!ServerSyncService.isCurrentlyRunning()) {
+                Timber.d("Location and notification permissions granted. Attempting to start ServerSyncService.");
+                ServerSyncService.startService();
+            } else {
+                Timber.d("Location and notification permission granted, but service is already running.");
+            }
+        } else {
+            Timber.d("Location and notification permission NOT granted. ServerSyncService will not be started.");
+        }
+    }
 }

app/src/main/java/de/stephanlindauer/criticalmaps/fragments/ChatFragment.java

@@ -271,7 +271,7 @@ public void run() {
                 getChatmessagesHandler.get().execute();
             }
         };
-        timerGetChatmessages.scheduleAtFixedRate(timerTaskPullServer, 0, SERVER_SYNC_INTERVAL);
+        timerGetChatmessages.schedule(timerTaskPullServer, 0, SERVER_SYNC_INTERVAL);
     }
 
     private void stopGetChatmessagesTimer() {

app/src/main/java/de/stephanlindauer/criticalmaps/fragments/MapFragment.java

@@ -2,7 +2,6 @@
 
 import android.animation.AnimatorInflater;
 import android.animation.ObjectAnimator;
-import android.annotation.TargetApi;
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.graphics.drawable.Drawable;
@@ -19,6 +18,7 @@
 import androidx.annotation.ColorRes;
 import androidx.annotation.DrawableRes;
 import androidx.annotation.NonNull;
+import androidx.annotation.RequiresApi;
 import androidx.appcompat.app.AlertDialog;
 import androidx.appcompat.content.res.AppCompatResources;
 import androidx.core.content.ContextCompat;
@@ -256,9 +256,13 @@ public void onRotate(float deltaAngle) {
         binding.mapSetNorthFab.setRotation(mapView.getMapOrientation());
 
         showGpxHandler.showGpx(mapView);
+
+        if (!LocationUpdateManager.checkPermission()) {
+            zoomToLocation(defaultGeoPoint, NO_GPS_PERMISSION_ZOOM_LEVEL);
+        }
     }
 
-    @TargetApi(Build.VERSION_CODES.JELLY_BEAN_MR1)
+    @RequiresApi(Build.VERSION_CODES.JELLY_BEAN_MR1)
     private void adjustToWindowsInsets() {
         // No-op on < API21
         ViewCompat.setOnApplyWindowInsetsListener(binding.mapOverlayContainerLayout, (v, insets) -> {
@@ -321,12 +325,6 @@ public void onResume() {
         sharedPreferences.registerOnSharedPreferenceChangeListener(
                 observerModeOnSharedPreferenceChangeListener);
 
-        if (locationUpdateManager.checkPermission()) {
-            locationUpdateManager.startListening();
-        } else {
-            zoomToLocation(defaultGeoPoint, NO_GPS_PERMISSION_ZOOM_LEVEL);
-        }
-
         startGetLocationTimer();
     }
 
@@ -505,7 +503,7 @@ public void run() {
                 getLocationHandler.get().execute();
             }
         };
-        timerGetLocation.scheduleAtFixedRate(timerTaskPullServer, 0, SERVER_SYNC_INTERVAL);
+        timerGetLocation.schedule(timerTaskPullServer, 0, SERVER_SYNC_INTERVAL);
     }
 
     private void stopGetLocationTimer() {

app/src/main/java/de/stephanlindauer/criticalmaps/handler/PermissionCheckHandler.java

@@ -42,7 +42,7 @@ public void requestPermissionsWithRationaleIfNeeded(PermissionRequest permission
         activePermissionRequest = permissionRequest;
 
         // short-circuit here if already granted
-        if (checkPermissionsGranted(permissionRequest.getPermissions())) {
+        if (checkAllPermissionsGranted(permissionRequest.getPermissions())) {
             activePermissionRequest.getOnGrantedCallback().run();
             activePermissionRequest = null;
             return;
@@ -91,7 +91,8 @@ public boolean handlePermissionRequestCallback(int requestCode, int[] grantResul
             return false;
         }
 
-        boolean allPermissionsGranted = true;
+        // Note: Can be an empty array that should be treated as cancellation.
+        boolean allPermissionsGranted = grantResults.length > 0;
         for (int result : grantResults) {
             allPermissionsGranted = allPermissionsGranted &&
                     result == PackageManager.PERMISSION_GRANTED;
@@ -120,7 +121,7 @@ public boolean handlePermissionRequestCallback(int requestCode, int[] grantResul
         return true;
     }
 
-    public static boolean checkPermissionsGranted(String[] permissions) {
+    public static boolean checkAllPermissionsGranted(String[] permissions) {
         boolean permissionsGranted = true;
         for (String permission : permissions) {
             permissionsGranted = permissionsGranted && (PackageManager.PERMISSION_GRANTED ==

app/src/main/java/de/stephanlindauer/criticalmaps/managers/LocationUpdateManager.java

@@ -3,11 +3,14 @@
 import android.Manifest;
 import android.annotation.SuppressLint;
 import android.content.Context;
+import android.content.pm.PackageManager;
 import android.location.Location;
 import android.location.LocationListener;
 import android.location.LocationManager;
 import android.os.Bundle;
 
+import androidx.core.content.ContextCompat;
+
 import com.squareup.otto.Produce;
 
 import org.osmdroid.util.GeoPoint;
@@ -42,9 +45,12 @@ public class LocationUpdateManager {
     private final String[] USED_PROVIDERS = new String[]{
             LocationManager.GPS_PROVIDER,
             LocationManager.NETWORK_PROVIDER};
+
+    @SuppressLint("InlinedApi")
     private final String[] PERMISSIONS = {
             Manifest.permission.ACCESS_FINE_LOCATION,
-            Manifest.permission.ACCESS_COARSE_LOCATION};
+            Manifest.permission.ACCESS_COARSE_LOCATION,
+            Manifest.permission.POST_NOTIFICATIONS};
     private final LocationManager locationManager;
     private Location lastPublishedLocation;
 
@@ -143,7 +149,7 @@ public boolean isUpdating() {
         return isUpdating;
     }
 
-    public void initializeAndStartListening() {
+    public void initialize() {
         boolean noProviderExists = !checkIfAtLeastOneProviderExits();
         boolean noPermission = !checkPermission();
 
@@ -165,8 +171,6 @@ public void initializeAndStartListening() {
         if (noPermission) {
             return;
         }
-
-        startListening();
     }
 
     public void startListening() {
@@ -203,8 +207,12 @@ private void requestLocationUpdatesIfProviderExists(String provider) {
         }
     }
 
-    public boolean checkPermission() {
-        return PermissionCheckHandler.checkPermissionsGranted(PERMISSIONS);
+    @SuppressLint("InlinedApi")
+    public static boolean checkPermission() {
+        App app = App.components().app();
+        return (ContextCompat.checkSelfPermission(app, Manifest.permission.ACCESS_FINE_LOCATION) == PackageManager.PERMISSION_GRANTED
+                || ContextCompat.checkSelfPermission(app, Manifest.permission.ACCESS_COARSE_LOCATION) == PackageManager.PERMISSION_GRANTED)
+                && ContextCompat.checkSelfPermission(app, Manifest.permission.POST_NOTIFICATIONS) == PackageManager.PERMISSION_GRANTED;
     }
 
     public void requestPermission() {

app/src/main/java/de/stephanlindauer/criticalmaps/service/ServerSyncService.java

@@ -1,9 +1,13 @@
 package de.stephanlindauer.criticalmaps.service;
 
+import static android.content.pm.ServiceInfo.FOREGROUND_SERVICE_TYPE_LOCATION;
+
+import android.annotation.SuppressLint;
 import android.app.Service;
 import android.content.Intent;
 import android.os.IBinder;
 
+import androidx.core.app.ServiceCompat;
 import androidx.core.content.ContextCompat;
 
 import com.squareup.otto.Subscribe;
@@ -21,13 +25,14 @@
 import de.stephanlindauer.criticalmaps.managers.LocationUpdateManager;
 import de.stephanlindauer.criticalmaps.provider.EventBus;
 import de.stephanlindauer.criticalmaps.utils.TrackingInfoNotificationBuilder;
+import timber.log.Timber;
 
 public class ServerSyncService extends Service {
 
     @SuppressWarnings("FieldCanBeLocal")
     private final int SERVER_SYNC_INTERVAL = 30 * 1000; // 30 sec
-
     private Timer locationUploadTimer;
+    private static boolean isRunning = false;
 
     @Inject
     LocationUpdateManager locationUpdateManager;
@@ -46,18 +51,18 @@ public IBinder onBind(Intent intent) {
         return null;
     }
 
+    @SuppressLint("InlinedApi")
     @Override
     public void onCreate() {
-        App.components().inject(this);
-
-        startForeground(TrackingInfoNotificationBuilder.NOTIFICATION_ID,
-                TrackingInfoNotificationBuilder.getNotification(getApplication()));
-
-        locationUpdateManager.initializeAndStartListening();
+        super.onCreate();
 
+        App.components().inject(this);
+        ServiceCompat.startForeground(this, TrackingInfoNotificationBuilder.NOTIFICATION_ID,
+                TrackingInfoNotificationBuilder.getNotification(getApplication()), FOREGROUND_SERVICE_TYPE_LOCATION);
         networkConnectivityChangeHandler.start();
-
+        locationUpdateManager.startListening();
         eventBus.register(this);
+        isRunning = true;
     }
 
     private void startLocationUploadTimer() {
@@ -85,6 +90,9 @@ public void onDestroy() {
         locationUpdateManager.handleShutdown();
         networkConnectivityChangeHandler.stop();
         stopLocationUploadTimer();
+        isRunning = false;
+
+        super.onDestroy();
     }
 
     @Override
@@ -104,6 +112,11 @@ public void handleNetworkConnectivityChanged(NetworkConnectivityChangedEvent e)
 
     public static void startService() {
         App app = App.components().app();
+        if (!LocationUpdateManager.checkPermission()) {
+            Timber.d("ServerSyncService cannot be started without location and notification permission.");
+            return;
+        }
+
         Intent syncServiceIntent = new Intent(app, ServerSyncService.class);
         ContextCompat.startForegroundService(app, syncServiceIntent);
     }
@@ -113,4 +126,8 @@ public static void stopService() {
         Intent syncServiceIntent = new Intent(app, ServerSyncService.class);
         app.stopService(syncServiceIntent);
     }
+
+    public static boolean isCurrentlyRunning() {
+        return isRunning;
+    }
 }

app/src/main/res/values/strings.xml

@@ -39,16 +39,16 @@
         the Mass, but remember that the app depends on as many people as possible sharing their
         location.\nSo please consider enabling location services in your device settings.</string>
     <string name="map_gps_permissions_permanently_denied_title">Location access is denied</string>
-    <string name="map_gps_permissions_permanently_denied_text">You previously denied permission to access your location. Without location access you and other users won\'t be able to see your location on the map. You can still follow the Mass, but remember that the app depends on as many people as possible sharing their location.\nDo you want to grant the permission now in the app settings?</string>
-    <string name="map_location_permissions_rationale_text">Location access is crucial for the app to work. It is required to view your location on the map, share you location with other users, write chat messages and upload images. Without it you can still follow the Mass, but remember that the app depends on as many people as possible sharing their location.\nDo you want to grant the permission now?</string>
+    <string name="map_gps_permissions_permanently_denied_text">You previously denied permission to access your location and show notifications. Without location access you and other users won\'t be able to see your location on the map. Notifications are required to inform you that the app is still running in the background. You can still follow the Mass, but remember that the app depends on as many people as possible sharing their location.\nDo you want to grant the permission now in the app settings?</string>
+    <string name="map_location_permissions_rationale_text">Location and notification access is crucial for the app to work. It is required to view your location on the map, share you location with other users, write chat messages and upload images. Notifications are required to inform you that the app is still running in the background. Without it you can still follow the Mass, but remember that the app depends on as many people as possible sharing their location.\nDo you want to grant the permission now?</string>
     <string name="map_oberserver_mode_info_heading">Observer mode is active</string>
     <string name="map_observer_mode_info_text">Already joined the mass?\nNice! Please disable observer mode now to help others see where you\'re going!</string>
 
     <!-- notification -->
     <string name="notification_tracking_title">Critical Maps Tracking</string>
-    <string name="notification_tracking_text">The App runs in the background and records your location data. Please close the App when you don\'t want to be tracked anymore.</string>
+    <string name="notification_tracking_text">The App runs in the background and sends your location data. Please close the App when you don\'t want to be tracked anymore.</string>
     <string name="notification_channel_name">Tracking notification</string>
-    <string name="notification_channel_description_max300chars">We do not recommend disabling the notification since you might inadvertently keep tracking turned on.</string>
+    <string name="notification_channel_description_max300chars">It is not recommended to disable the notification since you might inadvertently keep tracking turned on.</string>
     <string name="notification_tracking_close">Close</string>
     <string name="notification_tracking_open">Open</string>