Merge pull request #1 from ltrudu/master

Added functionalities and logs

Author: ltrudu

CriticalPermissionsHelper/build.gradle

@@ -13,8 +13,8 @@ android {
     defaultConfig {
         minSdkVersion 30
         targetSdkVersion 32
-        versionCode 2
-        versionName "0.2"
+        versionCode 3
+        versionName "0.3"
 
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
 
@@ -38,5 +38,5 @@ dependencies {
     testImplementation 'junit:junit:4.13'
     androidTestImplementation 'com.android.support.test:runner:1.0.2'
     androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
-    compileOnly 'com.symbol:emdk:+'
+    compileOnly 'com.symbol:emdk:9.1.1'
 }

CriticalPermissionsHelper/src/main/java/com/zebra/criticalpermissionshelper/ProfileManagerCommand.java

@@ -67,7 +67,18 @@ protected class ErrorHolder
         public void onStatus(EMDKManager.StatusData statusData, EMDKBase emdkBase) {
             if(statusData.getResult() == EMDKResults.STATUS_CODE.SUCCESS)
             {
-                onProfileManagerInitialized((ProfileManager)emdkBase);
+                ProfileManager profileManager = (ProfileManager)emdkBase;
+                if(profileManager != null)
+                    onProfileManagerInitialized(profileManager);
+                else
+                {
+                    logMessage("Casting error when retrieving ProfileManager.", EMessageType.ERROR);
+                    profileManager = (ProfileManager) mEMDKManager.getInstance(EMDKManager.FEATURE_TYPE.PROFILE);
+                    if(profileManager != null) {
+                        logMessage("Profile manager retrieved synchronously with success", EMessageType.VERBOSE);
+                        onProfileManagerInitialized(profileManager);
+                    }
+                }
             }
             else
             {
@@ -267,6 +278,30 @@ private void processMXContent()
         String[] params = new String[1];
         params[0] = msProfileData;
 
+        if(mProfileManager == null)
+        {
+            logMessage("ProcessMXContent : Error : ProfileManager == null", EMessageType.ERROR);
+            if(mEMDKManager != null) {
+                logMessage("ProcessMXContent : Trying to retrieve profileManager synchronously", EMessageType.ERROR);
+                ProfileManager profileManager = (ProfileManager) mEMDKManager.getInstance(EMDKManager.FEATURE_TYPE.PROFILE);
+                if (profileManager != null) {
+                        logMessage("ProcessMXContent, ProfileManager retrieved syncrhonously.",EMessageType.VERBOSE);
+                        mProfileManager = profileManager;
+                }
+                else
+                {
+                    logMessage("ProcessMXContent : Error : Could not retrieve ProfileManager syncrhonously.",EMessageType.VERBOSE);
+                    onProfileExecutedError("ProcessMXContent : Error : Could not retrieve ProfileManager syncrhonously.");
+                    return;
+                }
+            }
+            else {
+                logMessage("ProcessMXContent : Error : mEMDKManager == null", EMessageType.ERROR);
+                onProfileExecutedError("ProcessMXContent : Error : mEMDKManager == null");
+                return;
+            }
+        }
+
         EMDKResults results = mProfileManager.processProfile(msProfileName, ProfileManager.PROFILE_FLAG.SET, params);
 
         //Check the return status of processProfile