more error events

Author: ajungg

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

@@ -294,5 +294,21 @@ 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);
+        if (project == null) {
+            List<Project> projects = Snabble.getInstance().getProjects();
+            if (projects != null && projects.size() > 0) {
+                project = projects.get(0);
+            }
+        }
 
+        if (project != null) {
+            project.logErrorEvent(format, args);
+        }
+    }
 }

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

@@ -22,6 +22,7 @@
 import javax.crypto.spec.OAEPParameterSpec;
 import javax.crypto.spec.PSource;
 
+import io.snabble.sdk.Events;
 import io.snabble.sdk.PaymentMethod;
 import io.snabble.sdk.R;
 import io.snabble.sdk.Snabble;
@@ -567,11 +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");
                 return false;
             }
         }
 
         if (type == Type.CREDIT_CARD) {
+            Events.logErrorEvent(null, "removing payment credentials: old credit card type");
             return false;
         }
 
@@ -582,6 +585,7 @@ public boolean validate() {
             }
         }
 
+        Events.logErrorEvent(null, "removing payment credentials: different gateway certificate signature");
         return false;
     }
 

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

@@ -15,6 +15,7 @@
 import java.util.concurrent.CopyOnWriteArrayList;
 
 import io.snabble.sdk.Environment;
+import io.snabble.sdk.Events;
 import io.snabble.sdk.PaymentMethod;
 import io.snabble.sdk.Project;
 import io.snabble.sdk.Snabble;
@@ -180,8 +181,7 @@ public void removeInvalidCredentials() {
             Snabble snabble = Snabble.getInstance();
             if (snabble.getProjects().size() > 0) {
                 if (removals.size() > 0) {
-                    snabble.getProjects().get(0).getEvents()
-                            .log("Deleted payment credentials because device is not secure anymore. Lost access to %d payment credentials", removals.size());
+                    Events.logErrorEvent(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/security/KeyStoreCipherMarshmallow.java

@@ -8,6 +8,7 @@
 
 import androidx.annotation.RequiresApi;
 
+import java.security.Key;
 import java.security.KeyStore;
 import java.security.KeyStoreException;
 import java.util.Date;
@@ -48,8 +49,6 @@ public class KeyStoreCipherMarshmallow extends KeyStoreCipher {
     private boolean createKeys() {
         try {
             if (!isKeyAccessible()) {
-                keyStore.deleteEntry(alias);
-
                 KeyGenerator keyGenerator = KeyGenerator.getInstance(KeyProperties.KEY_ALGORITHM_AES, ANDROID_KEY_STORE);
                 KeyGenParameterSpec.Builder spec = new KeyGenParameterSpec.Builder(alias,
                         KeyProperties.PURPOSE_ENCRYPT | KeyProperties.PURPOSE_DECRYPT);
@@ -87,13 +86,16 @@ private boolean isKeyAccessible() {
         try {
             Cipher c = Cipher.getInstance(AES_MODE);
             IvParameterSpec ivParameterSpec = new IvParameterSpec(FIXED_IV);
-            c.init(Cipher.ENCRYPT_MODE, keyStore.getKey(alias, null), ivParameterSpec);
+            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());
             return false;
         }
     }