Merge branch 'master' into taxation

Author: ajungg

CHANGELOG.md

@@ -1,6 +1,16 @@
 # Changelog  
 All notable changes to this project will be documented in this file.
 
+## [0.42.2]
+
+### Fixed
+- Fixed NullPointerException introduced in 0.42.1
+
+## [0.42.1]
+
+### Fixed
+- Only update prices when the shop differs, not always when setCheckedInShop is called
+
 ## [0.42.0]
 
 ### Changed

build.gradle

@@ -31,7 +31,7 @@ allprojects {
     }
 
     project.ext {
-        sdkVersion='0.42.0'
+        sdkVersion='0.42.2'
         versionCode=1
 
         compileSdkVersion=30

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

@@ -483,9 +483,14 @@ public String getText(String key, String defaultValue) {
      * payment process.
      */
     public void setCheckedInShop(Shop checkedInShop) {
-        this.checkedInShop = checkedInShop;
-        events.updateShop(checkedInShop);
-        getShoppingCart().updatePrices(false);
+        String currentShopId = this.checkedInShop != null ? this.checkedInShop.getId() : "";
+        String newShopId = checkedInShop != null ? checkedInShop.getId() : "";
+
+        if (!currentShopId.equals(newShopId)) {
+            this.checkedInShop = checkedInShop;
+            events.updateShop(checkedInShop);
+            getShoppingCart().updatePrices(false);
+        }
     }
 
     public Shop getCheckedInShop() {