Merge branch 'master' of github.com:securenative/securenative-java into dev

Author: Inbal Tako

src/main/java/com/securenative/Logger.java

@@ -87,5 +87,3 @@ public void error(String var1, Object... var2) {
         }
     }
 }
-
-

src/main/java/com/securenative/models/SDKEvent.java

@@ -54,14 +54,16 @@ public SDKEvent(EventOptions event, SecureNativeOptions options) throws SecureNa
     }
 
     private ClientToken decryptToken(String token, String key) {
+        if (token == null || token.length() == 0) {
+             return new ClientToken();
+        }
         ObjectMapper mapper = new ObjectMapper();
         try {
             String decryptedClientToken = EncryptionUtils.decrypt(token, key);
             return mapper.readValue(decryptedClientToken, ClientToken.class);
         } catch (Exception ex) {
             logger.error("Failed to decrypt token");
         }
-
         return new ClientToken();
     }