Merge branch 'master' into master

ltrudu · web-flow · commit 2d2e7d97f65d · 2024-09-19T16:19:59.000+02:00
diff --git a/CriticalPermissionsHelper/build.gradle b/CriticalPermissionsHelper/build.gradle
@@ -4,17 +4,17 @@ plugins {
 ext {
     PUBLISH_GROUP_ID = 'com.zebra.criticalpermissionshelper'
     PUBLISH_ARTIFACT_ID = 'criticalpermissionshelper'
-    PUBLISH_VERSION = '0.7'
+    PUBLISH_VERSION = '0.8.2'
 }
 
 android {
-    compileSdkVersion 32
+    compileSdkVersion 34
 
     defaultConfig {
         minSdkVersion 30
-        targetSdkVersion 32
-        versionCode 7
-        versionName "0.7"
+        targetSdkVersion 34
+        versionCode 9
+        versionName "0.8.2"
 
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
 
diff --git a/CriticalPermissionsHelper/src/main/java/com/zebra/criticalpermissionshelper/CriticalPermissionsHelper.java b/CriticalPermissionsHelper/src/main/java/com/zebra/criticalpermissionshelper/CriticalPermissionsHelper.java
@@ -43,6 +43,23 @@ private enum EPermissionAccessAction
         public String toString() {
             return stringContent;
         }
+
+        public static EPermissionAccessAction fromString(String permissionAction)
+        {
+            switch(permissionAction)
+            {
+                case "1":
+                    return GRANT_PERMISSION;
+                case "2":
+                    return DENY_PERMISSION;
+                case "3":
+                    return ALLOW_USER_TO_CHOOSE;
+                case "4":
+                    return VERIFY;
+                default:
+                    return null;
+            }
+        }
     };
 
     // MX10.0 Permissions
diff --git a/CriticalPermissionsHelper/src/main/java/com/zebra/criticalpermissionshelper/EMessageType.java b/CriticalPermissionsHelper/src/main/java/com/zebra/criticalpermissionshelper/EMessageType.java
@@ -1,9 +1,34 @@
 package com.zebra.criticalpermissionshelper;
 
 enum EMessageType {
-    VERBOSE,
-    WARNING,
-    ERROR,
-    SUCCESS,
-    DEBUG
+    VERBOSE("VERBOSE"),
+    WARNING("WARNING"),
+    ERROR("ERROR"),
+    SUCCESS("SUCCESS"),
+    DEBUG("DEBUG");
+
+    String stringContent = "";
+    EMessageType(String stringContent) { this.stringContent = stringContent;}
+
+    public String toString() {
+        return stringContent;
+    }
+
+    public static EMessageType fromString(String messageType)
+    {
+        switch(messageType) {
+            case "VERBOSE":
+                return VERBOSE;
+            case "WARNING":
+                return WARNING;
+            case "Error":
+                return ERROR;
+            case "SUCCESS":
+                return SUCCESS;
+            case "DEBUG":
+                return DEBUG;
+            default:
+                return null;
+        }
+    }
 }
diff --git a/CriticalPermissionsHelper/src/main/java/com/zebra/criticalpermissionshelper/EPermissionType.java b/CriticalPermissionsHelper/src/main/java/com/zebra/criticalpermissionshelper/EPermissionType.java
@@ -2,15 +2,15 @@
 
 public enum EPermissionType
 {
-    ACCESS_NOTIFICATIONS(       "android.permission.ACCESS_NOTIFICATIONS"),
-    PACKAGE_USAGE_STATS(        "android.permission.PACKAGE_USAGE_STATS"),
-    SYSTEM_ALERT_WINDOW(        "android.permission.SYSTEM_ALERT_WINDOW"),
-    GET_APP_OPS_STATS(          "android.permission.GET_APP_OPS_STATS"),
-    BATTERY_STATS(              "android.permission.BATTERY_STATS"),
-    MANAGE_EXTERNAL_STORAGE(    "android.permission.MANAGE_EXTERNAL_STORAGE"),
-    BIND_NOTIFICATION_LISTENER(    "android.permission.BIND_NOTIFICATION_LISTENER"),
-    READ_LOGS(    "android.permission.READ_LOGS"),
-    ALL_DANGEROUS_PERMISSIONS( "ALL_DANGEROUS_PERMISSIONS");
+    ACCESS_NOTIFICATIONS(           "android.permission.ACCESS_NOTIFICATIONS"           ),
+    PACKAGE_USAGE_STATS(            "android.permission.PACKAGE_USAGE_STATS"            ),
+    SYSTEM_ALERT_WINDOW(            "android.permission.SYSTEM_ALERT_WINDOW"            ),
+    GET_APP_OPS_STATS(              "android.permission.GET_APP_OPS_STATS"              ),
+    BATTERY_STATS(                  "android.permission.BATTERY_STATS"                  ),
+    MANAGE_EXTERNAL_STORAGE(        "android.permission.MANAGE_EXTERNAL_STORAGE"        ),
+    BIND_NOTIFICATION_LISTENER(     "android.permission.BIND_NOTIFICATION_LISTENER"     ),
+    READ_LOGS(                      "android.permission.READ_LOGS"                      ),
+    ALL_DANGEROUS_PERMISSIONS(      "ALL_DANGEROUS_PERMISSIONS"                         );
 
     String stringContent = "";
     EPermissionType(String stringContent)
@@ -22,4 +22,31 @@ public enum EPermissionType
     public String toString() {
         return stringContent;
     }
+
+    public static EPermissionType fromString(String permissionType)
+    {
+        switch(permissionType)
+        {
+            case "android.permission.ACCESS_NOTIFICATIONS":
+                return ACCESS_NOTIFICATIONS;
+            case "android.permission.PACKAGE_USAGE_STATS":
+                return PACKAGE_USAGE_STATS;
+            case "android.permission.SYSTEM_ALERT_WINDOW":
+                return SYSTEM_ALERT_WINDOW;
+            case "android.permission.GET_APP_OPS_STATS":
+                return GET_APP_OPS_STATS;
+            case "android.permission.BATTERY_STATS":
+                return BATTERY_STATS;
+            case "android.permission.MANAGE_EXTERNAL_STORAGE":
+                return MANAGE_EXTERNAL_STORAGE;
+            case "android.permission.BIND_NOTIFICATION_LISTENER":
+                return BIND_NOTIFICATION_LISTENER;
+            case "android.permission.READ_LOGS":
+                return READ_LOGS;
+            case "ALL_DANGEROUS_PERMISSIONS":
+                return ALL_DANGEROUS_PERMISSIONS;
+            default:
+                return null;
+        }
+    }
 }
diff --git a/CriticalPermissionsHelper/src/main/java/com/zebra/criticalpermissionshelper/ProfileManagerCommand.java b/CriticalPermissionsHelper/src/main/java/com/zebra/criticalpermissionshelper/ProfileManagerCommand.java
@@ -32,7 +32,7 @@ protected class ErrorHolder
     }
 
     // Membres
-    private String TAG = "DIWrapperMX";
+    private String TAG = "CPHWrapperMX";
 
     // Callback interface to get the hand back when the profile has been executed
     private IResultCallbacks idiProfileManagerCommandResult = null;
diff --git a/README.md b/README.md
@@ -1,12 +1,11 @@
 *Please be aware that this library / application / sample is provided as a community project without any guarantee of support*
 =========================================================
+# CriticalPermissionsHelper
 
 [![](https://jitpack.io/v/ltrudu/CriticalPermissionsHelper.svg)](https://jitpack.io/#ltrudu/CriticalPermissionsHelper)
 [![](https://jitpack.io/v/ltrudu/CriticalPermissionsHelper/month.svg)](https://jitpack.io/#ltrudu/CriticalPermissionsHelper)
 
 
-# CriticalPermissionsHelper
-
 ## Easy grant critical permissions to your Zebra's device
 
 Forget about AccessMgr, StageNow, EMDK, certificates, application signature... complexity....
diff --git a/settings.gradle b/settings.gradle
@@ -4,7 +4,9 @@ pluginManagement {
         google()
         mavenCentral()
         jcenter()
-        maven { url 'https://jitpack.io' }
+        maven {
+            url = "https://zebratech.jfrog.io/artifactory/EMDK-Android/"
+        }
     }
 }
 dependencyResolutionManagement {
@@ -13,7 +15,9 @@ dependencyResolutionManagement {
         google()
         mavenCentral()
         jcenter()
-        maven { url 'https://jitpack.io' }
+        maven {
+            url = "https://zebratech.jfrog.io/artifactory/EMDK-Android/"
+        }
     }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ protected class ErrorHolder`
`32`	`32`	`}`
`33`	`33`
`34`	`34`	`// Membres`
`35`		`- private String TAG = "DIWrapperMX";`
	`35`	`+ private String TAG = "CPHWrapperMX";`
`36`	`36`
`37`	`37`	`// Callback interface to get the hand back when the profile has been executed`
`38`	`38`	`private IResultCallbacks idiProfileManagerCommandResult = null;`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,9 @@ pluginManagement {`
`4`	`4`	`google()`
`5`	`5`	`mavenCentral()`
`6`	`6`	`jcenter()`
`7`		`- maven { url 'https://jitpack.io' }`
	`7`	`+ maven {`
	`8`	`+ url = "https://zebratech.jfrog.io/artifactory/EMDK-Android/"`
	`9`	`+ }`
`8`	`10`	`}`
`9`	`11`	`}`
`10`	`12`	`dependencyResolutionManagement {`
`@@ -13,7 +15,9 @@ dependencyResolutionManagement {`
`13`	`15`	`google()`
`14`	`16`	`mavenCentral()`
`15`	`17`	`jcenter()`
`16`		`- maven { url 'https://jitpack.io' }`
	`18`	`+ maven {`
	`19`	`+ url = "https://zebratech.jfrog.io/artifactory/EMDK-Android/"`
	`20`	`+ }`
`17`	`21`	`}`
`18`	`22`	`}`
`19`	`23`