Merge pull request #11 from ltrudu/master

A13 Freeze Fix
ZebraDevs · Oct 10, 2023 · 61cc00c · 61cc00c
2 parents 45e84b4 + 6f5da3f
commit 61cc00c
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 5 deletions.
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/DeviceIdentifiersWrapper/build.gradle b/DeviceIdentifiersWrapper/build.gradle
@@ -8,8 +8,8 @@ android {
     defaultConfig {
         minSdkVersion 19
         targetSdkVersion 33
-        versionCode 9
-        versionName "0.9"
+        versionCode 12
+        versionName "0.9.3"
 
         testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
 

diff --git a/...iersWrapper/src/main/java/com/zebra/deviceidentifierswrapper/DIProfileManagerCommand.java b/...iersWrapper/src/main/java/com/zebra/deviceidentifierswrapper/DIProfileManagerCommand.java
@@ -2,6 +2,7 @@
 
 import android.content.Context;
 import android.net.Uri;
+import android.os.Build;
 import android.text.TextUtils;
 import android.util.Log;
 import android.util.Xml;
@@ -65,6 +66,7 @@ public class ErrorHolder
         public void onStatus(EMDKManager.StatusData statusData, EMDKBase emdkBase) {
             if(statusData.getResult() == EMDKResults.STATUS_CODE.SUCCESS)
             {
+                logMessage("Profile manager retrieved.", EMessageType.DEBUG);
                 onProfileManagerInitialized((ProfileManager)emdkBase);
             }
             else
@@ -188,7 +190,21 @@ private void onEMDKManagerRetrieved(EMDKManager emdkManager)
         if(mProfileManager == null)
         {
             try {
-                emdkManager.getInstanceAsync(EMDKManager.FEATURE_TYPE.PROFILE, mStatusListener);
+                logMessage("Requesting profile manager.", EMessageType.DEBUG);
+                logMessage("Current API version: " + android.os.Build.VERSION.SDK_INT, EMessageType.VERBOSE);
+                if(android.os.Build.VERSION.SDK_INT < 33) {
+                    logMessage("Requesting profile manager Asynchonously", EMessageType.DEBUG);
+                    emdkManager.getInstanceAsync(EMDKManager.FEATURE_TYPE.PROFILE, mStatusListener);
+                }
+                else
+                {
+                    logMessage("Requesting profile manager synchronized", EMessageType.DEBUG);
+                    ProfileManager profileManager = (ProfileManager) emdkManager.getInstance(EMDKManager.FEATURE_TYPE.PROFILE);
+                    if(profileManager != null)
+                    {
+                        onProfileManagerInitialized(profileManager);
+                    }
+                }
             } catch (EMDKException e) {
                 logMessage("Error when trying to retrieve profile manager: " + e.getMessage(), EMessageType.ERROR);
             }
@@ -226,7 +242,7 @@ private void onProfileManagerInitialized(ProfileManager profileManager)
     {
         mProfileManager = profileManager;
         bInitializing = false;
-        logMessage("Profile Manager retrieved.", EMessageType.DEBUG);
+        logMessage("Processing MX Content", EMessageType.DEBUG);
         processMXContent();
     }
 
@@ -263,6 +279,7 @@ private void processMXContent()
         String[] params = new String[1];
         params[0] = msProfileData;
 
+        logMessage("Processing profile :" + msProfileData, EMessageType.VERBOSE);
         EMDKResults results = mProfileManager.processProfile(msProfileName, ProfileManager.PROFILE_FLAG.SET, params);
 
         //Check the return status of processProfile