Avoid recreating Coupons on Project instances to keep observers working on updates

Author: rekire

CHANGELOG.md

@@ -1,6 +1,11 @@
 # Changelog
 All notable changes to this project will be documented in this file.
 
+## [0.50.3]
+
+### Fixed
+- Interrupted coupons observer
+
 ## [0.50.2]
 
 ### Fixed

build.gradle

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

core/src/main/java/io/snabble/sdk/Coupons.kt

@@ -1,5 +1,6 @@
 package io.snabble.sdk
 
+import android.os.Looper
 import android.os.Parcelable
 import androidx.annotation.Keep
 import androidx.lifecycle.LiveData
@@ -69,9 +70,8 @@ enum class CouponSource {
 }
 
 class Coupons (
-    coupons: List<Coupon>,
     private val project: Project
-) : Iterable<Coupon>, LiveData<List<Coupon>>(coupons) {
+) : Iterable<Coupon>, LiveData<List<Coupon>>() {
     val source: LiveData<CouponSource> = MutableLiveData(CouponSource.Bundled)
     val isLoading: LiveData<Boolean> = MutableLiveData(false)
 
@@ -97,16 +97,19 @@ class Coupons (
 
     fun update() {
         if (isLoading.value == true) return
-        // make an implicit cast with an extension function
-        fun <T> LiveData<T>.postValue(value: T) {
-            (this as? MutableLiveData<T>)?.postValue(value)
+        fun <T> LiveData<T>.setAsap(value: T) {
+            if (Looper.getMainLooper().thread.id == Thread.currentThread().id) {
+                (this as MutableLiveData<T>).value = value
+            } else {
+                (this as MutableLiveData<T>).postValue(value)
+            }
         }
         project.urls["coupons"]?.let { path ->
-            isLoading.postValue(true)
+            isLoading.setAsap(true)
             val newsUrl = Snabble.getInstance().absoluteUrl(path)
 
             if (newsUrl == null) {
-                postValue(emptyList())
+                setProjectCoupons(emptyList())
                 return
             }
 
@@ -117,8 +120,8 @@ class Coupons (
             couponCall.enqueue(object : Callback {
                 override fun onFailure(call: Call, e: IOException) {
                     postValue(emptyList())
-                    isLoading.postValue(false)
-                    source.postValue(CouponSource.Online)
+                    isLoading.setAsap(false)
+                    source.setAsap(CouponSource.Online)
                 }
 
                 override fun onResponse(call: Call, response: Response) {
@@ -128,14 +131,23 @@ class Coupons (
                         postValue(localizedResponse.coupons.filter { coupon ->
                             coupon.isValid
                         })
-                        source.postValue(CouponSource.Online)
+                        source.setAsap(CouponSource.Online)
                     }
-                    isLoading.postValue(false)
+                    isLoading.setAsap(false)
                 }
             })
         }
     }
 
+    // Visibility for Project class. Used for setting the data asap if on main thread
+    internal fun setProjectCoupons(coupons: List<Coupon>) {
+        if (Looper.getMainLooper().thread.id == Thread.currentThread().id) {
+            value = coupons
+        } else {
+            postValue(coupons)
+        }
+    }
+
     @Keep
     private data class CouponResponse(
         val coupons: List<Coupon>

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

@@ -76,7 +76,7 @@ public class Project {
     private PriceOverrideTemplate[] priceOverrideTemplates;
     private String[] searchableTemplates;
     private PriceFormatter priceFormatter;
-    private Coupons coupons;
+    private final Coupons coupons;
     private Map<String, String> texts;
 
     private int maxOnlinePaymentLimit;
@@ -89,6 +89,7 @@ public class Project {
 
     Project(JsonObject jsonObject) throws IllegalArgumentException {
         snabble = Snabble.getInstance();
+        coupons = new Coupons(this);
 
         parse(jsonObject);
 
@@ -317,7 +318,7 @@ void parse(JsonObject jsonObject) {
             Logger.e("Could not parse coupons");
         }
 
-        this.coupons = new Coupons(couponList, this);
+        this.coupons.setProjectCoupons$core_debug(couponList); // call internal setProjectCoupons
 
         notifyUpdate();
     }