added more log information

Author: ltrudu

.idea/.name

@@ -27,8 +27,10 @@ public class DIHelper {
     protected static String sIMEI = null;
     protected static String sSerialNumber = null;
 
-    private static final long MIN_IN_MS = 1000 * 60;
+    public static final long SEC_IN_MS = 1000;
+    public static final long MIN_IN_MS = SEC_IN_MS * 60;
     public static long MAX_EMDK_TIMEOUT_IN_MS = 10 * MIN_IN_MS; // 10 minutes
+    public static long WAIT_PERIOD_BEFORE_RETRY_EMDK_RETRIEVAL_IN_MS = 2 * SEC_IN_MS; // 2 seconds
 
     public static void resetCachedValues()
     {

.idea/gradle.xml

@@ -152,20 +152,25 @@ private void initializeEMDK()
 
     private void waitForEMDK()
     {
+        logMessage("EMDKManager error, this could be a BOOT_COMPLETED issue.", EMessageType.DEBUG);
+        logMessage("Starting watcher thread to wait for EMDK initialization.", EMessageType.DEBUG);
         Thread t = new Thread(new Runnable() {
             @Override
             public void run() {
                 long startDate = new Date().getTime();
                 long delta = 0;
-                long maxWait = 1000 * 60 * 10; // We will try for 10 mns... before stopping
                 while(mEMDKManager == null || delta < DIHelper.MAX_EMDK_TIMEOUT_IN_MS ) {
+                    // Try to initialize EMDK
+                    logMessage("Calling EMDK Initialization method", EMessageType.DEBUG);
                     initializeEMDK();
                     try {
-                        Thread.sleep(5000);
+                        logMessage("Waiting " + DIHelper.WAIT_PERIOD_BEFORE_RETRY_EMDK_RETRIEVAL_IN_MS + " milliseconds before retrying.", EMessageType.DEBUG);
+                        Thread.sleep(DIHelper.WAIT_PERIOD_BEFORE_RETRY_EMDK_RETRIEVAL_IN_MS);
                     } catch (InterruptedException e) {
                         e.printStackTrace();
                     }
                     delta = new Date().getTime() - startDate;
+                    logMessage("Delta in ms since first EMDK retrieval try: " + delta + "ms stops at " + DIHelper.MAX_EMDK_TIMEOUT_IN_MS + "ms", EMessageType.DEBUG);
                 }
             }
         });

DeviceIdentifiersWrapper/src/main/java/com/zebra/deviceidentifierswrapper/DIHelper.java

@@ -1,2 +1,2 @@
-include ':SampleApplication',':DeviceIdentifiersWrapper'
-rootProject.name = "EMDK-DeviceIdentifiers-Sample"
+include ':DeviceIdentifiersWrapper'
+rootProject.name = "DeviceIdentifiersWrapper"