add null check for key store cipher

Author: ajungg

CHANGELOG.md

@@ -1,6 +1,11 @@
 # Changelog
 All notable changes to this project will be documented in this file.
 
+## [0.49.1]
+
+### Fixed
+- Bypass KeyStoreCipher when it can not be created
+
 ## [0.49.0]
 
 ### Important Changes

build.gradle

@@ -31,7 +31,7 @@ allprojects {
     }
 
     project.ext {
-        sdkVersion='0.49.0'
+        sdkVersion='0.49.1'
         versionCode=1
 
         compileSdkVersion=31

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

@@ -69,20 +69,22 @@ private void initializeKeyStore() {
     private void ensureKeyStoreIsAccessible() {
         initializeKeyStore();
 
-        keyStoreCipher.validate();
-
-        String id = keyStoreCipher.id();
-        if (id == null) {
-            Logger.errorEvent("Keystore has no id!");
-            keyStoreCipher = null;
-            return;
-        }
+        if (keyStoreCipher != null) {
+            keyStoreCipher.validate();
+
+            String id = keyStoreCipher.id();
+            if (id == null) {
+                Logger.errorEvent("Keystore has no id!");
+                keyStoreCipher = null;
+                return;
+            }
 
-        if (!id.equals(data.id)) {
-            data.id = keyStoreCipher.id();
-            data.isKeyguarded = true;
-            Logger.errorEvent("Removing payment credentials, because key store id differs");
-            removeInvalidCredentials();
+            if (!id.equals(data.id)) {
+                data.id = keyStoreCipher.id();
+                data.isKeyguarded = true;
+                Logger.errorEvent("Removing payment credentials, because key store id differs");
+                removeInvalidCredentials();
+            }
         }
 
         Context context = Snabble.getInstance().getApplication();