Merge pull request #337 from cbalster/update_target_sdk_and_minor_cle…

…anup

Update target sdk and minor cleanup

.github/workflows/android.yml

@@ -23,7 +23,7 @@ jobs:
         uses: actions/setup-java@v2
         with:
           distribution: 'zulu'
-          java-version: 11
+          java-version: 17
 
       - name: Run Android Linter
         run: ./gradlew lint --stacktrace

app/build.gradle

@@ -21,12 +21,12 @@ android {
         }
     }
 
-    compileSdkVersion 33
+    compileSdk 33
 
     defaultConfig {
         applicationId "de.stephanlindauer.criticalmaps"
         minSdkVersion 16
-        targetSdkVersion 31
+        targetSdkVersion 33
         versionCode 47
         versionName "2.8.2"
         vectorDrawables.useSupportLibrary = true
@@ -50,6 +50,7 @@ android {
             signingConfig signingConfigs.releaseConfig
         }
     }
+
     packagingOptions {
         resources {
             excludes += ['META-INF/services/javax.annotation.processing.Processor']
@@ -68,17 +69,18 @@ android {
     lint {
         warning 'MissingTranslation', 'StringFormatInvalid', 'NewApi', 'InvalidPackage'
     }
+
     namespace 'de.stephanlindauer.criticalmaps'
 }
 
 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.appcompat:appcompat:1.6.0'
-    implementation 'androidx.annotation:annotation:1.5.0'
-    implementation 'com.google.android.material:material:1.9.0-alpha01'
-    implementation 'androidx.exifinterface:exifinterface:1.3.5'
+    implementation 'androidx.appcompat:appcompat:1.6.1'
+    implementation 'androidx.annotation:annotation:1.6.0'
+    implementation 'com.google.android.material:material:1.9.0'
+    implementation 'androidx.exifinterface:exifinterface:1.3.6'
     implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
     implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0'
     implementation 'com.jakewharton.timber:timber:5.0.1'
@@ -90,17 +92,27 @@ dependencies {
     implementation "com.google.dagger:dagger:$dagger_version"
     annotationProcessor "com.google.dagger:dagger-compiler:$dagger_version"
 
-    debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.10'
+    debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.12'
 
     errorprone("com.google.errorprone:error_prone_core:2.18.0")
 
     testImplementation 'junit:junit:4.13.2'
     testImplementation 'com.google.truth:truth:1.1.3'
-    testImplementation 'org.mockito:mockito-core:5.1.1'
+    testImplementation 'org.mockito:mockito-core:5.4.0'
 
     androidTestImplementation 'androidx.test:core:1.5.0'
     androidTestImplementation 'androidx.test:runner:1.5.2'
     androidTestImplementation 'androidx.test:rules:1.5.0'
     androidTestImplementation 'androidx.test.ext:junit:1.1.5'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
+
+    // https://youtrack.jetbrains.com/issue/KT-54136/Duplicated-classes-cause-build-failure-if-a-dependency-to-kotlin-stdlib-specified-in-an-android-project#focus=Comments-27-6583109.0-0
+    constraints {
+        implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.8.0") {
+            because("kotlin-stdlib-jdk7 is now a part of kotlin-stdlib")
+        }
+        implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.0") {
+            because("kotlin-stdlib-jdk8 is now a part of kotlin-stdlib")
+        }
+    }
 }

app/src/main/AndroidManifest.xml

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+<manifest xmlns:tools="http://schemas.android.com/tools"
+    xmlns:android="http://schemas.android.com/apk/res/android">
 
     <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
@@ -28,10 +29,12 @@
         android:name=".App"
         android:allowBackup="true"
         android:fullBackupContent="@xml/backup_descriptor"
+        android:dataExtractionRules="@xml/data_extraction_rules"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
-        android:roundIcon="@mipmap/ic_launcher"
-        android:supportsRtl="true">
+        android:roundIcon="@mipmap/ic_launcher_round"
+        android:supportsRtl="true"
+        tools:targetApi="s">
 
         <activity
             android:name="de.stephanlindauer.criticalmaps.Main"

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

@@ -21,7 +21,6 @@
 import android.view.animation.AccelerateDecelerateInterpolator;
 import android.widget.Toast;
 
-import androidx.activity.OnBackPressedCallback;
 import androidx.annotation.IdRes;
 import androidx.annotation.NonNull;
 import androidx.appcompat.app.ActionBarDrawerToggle;
@@ -252,24 +251,19 @@ public boolean onCreateOptionsMenu(Menu menu) {
 
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
-        switch (item.getItemId()) {
-            case R.id.action_close:
-                handleCloseRequested();
-                break;
-            case R.id.take_picture:
-                new StartCameraHandler(this).execute();
-                break;
-            case R.id.settings_feedback:
-                startFeedbackIntent();
-                break;
-            case R.id.settings_datenschutz:
-                startDatenschutzIntent();
-                break;
-            case R.id.rate_the_app:
-                startRateTheApp();
-                break;
-            default:
-                return super.onOptionsItemSelected(item);
+        int itemId = item.getItemId();
+        if (itemId == R.id.action_close) {
+            handleCloseRequested();
+        } else if (itemId == R.id.take_picture) {
+            new StartCameraHandler(this).execute();
+        } else if (itemId == R.id.settings_feedback) {
+            startFeedbackIntent();
+        } else if (itemId == R.id.settings_datenschutz) {
+            startDatenschutzIntent();
+        } else if (itemId == R.id.rate_the_app) {
+            startRateTheApp();
+        } else {
+            return super.onOptionsItemSelected(item);
         }
         return true;
     }

app/src/main/java/de/stephanlindauer/criticalmaps/provider/FragmentProvider.java

@@ -13,22 +13,16 @@
 public class FragmentProvider {
 
     public static Fragment getFragmentForNavId(@IdRes int navId) {
-        switch (navId) {
-            case R.id.navigation_map:
-                return new MapFragment();
-
-            case R.id.navigation_rules:
-                return new RulesFragment();
-
-            case R.id.navigation_chat:
-                return new ChatFragment();
-
-            case R.id.navigation_settings:
-                return new SettingsFragment();
-
-            default:
-            case R.id.navigation_about:
-                return new AboutFragment();
+        if (navId == R.id.navigation_map) {
+            return new MapFragment();
+        } else if (navId == R.id.navigation_rules) {
+            return new RulesFragment();
+        } else if (navId == R.id.navigation_chat) {
+            return new ChatFragment();
+        } else if (navId == R.id.navigation_settings) {
+            return new SettingsFragment();
+        } else { // R.id.navigation_about
+            return new AboutFragment();
         }
     }
 }

app/src/main/java/de/stephanlindauer/criticalmaps/utils/TrackingInfoNotificationBuilder.java

@@ -64,6 +64,7 @@ public static Notification getNotification(Application application) {
                         .setStyle(new NotificationCompat.BigTextStyle()
                                 .bigText(application.getString(R.string.notification_tracking_text)))
                         .setPriority(NotificationCompat.PRIORITY_MAX)
+                        .setCategory(NotificationCompat.CATEGORY_SERVICE)
                         .setContentIntent(openPendingIntent)
                         .addAction(R.drawable.ic_notification_open,
                                 application.getString(R.string.notification_tracking_open),

app/src/main/res/drawable-anydpi-v24/ic_notification_close.xml

@@ -0,0 +1,15 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="#FFFFFF">
+  <group android:scaleX="1.127451"
+      android:scaleY="1.127451"
+      android:translateX="-1.5294118"
+      android:translateY="-1.5294118">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M19,6.41L17.59,5 12,10.59 6.41,5 5,6.41 10.59,12 5,17.59 6.41,19 12,13.41 17.59,19 19,17.59 13.41,12z"/>
+  </group>
+</vector>

app/src/main/res/drawable-anydpi-v24/ic_notification_open.xml

@@ -0,0 +1,15 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="#FFFFFF">
+  <group android:scaleX="0.92"
+      android:scaleY="0.92"
+      android:translateX="0.96"
+      android:translateY="0.96">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M12,8c-2.21,0 -4,1.79 -4,4s1.79,4 4,4 4,-1.79 4,-4 -1.79,-4 -4,-4zM20.94,11c-0.46,-4.17 -3.77,-7.48 -7.94,-7.94L13,1h-2v2.06C6.83,3.52 3.52,6.83 3.06,11L1,11v2h2.06c0.46,4.17 3.77,7.48 7.94,7.94L11,23h2v-2.06c4.17,-0.46 7.48,-3.77 7.94,-7.94L23,13v-2h-2.06zM12,19c-3.87,0 -7,-3.13 -7,-7s3.13,-7 7,-7 7,3.13 7,7 -3.13,7 -7,7z"/>
+  </group>
+</vector>

app/src/main/res/drawable-anydpi-v24/ic_stat_logo.xml

@@ -0,0 +1,23 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="108"
+    android:viewportHeight="108"
+    android:tint="#FFFFFF">
+  <group android:scaleX="1.104"
+      android:scaleY="1.104"
+      android:translateX="-5.616"
+      android:translateY="-5.616">
+      <group
+          android:scaleX="1.6849817"
+          android:scaleY="1.6849817"
+          android:translateX="-36.98901"
+          android:translateY="-36.98901">
+          <path
+              android:fillColor="#FFFFFF"
+              android:fillType="evenOdd"
+              android:pathData="M53.135,52.111L54.443,50.23L46.12,46.069L42.944,53.375L48.568,64.251L47.337,75.127C48.319,75.439 49.331,75.685 50.368,75.857L51.148,71.162C52.076,71.315 53.029,71.395 54,71.395C54.971,71.395 55.924,71.315 56.852,71.162L57.632,75.857C58.716,75.677 59.773,75.417 60.797,75.084L58.93,64.709L62.382,61.297L62.03,58.487L60.835,59.981L53.404,54.736L48.651,54.736L48.651,52.111L53.135,52.111L53.135,52.111ZM55.643,53.103L57.039,54.088L61.196,48.446L59.758,47.187L55.643,53.103L55.643,53.103ZM61.266,45.019L64.741,48.06L64.02,49.039L67.114,52.133L64.318,55.627L65.147,62.254L61.758,65.604L63.288,74.102C67.726,72.029 71.357,68.516 73.58,64.164L69.442,62.016C70.31,60.348 70.915,58.521 71.203,56.591L75.757,57.277C75.899,56.266 75.973,55.233 75.973,54.183C75.973,48.129 73.524,42.646 69.563,38.672L66.393,41.794C65.057,40.437 63.5,39.299 61.781,38.438L63.755,34.489C60.816,33.031 57.504,32.21 54,32.21C50.496,32.21 47.184,33.031 44.245,34.489L46.219,38.438C44.5,39.299 42.943,40.437 41.607,41.794L38.437,38.672C34.476,42.646 32.027,48.129 32.027,54.183C32.027,55.233 32.101,56.266 32.243,57.277L36.797,56.591C37.085,58.521 37.69,60.348 38.558,62.016L34.42,64.164C36.658,68.547 40.325,72.078 44.806,74.146L45.87,64.749L40.039,53.472L44.817,42.482L47.52,43.833L51.864,38.699L55.779,40.439L56.423,39.687L61.973,44.004L61.266,45.019L61.266,45.019ZM53.996,42.519L52.596,41.897L49.936,45.042L51.264,45.706L53.996,42.519L53.996,42.519ZM53.684,46.916L55.958,48.053L58.397,44.548L56.787,43.296L53.684,46.916L53.684,46.916ZM59.184,55.602L60.33,56.411L63.596,52.328L62.445,51.176L59.184,55.602L59.184,55.602ZM30.503,46.303C30.67,45.792 30.854,45.289 31.053,44.793C30.836,44.372 30.399,43.962 29.822,43.662C30.045,43.14 30.285,42.627 30.54,42.124C31.141,42.374 31.737,42.445 32.199,42.339C32.452,41.867 32.72,41.405 33.001,40.952C32.862,40.499 32.504,40.019 31.987,39.623C32.297,39.149 32.623,38.685 32.962,38.233C33.512,38.583 34.087,38.755 34.56,38.73C34.889,38.312 35.232,37.904 35.587,37.508C35.53,37.038 35.26,36.502 34.82,36.021C35.207,35.608 35.608,35.207 36.021,34.82C36.502,35.26 37.038,35.53 37.508,35.587C37.904,35.232 38.312,34.889 38.73,34.56C38.755,34.087 38.583,33.512 38.233,32.962C38.685,32.623 39.149,32.297 39.623,31.987C40.019,32.504 40.499,32.862 40.952,33.001C41.405,32.72 41.867,32.452 42.339,32.199C42.445,31.737 42.374,31.141 42.124,30.54C42.627,30.285 43.14,30.045 43.662,29.822C43.962,30.399 44.372,30.836 44.793,31.053C45.289,30.854 45.792,30.67 46.303,30.503C46.486,30.066 46.519,29.468 46.378,28.833C46.917,28.67 47.464,28.523 48.018,28.395C48.213,29.016 48.541,29.518 48.919,29.804C49.44,29.695 49.966,29.603 50.497,29.528C50.755,29.13 50.892,28.546 50.864,27.896C51.423,27.83 51.987,27.781 52.556,27.75C52.641,28.396 52.879,28.947 53.202,29.294C53.467,29.285 53.733,29.281 54,29.281C54.267,29.281 54.533,29.285 54.798,29.294C55.121,28.947 55.359,28.396 55.444,27.75C56.013,27.781 56.577,27.83 57.136,27.896C57.108,28.546 57.245,29.13 57.503,29.528C58.034,29.603 58.56,29.695 59.081,29.804C59.459,29.518 59.787,29.016 59.982,28.395C60.536,28.523 61.083,28.67 61.622,28.833C61.481,29.468 61.514,30.066 61.697,30.503C62.208,30.67 62.711,30.854 63.207,31.053C63.628,30.836 64.038,30.399 64.338,29.822C64.86,30.045 65.373,30.285 65.876,30.54C65.626,31.141 65.555,31.737 65.661,32.199C66.133,32.452 66.595,32.72 67.048,33.001C67.501,32.862 67.981,32.504 68.377,31.987C68.851,32.297 69.315,32.623 69.767,32.962C69.417,33.512 69.245,34.087 69.27,34.56C69.688,34.889 70.096,35.232 70.492,35.587C70.962,35.53 71.498,35.26 71.979,34.82C72.392,35.207 72.793,35.608 73.18,36.021C72.74,36.502 72.47,37.038 72.413,37.508C72.768,37.904 73.111,38.312 73.44,38.73C73.913,38.755 74.488,38.583 75.038,38.233C75.377,38.685 75.703,39.149 76.013,39.623C75.496,40.019 75.138,40.499 74.999,40.952C75.28,41.405 75.548,41.867 75.801,42.339C76.263,42.445 76.859,42.374 77.46,42.124C77.715,42.627 77.955,43.14 78.178,43.662C77.601,43.962 77.164,44.372 76.947,44.793C77.146,45.289 77.33,45.792 77.497,46.303C77.934,46.486 78.532,46.519 79.167,46.378C79.33,46.917 79.477,47.464 79.605,48.018C78.984,48.213 78.482,48.541 78.196,48.919C78.305,49.44 78.397,49.966 78.472,50.497C78.87,50.755 79.454,50.892 80.104,50.864C80.17,51.423 80.219,51.987 80.25,52.556C79.604,52.641 79.053,52.879 78.706,53.202C78.715,53.467 78.719,53.733 78.719,54C78.719,54.267 78.715,54.533 78.706,54.798C79.053,55.121 79.604,55.359 80.25,55.444C80.219,56.013 80.17,56.577 80.104,57.136C79.454,57.108 78.87,57.245 78.472,57.503C78.397,58.034 78.305,58.56 78.196,59.081C78.482,59.459 78.984,59.787 79.605,59.982C79.477,60.536 79.33,61.083 79.167,61.622C78.532,61.481 77.934,61.514 77.497,61.697C77.33,62.208 77.146,62.711 76.947,63.207C77.164,63.628 77.601,64.038 78.178,64.338C77.955,64.86 77.715,65.373 77.46,65.876C76.859,65.626 76.263,65.555 75.801,65.661C75.548,66.133 75.28,66.595 74.999,67.048C75.138,67.501 75.496,67.981 76.013,68.377C75.703,68.851 75.377,69.315 75.038,69.767C74.488,69.417 73.913,69.245 73.44,69.27C73.111,69.688 72.768,70.096 72.413,70.492C72.47,70.962 72.74,71.498 73.18,71.979C72.793,72.392 72.392,72.793 71.979,73.18C71.498,72.74 70.962,72.47 70.492,72.413C70.096,72.768 69.688,73.111 69.27,73.44C69.245,73.913 69.417,74.488 69.767,75.038C69.315,75.377 68.851,75.703 68.377,76.013C67.981,75.496 67.501,75.138 67.048,74.999C66.595,75.28 66.133,75.548 65.661,75.801C65.555,76.263 65.626,76.859 65.876,77.46C65.373,77.715 64.86,77.955 64.338,78.178C64.038,77.601 63.628,77.164 63.207,76.947C62.711,77.146 62.208,77.33 61.697,77.497C61.514,77.934 61.481,78.532 61.622,79.167C61.083,79.33 60.536,79.477 59.982,79.605C59.787,78.984 59.459,78.482 59.081,78.196C58.56,78.305 58.034,78.397 57.503,78.472C57.245,78.87 57.108,79.454 57.136,80.104C56.577,80.17 56.013,80.219 55.444,80.25C55.359,79.604 55.121,79.053 54.798,78.706C54.533,78.715 54.267,78.719 54,78.719C53.733,78.719 53.467,78.715 53.202,78.706C52.879,79.053 52.641,79.604 52.556,80.25C51.987,80.219 51.423,80.17 50.864,80.104C50.892,79.454 50.755,78.87 50.497,78.472C49.966,78.397 49.44,78.305 48.919,78.196C48.541,78.482 48.213,78.984 48.018,79.605C47.464,79.477 46.917,79.33 46.378,79.167C46.519,78.532 46.486,77.934 46.303,77.497C45.792,77.33 45.289,77.146 44.793,76.947C44.372,77.164 43.962,77.601 43.662,78.178C43.14,77.955 42.627,77.715 42.124,77.46C42.374,76.859 42.445,76.263 42.339,75.801C41.867,75.548 41.405,75.28 40.952,74.999C40.499,75.138 40.019,75.496 39.623,76.013C39.149,75.703 38.685,75.377 38.233,75.038C38.583,74.488 38.755,73.913 38.73,73.44C38.312,73.111 37.904,72.768 37.508,72.413C37.038,72.47 36.502,72.74 36.021,73.18C35.608,72.793 35.207,72.392 34.82,71.979C35.26,71.498 35.53,70.962 35.587,70.492C35.232,70.096 34.889,69.688 34.56,69.27C34.087,69.245 33.512,69.417 32.962,69.767C32.623,69.315 32.297,68.851 31.987,68.377C32.504,67.981 32.862,67.501 33.001,67.048C32.72,66.595 32.452,66.133 32.199,65.661C31.737,65.555 31.141,65.626 30.54,65.876C30.285,65.373 30.045,64.86 29.822,64.338C30.399,64.038 30.836,63.628 31.053,63.207C30.854,62.711 30.67,62.208 30.503,61.697C30.066,61.514 29.468,61.481 28.833,61.622C28.67,61.083 28.523,60.536 28.395,59.982C29.016,59.787 29.518,59.459 29.804,59.081C29.695,58.56 29.603,58.034 29.528,57.503C29.13,57.245 28.546,57.108 27.896,57.136C27.83,56.577 27.781,56.013 27.75,55.444C28.396,55.359 28.947,55.121 29.294,54.798C29.285,54.533 29.281,54.267 29.281,54C29.281,53.733 29.285,53.467 29.294,53.202C28.947,52.879 28.396,52.641 27.75,52.556C27.781,51.987 27.83,51.423 27.896,50.864C28.546,50.892 29.13,50.755 29.528,50.497C29.603,49.966 29.695,49.44 29.804,48.919C29.518,48.541 29.016,48.213 28.395,48.018C28.523,47.464 28.67,46.917 28.833,46.378C29.468,46.519 30.066,46.486 30.503,46.303ZM54,75.637C54.725,75.637 55.313,75.05 55.313,74.325C55.313,73.6 54.725,73.012 54,73.012C53.275,73.012 52.688,73.6 52.688,74.325C52.688,75.05 53.275,75.637 54,75.637ZM33.422,60.686C33.646,61.376 34.386,61.753 35.076,61.529C35.765,61.305 36.142,60.564 35.918,59.875C35.694,59.186 34.954,58.808 34.264,59.032C33.575,59.256 33.198,59.997 33.422,60.686ZM41.282,36.495C40.696,36.921 40.566,37.742 40.992,38.328C41.418,38.915 42.238,39.045 42.825,38.619C43.411,38.193 43.541,37.372 43.115,36.785C42.689,36.199 41.868,36.069 41.282,36.495ZM74.578,60.686C74.802,59.997 74.425,59.256 73.736,59.032C73.046,58.808 72.306,59.186 72.082,59.875C71.858,60.564 72.235,61.305 72.924,61.529C73.614,61.753 74.354,61.376 74.578,60.686ZM66.718,36.495C66.132,36.069 65.311,36.199 64.885,36.785C64.459,37.372 64.589,38.193 65.175,38.619C65.762,39.045 66.582,38.915 67.008,38.328C67.434,37.742 67.304,36.921 66.718,36.495Z"
+              android:strokeWidth="0" />
+      </group>
+  </group>
+</vector>