added error logging to Logger

Author: ajungg

core/src/main/java/io/snabble/sdk/Events.java

@@ -295,8 +295,6 @@ public EventType getEventType() {
     }
 
     public static void logErrorEvent(String projectId, String format, Object... args) {
-        Logger.d(format, args);
-
         // since we have no error logging without a project, we try to find the project by id
         // and if no project is found we just use the first project to at least log it to something
         Project project = Snabble.getInstance().getProjectById(projectId);

core/src/main/java/io/snabble/sdk/Snabble.java

@@ -86,6 +86,8 @@ public void setup(Application app, Config config, final SetupCompletionListener
         this.application = app;
         this.config = config;
 
+        Logger.setErrorEventHandler((message, args) -> Events.logErrorEvent(null, message, args));
+
         if (config.appId == null || config.secret == null) {
             setupCompletionListener.onError(Error.CONFIG_PARAMETER_MISSING);
             return;

core/src/main/java/io/snabble/sdk/payment/PaymentCredentials.java

@@ -568,13 +568,13 @@ public boolean validate() {
         if (type == Type.CREDIT_CARD_PSD2) {
             Date date = new Date(validTo);
             if (date.getTime() < System.currentTimeMillis()) {
-                Events.logErrorEvent(null, "removing payment credentials: expired");
+                Logger.errorEvent(null, "removing payment credentials: expired");
                 return false;
             }
         }
 
         if (type == Type.CREDIT_CARD) {
-            Events.logErrorEvent(null, "removing payment credentials: old credit card type");
+            Logger.errorEvent(null, "removing payment credentials: old credit card type");
             return false;
         }
 
@@ -585,7 +585,7 @@ public boolean validate() {
             }
         }
 
-        Events.logErrorEvent(null, "removing payment credentials: different gateway certificate signature");
+        Logger.errorEvent(null, "removing payment credentials: different gateway certificate signature");
         return false;
     }
 

core/src/main/java/io/snabble/sdk/payment/PaymentCredentialsStore.java

@@ -181,7 +181,7 @@ public void removeInvalidCredentials() {
             Snabble snabble = Snabble.getInstance();
             if (snabble.getProjects().size() > 0) {
                 if (removals.size() > 0) {
-                    Events.logErrorEvent(null, "Deleted payment credentials because device is not secure anymore. Lost access to %d payment credentials", removals.size());
+                    Logger.errorEvent(null, "Deleted payment credentials because device is not secure anymore. Lost access to %d payment credentials", removals.size());
                 }
             }
         }

utils/src/main/java/io/snabble/sdk/utils/Logger.java

@@ -13,6 +13,7 @@ public class Logger {
     private static final int CALL_STACK_INDEX = 2;
 
     private static boolean isEnabled = BuildConfig.DEBUG;
+    private static ErrorEventHandler errorEventHandler = null;
 
     public static void setEnabled(boolean enable) {
         isEnabled = enable;
@@ -85,4 +86,19 @@ public static void v(String message, Object... args) {
             }
         }
     }
+
+    public interface ErrorEventHandler {
+        void logErrorEvent(String message, Object... args);
+    }
+
+    public static void setErrorEventHandler(ErrorEventHandler e) {
+        errorEventHandler = e;
+    }
+
+    public static void errorEvent(String message, Object... args) {
+        ErrorEventHandler e = errorEventHandler;
+        if (e != null) {
+            e.logErrorEvent(message, args);
+        }
+    }
 }

utils/src/main/java/io/snabble/sdk/utils/security/KeyStoreCipherMarshmallow.java

@@ -89,13 +89,10 @@ private boolean isKeyAccessible() {
             Key key = keyStore.getKey(alias, null);
             c.init(Cipher.ENCRYPT_MODE, key, ivParameterSpec);
             return true;
-        } catch (KeyPermanentlyInvalidatedException e) {
-            Logger.d("KeyPermanentlyInvalidatedException: " + e.getMessage());
-            return false;
         } catch (UserNotAuthenticatedException e) {
             return true;
         } catch (Exception e) {
-            Logger.d(e.getClass().getName() + ": " + e.getMessage());
+            Logger.errorEvent("KeyStore inaccessible: " + e.getClass().getName() + ": " + e.getMessage());
             return false;
         }
     }