Merge branch 'updating-google-location-service' into code-cov-refactor

onaio · Aug 19, 2024 · 05b3d8d · 05b3d8d
2 parents b498ec0 + 03e75b6
commit 05b3d8d
Show file tree

Hide file tree

Showing 10 changed files with 56 additions and 32 deletions.
diff --git a/.github/workflows/library.yml b/.github/workflows/library.yml
@@ -17,17 +17,17 @@ env:
 
 jobs:
   release:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
     steps:
       - name: Cancel previous workflow runs
         uses: styfle/[email protected]
         with:
-          access_token: ${{ github.token }} 
+          access_token: ${{ github.token }}
 
       - name: Checkout 🛎️
         uses: actions/checkout@v4
 
-      - name: Set up JDK 17
+      - name: Set up JDK 11
         uses: actions/setup-java@v1
         with:
           distribution: temurin
@@ -53,7 +53,7 @@ jobs:
 
       - name: Build project skipping tests
         run: ./gradlew build -x test --stacktrace
-
+        
       - name: Run Instrumented Tests manually
         uses: reactivecircus/android-emulator-runner@v2
         with:
@@ -62,7 +62,6 @@ jobs:
 
       - name: Run unit tests with Gradle
         run: ./gradlew :library:clean :library:testDebugUnitTest --stacktrace
-
       - name: Generate & upload library snapshot artifact AAR (Android Archive) file
         run: ./gradlew :library:clean --stacktrace && ./gradlew :library:assembleRelease --stacktrace && ./gradlew :library:publishMavenJavaPublicationToMavenCentralRepository --stacktrace
 
@@ -72,4 +71,4 @@ jobs:
       - name: Github Release
         uses: softprops/action-gh-release@v1
         with:
-          prerelease: ${{ contains(github.ref, '-alpha') || contains(github.ref, '-beta') }}
+          prerelease: ${{ contains(github.ref, '-alpha') || contains(github.ref, '-beta') }}
diff --git a/configs.gradle b/configs.gradle
@@ -109,7 +109,6 @@ ext {
     junitVersion = "4.13.2"
     mapboxAnnotationPluginVersion = "0.9.0"
     mapboxSdkVersion = "9.7.1"
-    robolectricShadowsMultidexVersion = "4.13"
     robolectricVersion = "4.13"
     supportVersion = "1.0.0"
     volleyVersion = "1.2.1"
@@ -122,7 +121,7 @@ ext {
     mapboxSDKTurf = "com.mapbox.mapboxsdk:mapbox-sdk-turf:4.8.0"
     mapboxAnnotationPlugin = "com.mapbox.mapboxsdk:mapbox-android-plugin-annotation-v9:$mapboxAnnotationPluginVersion"
     robolectric = "org.robolectric:robolectric:$robolectricVersion"
-    robolectricShadowsMultidex = "org.robolectric:shadows-multidex:$robolectricShadowsMultidexVersion"
+    robolectricShadowsMultidex = "org.robolectric:shadows-multidex:$robolectricVersion"
 }
 
 

diff --git a/library/build.gradle b/library/build.gradle
@@ -13,7 +13,7 @@ buildscript {
 apply plugin: 'realm-android'
 apply plugin: 'maven-publish'
 
-version '0.10.2-SNAPSHOT'
+version '0.10.5-SNAPSHOT'
 
 project.version = this.version
 
@@ -120,9 +120,9 @@ dependencies { configuration ->
     implementation mapboxAnnotationPlugin
 
     // Comment the line below when creating releases - The line is for development of the library & utils
-//    implementation (project(":utils")) {
+    implementation (project(":utils")) {
     // Uncomment the line below when creating releases
-    implementation('io.ona.kujaku:utils:0.10.2-SNAPSHOT') {
+    //implementation('io.ona.kujaku:utils:0.10.5-SNAPSHOT') {
         transitive = true;
         exclude group: 'com.mapbox.mapboxsdk', module: 'mapbox-android-sdk'
         exclude group: 'com.android.support', module: 'support-v4'

diff --git a/library/src/main/AndroidManifest.xml b/library/src/main/AndroidManifest.xml
@@ -6,8 +6,11 @@
     <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/>
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
     <uses-permission android:name="android.permission.ACCESS_WIFI_STATE"/>
-    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"
+        android:maxSdkVersion="32" />
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"
+        android:maxSdkVersion="32" />
+    <uses-permission android:name="android.permission.MANAGE_EXTERNAL_STORAGE"/>
     <uses-permission android:name="android.permission.INTERNET"/>
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
     <uses-permission android:name="android.permission.WAKE_LOCK" />

diff --git a/library/src/main/java/io/ona/kujaku/helpers/PermissionsHelper.java b/library/src/main/java/io/ona/kujaku/helpers/PermissionsHelper.java
@@ -3,6 +3,7 @@
 import android.Manifest;
 import android.app.Activity;
 import android.content.Context;
+import android.os.Build;
 import android.util.Log;
 
 import com.karumi.dexter.Dexter;
@@ -19,7 +20,7 @@ public static void checkPermissions(String TAG, Context context) {
             MultiplePermissionsListener dialogMultiplePermissionListener = new KujakuMultiplePermissionListener(activity);
 
             Dexter.withActivity(activity)
-                    .withPermissions(Manifest.permission.ACCESS_FINE_LOCATION, Manifest.permission.WRITE_EXTERNAL_STORAGE)
+                    .withPermissions(Manifest.permission.ACCESS_FINE_LOCATION, (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) ? Manifest.permission.MANAGE_EXTERNAL_STORAGE : Manifest.permission.WRITE_EXTERNAL_STORAGE)
                     .withListener(dialogMultiplePermissionListener)
                     .check();
 

diff --git a/library/src/main/java/io/ona/kujaku/utils/KujakuMultiplePermissionListener.java b/library/src/main/java/io/ona/kujaku/utils/KujakuMultiplePermissionListener.java
@@ -34,9 +34,6 @@ public void onPermissionsChecked(MultiplePermissionsReport report) {
                     @Override public void onClick(DialogInterface dialog, int which) {
                         dialog.dismiss();
 
-                        if (context instanceof Activity) {
-                            ((Activity) context).finish();
-                        }
                     }
                 })
                 .show();

diff --git a/library/src/main/java/io/ona/kujaku/utils/Permissions.java b/library/src/main/java/io/ona/kujaku/utils/Permissions.java
@@ -5,6 +5,8 @@
 import android.content.Context;
 import android.content.Intent;
 import android.content.pm.PackageManager;
+import android.os.Build;
+
 import androidx.core.app.ActivityCompat;
 import androidx.core.content.ContextCompat;
 
@@ -16,30 +18,40 @@
  */
 
 public class Permissions {
-    private static final String[] CRITICAL_PERMISSIONS = new String[]{
-            Manifest.permission.READ_EXTERNAL_STORAGE,
-            Manifest.permission.WRITE_EXTERNAL_STORAGE
-    };
 
     /**
      * Returns {@link android.content.pm.PermissionInfo#PROTECTION_DANGEROUS} permissions which
-     * have not been requested yet/denied by the user from the list of {@link Permissions#CRITICAL_PERMISSIONS}
+     * have not been requested yet/denied by the user from the list of {@link Permissions}
      * required
      *
      * @param context
      * @return list of unauthorised permissions
      */
     public static String[] getUnauthorizedCriticalPermissions(Context context) {
+        String[] criticalPermissions;
+
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) { // Android 13 (API 33)
+            criticalPermissions = new String[]{
+                    Manifest.permission.MANAGE_EXTERNAL_STORAGE
+            };
+        } else {
+            criticalPermissions = new String[]{
+                    Manifest.permission.READ_EXTERNAL_STORAGE,
+                    Manifest.permission.WRITE_EXTERNAL_STORAGE
+            };
+        }
+
         List<String> unauthorizedPermissions = new ArrayList<>();
-        for (String curPermission : CRITICAL_PERMISSIONS) {
+        for (String curPermission : criticalPermissions) {
             if (!check(context, curPermission)) {
                 unauthorizedPermissions.add(curPermission);
             }
         }
 
-        return unauthorizedPermissions.toArray(new String[]{});
+        return unauthorizedPermissions.toArray(new String[0]);
     }
 
+
     /**
      * Checks if a specific application permission is authorised
      *

diff --git a/sample/.gitignore b/sample/.gitignore
@@ -1 +1,4 @@
 /build
+
+# Local configuration file (sdk path, etc)
+local.properties
diff --git a/sample/src/main/java/io/ona/kujaku/sample/activities/MainActivity.java b/sample/src/main/java/io/ona/kujaku/sample/activities/MainActivity.java
@@ -8,6 +8,7 @@
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.os.AsyncTask;
+import android.os.Build;
 import android.os.Bundle;
 import androidx.annotation.NonNull;
 import androidx.core.app.NotificationCompat;
@@ -68,10 +69,6 @@ public class MainActivity extends BaseNavigationDrawerActivity {
 
     private static final String SAMPLE_JSON_FILE_NAME = "2017-nov-27-kujaku-metadata.json";
     private static final int PERMISSIONS_REQUEST_CODE = 9823;
-    private String[] basicPermissions = new String[]{
-            Manifest.permission.WRITE_EXTERNAL_STORAGE,
-            Manifest.permission.READ_EXTERNAL_STORAGE
-    };
 
     // Kujaku library uses notification ids 80 to 2080
     private int lastNotificationId = 2081;
@@ -415,7 +412,8 @@ public void onErrorResponse(VolleyError error) {
 
     @Override
     protected void onActivityResult(int requestCode, int resultCode, Intent data) {
-        switch(requestCode) {
+        super.onActivityResult(requestCode, resultCode, data);
+        switch (requestCode) {
             case MAP_ACTIVITY_REQUEST_CODE:
                 if (resultCode == Activity.RESULT_OK) {
                     // data from a dropped feature point
@@ -490,15 +488,27 @@ public String readAssetFile(String inFile) {
 
     private void requestBasicPermissions() {
         ArrayList<String> notGivenPermissions = new ArrayList<>();
+        String[] basicPermissions;
+
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) { // Android 13 (API 33)
+            basicPermissions = new String[]{
+                    Manifest.permission.MANAGE_EXTERNAL_STORAGE
+            };
+        } else {
+            basicPermissions = new String[]{
+                    Manifest.permission.READ_EXTERNAL_STORAGE,
+                    Manifest.permission.WRITE_EXTERNAL_STORAGE
+            };
+        }
 
         for (String permission : basicPermissions) {
             if (!Permissions.check(this, permission)) {
                 notGivenPermissions.add(permission);
             }
         }
 
-        if (notGivenPermissions.size() > 0) {
-            Permissions.request(this, notGivenPermissions.toArray(new String[notGivenPermissions.size()]), PERMISSIONS_REQUEST_CODE);
+        if (!notGivenPermissions.isEmpty()) {
+            Permissions.request(this, notGivenPermissions.toArray(new String[0]), PERMISSIONS_REQUEST_CODE);
         } else {
             confirmSampleStyleAvailable();
         }

diff --git a/utils/build.gradle b/utils/build.gradle
@@ -2,7 +2,7 @@ apply plugin: 'com.android.library'
 apply plugin: 'maven-publish'
 apply plugin: 'jacoco'
 
-version '0.10.2-SNAPSHOT'
+version '0.10.5-SNAPSHOT'
 project.version = this.version