allow skip full database updates, removed automatic product updates from cart

Author: ajungg

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

@@ -438,6 +438,19 @@ synchronized void applyFullUpdate(InputStream inputStream) throws IOException {
         Logger.d("Full update took %d ms", time2);
     }
 
+    /**
+     * Updates the current database in the background by requesting new data from the backend.
+     * <p>
+     * Updates can be either delta updates or full updates depending on how big the difference between
+     * the last update was.
+     * <p>
+     * While updating, the database can still be queried for data, after the update completes calls to the database
+     * return the updated data.
+     */
+    public void update() {
+        update(null);
+    }
+
     /**
      * Updates the current database in the background by requesting new data from the backend.
      * <p>
@@ -451,12 +464,29 @@ synchronized void applyFullUpdate(InputStream inputStream) throws IOException {
      *                 Or error() in case a network error occurred.
      */
     public void update(final UpdateCallback callback) {
+        update(callback, false);
+    }
+
+    /**
+     * Updates the current database in the background by requesting new data from the backend.
+     * <p>
+     * Updates can be either delta updates or full updates depending on how big the difference between
+     * the last update was.
+     * <p>
+     * While updating, the database can still be queried for data, after the update completes calls to the database
+     * return the updated data.
+     *
+     * @param callback A {@link UpdateCallback} that returns success when the operation is successfully completed.
+     *                 Or error() in case a network error occurred. Can be null.
+     * @param deltaUpdateOnly set to true if you want to only update when the update would be an delta update
+     */
+    public void update(final UpdateCallback callback, boolean deltaUpdateOnly) {
         if(dbName == null){
             return;
         }
 
         productDatabaseDownloader.invalidate();
-        productDatabaseDownloader.loadAsync(new Downloader.Callback() {
+        productDatabaseDownloader.update(new Downloader.Callback() {
             @Override
             protected void onDataLoaded(boolean wasStillValid) {
                 updateLastUpdateTimestamp(System.currentTimeMillis());
@@ -482,9 +512,31 @@ protected void onError() {
                     }
                 }
             }
-        });
+        }, deltaUpdateOnly);
     }
 
+    /**
+     * Cancels a database update, if one is currently running.
+     */
+    public void cancelUpdate() {
+        productDatabaseDownloader.cancel();
+    }
+
+    /**
+     * @return true if a database update is currently running, false otherwise.
+     */
+    public boolean isUpdating() {
+        return productDatabaseDownloader.isLoading();
+    }
+
+    private boolean deleteDatabase(File dbFile) {
+        if (dbFile.exists()) {
+            return application.deleteDatabase(dbFile.getName());
+        }
+        return true;
+    }
+
+
     /**
      * Closes and deletes the locally stored database and falls back to online only mode.
      */
@@ -513,40 +565,6 @@ public long size() {
         return dbFile.length();
     }
 
-    /**
-     * Updates the current database in the background by requesting new data from the backend.
-     * <p>
-     * Updates can be either delta updates or full updates depending on how big the difference between
-     * the last update was.
-     * <p>
-     * While updating, the database can still be queried for data, after the update completes calls to the database
-     * return the updated data.
-     */
-    public void update() {
-        update(null);
-    }
-
-    /**
-     * Cancels a database update, if one is currently running.
-     */
-    public void cancelUpdate() {
-        productDatabaseDownloader.cancel();
-    }
-
-    /**
-     * @return true if a database update is currently running, false otherwise.
-     */
-    public boolean isUpdating() {
-        return productDatabaseDownloader.isLoading();
-    }
-
-    private boolean deleteDatabase(File dbFile) {
-        if (dbFile.exists()) {
-            return application.deleteDatabase(dbFile.getName());
-        }
-        return true;
-    }
-
     private void swap(File otherDbFile) throws IOException {
         boolean ok = true;
 

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

@@ -14,6 +14,7 @@ class ProductDatabaseDownloader extends Downloader {
     private ProductDatabase productDatabase;
 
     private boolean sameRevision;
+    private boolean deltaUpdateOnly;
 
     public ProductDatabaseDownloader(SnabbleSdk sdk,
                                      ProductDatabase productDatabase) {
@@ -23,6 +24,11 @@ public ProductDatabaseDownloader(SnabbleSdk sdk,
         this.productDatabase = productDatabase;
     }
 
+    public void update(Callback callback, boolean deltaUpdateOnly) {
+        this.deltaUpdateOnly = deltaUpdateOnly;
+        loadAsync(callback);
+    }
+
     @Override
     public void onStartDownload() {
         getHeaders().put("Accept", MIMETYPE_DELTA);
@@ -41,11 +47,7 @@ public void onStartDownload() {
 
     @Override
     protected void onDownloadFailed(Response response) {
-        if (response != null && response.code() == 304) {
-            sameRevision = true;
-        } else {
-            sameRevision = false;
-        }
+        sameRevision = response != null && response.code() == 304;
     }
 
     public boolean wasSameRevision() {
@@ -65,6 +67,11 @@ protected void onResponse(Response response) throws IOException {
                         productDatabase.applyDeltaUpdate(body.byteStream());
                         break;
                     case MIMETYPE_FULL:
+                        if(deltaUpdateOnly){
+                            body.close();
+                            throw new IOException();
+                        }
+
                         productDatabase.applyFullUpdate(body.byteStream());
                         break;
                     default:

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

@@ -15,7 +15,7 @@
 
 public class ShoppingCart {
     public static final int MAX_QUANTITY = 99999;
-    public static final long KEEP_ALIVE_TIME = TimeUnit.HOURS.toMillis(4);
+    public static final long TIMEOUT = TimeUnit.HOURS.toMillis(4);
 
     private static class Entry {
         private Product product;
@@ -54,7 +54,6 @@ public void setScannedCode(ScannableCode scannedCode){
     private long lastModificationTime;
     private List<Entry> items = new ArrayList<>();
     private transient List<ShoppingCartListener> listeners = new CopyOnWriteArrayList<>();
-    private transient ProductDatabase productDatabase;
     private transient Handler handler = new Handler(Looper.getMainLooper());
     private transient SnabbleSdk sdkInstance;
 
@@ -71,38 +70,7 @@ protected ShoppingCart() {
 
     void initWithSdkInstance(SnabbleSdk sdkInstance) {
         this.sdkInstance = sdkInstance;
-
-        productDatabase = sdkInstance.getProductDatabase();
-        productDatabase.addOnDatabaseUpdateListener(new ProductDatabase.OnDatabaseUpdateListener() {
-            @Override
-            public void onDatabaseUpdated() {
-                updateEntries();
-            }
-        });
-
-        validate();
-        updateEntries();
-    }
-
-    private void updateEntries() {
-        synchronized (lock) {
-            List<Entry> removables = new ArrayList<>();
-
-            for (Entry e : items) {
-                Product product = productDatabase.findBySku(e.sku);
-                if (product != null) {
-                    // update the product when there is a local version available
-                    e.product = product;
-                } else if (e.product == null) {
-                    // when there is no serialized product of an online only version
-                    // (in case of an upgrade of an older version of the shopping list)
-                    // we remove the product
-                    removables.add(e);
-                }
-            }
-
-            items.removeAll(removables);
-        }
+        checkForTimeout();
     }
 
     public String getId() {
@@ -293,10 +261,11 @@ public void invalidate() {
         clear();
     }
 
-    public void validate() {
+    public void checkForTimeout() {
         long currentTime = SystemClock.elapsedRealtime();
-        if(lastModificationTime + KEEP_ALIVE_TIME < currentTime){
-            clear();
+
+        if(lastModificationTime + TIMEOUT < currentTime){
+            invalidate();
         }
     }
 

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

@@ -643,7 +643,7 @@ protected void onDataLoaded(boolean wasStillValid) {
         @Override
         public void onActivityStarted(Activity activity) {
             updateMetadata();
-            getShoppingCart().validate();
+            getShoppingCart().checkForTimeout();
         }
     };