add support for "activeShops", fix postfinance and twint not showing up on single shop projects, expose list instead of array for shops

Author: ajungg

CHANGELOG.md

@@ -1,6 +1,17 @@
 # Changelog  
 All notable changes to this project will be documented in this file.
 
+## [0.40.0]
+
+### Breaking Changes
+- Project.getShops now returns a List instead of an Array
+
+### Added
+- Added support for "activeShops"
+
+### Fixed
+- Fixed PostFinance and Twint not selectable when skipping over project specific payment methods
+
 ## [0.39.13]
 
 ### Fixed

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

@@ -11,9 +11,9 @@
 
 import java.io.File;
 import java.lang.reflect.Type;
-import java.math.BigDecimal;
 import java.math.RoundingMode;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collections;
 import java.util.Currency;
 import java.util.HashMap;
@@ -22,9 +22,7 @@
 import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.CopyOnWriteArrayList;
-import java.util.function.Consumer;
-import java.util.function.Predicate;
-import java.util.stream.Collectors;
+
 import io.snabble.sdk.googlepay.GooglePayHelper;
 import io.snabble.sdk.auth.SnabbleAuthorizationInterceptor;
 import io.snabble.sdk.codes.templates.CodeTemplate;
@@ -33,15 +31,19 @@
 import io.snabble.sdk.utils.GsonHolder;
 import io.snabble.sdk.utils.JsonUtils;
 import io.snabble.sdk.utils.Logger;
+import io.snabble.sdk.utils.SimpleJsonCallback;
 import okhttp3.OkHttpClient;
+import okhttp3.Request;
+import okhttp3.Response;
+import okhttp3.ResponseBody;
 
 public class Project {
     private Snabble snabble;
     private String id;
     private String name;
 
     private ProductDatabase productDatabase;
-    private Shop[] shops;
+    private ArrayList<Shop> shops;
     private Brand brand;
     private Company company;
     private Checkout checkout;
@@ -90,14 +92,14 @@ public class Project {
     Project(JsonObject jsonObject) throws IllegalArgumentException {
         snabble = Snabble.getInstance();
 
-        parse(jsonObject);
-
         internalStorageDirectory = new File(snabble.getInternalStorageDirectory(), id + "/");
         okHttpClient = Snabble.getInstance().getOkHttpClient()
                 .newBuilder()
                 .addInterceptor(new SnabbleAuthorizationInterceptor(this))
                 .build();
 
+        parse(jsonObject);
+
         boolean generateSearchIndex = snabble.getConfig().generateSearchIndex;
 
         productDatabase = new ProductDatabase(this, id + ".sqlite3", generateSearchIndex);
@@ -220,13 +222,7 @@ void parse(JsonObject jsonObject) {
 
         availablePaymentMethods = paymentMethodList.toArray(new PaymentMethod[paymentMethodList.size()]);
 
-        if (jsonObject.has("shops")) {
-            shops = Shop.fromJson(jsonObject.get("shops"));
-        }
-
-        if (shops == null) {
-            shops = new Shop[0];
-        }
+        parseShops(jsonObject);
 
         if (jsonObject.has("company")) {
             company = GsonHolder.get().fromJson(jsonObject.get("company"), Company.class);
@@ -324,6 +320,51 @@ void parse(JsonObject jsonObject) {
         notifyUpdate();
     }
 
+    private void parseShops(JsonObject jsonObject) {
+        shops = new ArrayList<>();
+
+        if (jsonObject.has("shops")) {
+            Shop[] jsonShops = Shop.fromJson(jsonObject.get("shops"));
+            if (jsonShops != null) {
+                shops.addAll(Arrays.asList(jsonShops));
+            }
+        }
+    }
+
+    void loadActiveShops(Runnable done) {
+        if (snabble.getConfig().loadActiveShops) {
+            String url = getActiveShopsUrl();
+            if (url != null) {
+                Request request = new Request.Builder()
+                        .get()
+                        .url(getActiveShopsUrl())
+                        .build();
+
+                okHttpClient.newCall(request).enqueue(new SimpleJsonCallback<JsonObject>(JsonObject.class) {
+                    @Override
+                    public void success(JsonObject jsonObject) {
+                        if (jsonObject.has("shops")) {
+                            Shop[] hiddenShops = Shop.fromJson(jsonObject.get("shops"));
+                            if (hiddenShops != null) {
+                                shops.clear();
+                                shops.addAll(Arrays.asList(hiddenShops));
+
+                                if (done != null) {
+                                    done.run();
+                                }
+                            }
+                        }
+                    }
+
+                    @Override
+                    public void error(Throwable t) {
+                        Logger.e("Failed to load hidden shops, statusCode: %d", responseCode());
+                    }
+                });
+            }
+        }
+    }
+
     public File getInternalStorageDirectory() {
         return internalStorageDirectory;
     }
@@ -394,6 +435,9 @@ public String getDatatransTokenizationUrl() {
         return urls.get("datatransTokenization");
     }
 
+    public String getActiveShopsUrl() {
+        return urls.get("activeShops");
+    }
     public BarcodeFormat[] getSupportedBarcodeFormats() {
         return supportedBarcodeFormats;
     }
@@ -455,8 +499,8 @@ public Shop getCheckedInShop() {
     /**
      * @return The available shops. Empty if no shops are defined.
      */
-    public Shop[] getShops() {
-        return shops;
+    public List<Shop> getShops() {
+        return Collections.unmodifiableList(shops);
     }
 
     public Company getCompany() {

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

@@ -13,6 +13,7 @@
 import java.lang.reflect.Type;
 import java.util.Arrays;
 import java.util.Map;
+import java.util.Objects;
 
 import io.snabble.sdk.utils.GsonHolder;
 import io.snabble.sdk.utils.Logger;
@@ -117,6 +118,7 @@ public String toString() {
     private String country;
     private String state;
     private String phone;
+    private boolean isPreLaunch;
     private Map<String, Href> links;
     @SerializedName("lat")
     private double latitude;
@@ -182,6 +184,10 @@ public String getName() {
         return name;
     }
 
+    public boolean getIsPreLaunch() {
+        return isPreLaunch;
+    }
+
     public CustomerNetwork[] getCustomerNetworks() {
         return customerNetworks;
     }
@@ -203,19 +209,37 @@ static Shop[] fromJson(JsonElement json) {
         }
     }
 
-    @Override
-    public int hashCode() {
-        return id.hashCode();
-    }
-
     @Override
     public boolean equals(Object o) {
         if (this == o) return true;
         if (o == null || getClass() != o.getClass()) return false;
-
         Shop shop = (Shop) o;
+        return isPreLaunch == shop.isPreLaunch &&
+                Double.compare(shop.latitude, latitude) == 0 &&
+                Double.compare(shop.longitude, longitude) == 0 &&
+                Objects.equals(id, shop.id) &&
+                Objects.equals(externalId, shop.externalId) &&
+                Objects.equals(name, shop.name) &&
+                Arrays.equals(services, shop.services) &&
+                Objects.equals(street, shop.street) &&
+                Objects.equals(zipCode, shop.zipCode) &&
+                Objects.equals(city, shop.city) &&
+                Objects.equals(country, shop.country) &&
+                Objects.equals(state, shop.state) &&
+                Objects.equals(phone, shop.phone) &&
+                Objects.equals(links, shop.links) &&
+                Arrays.equals(customerNetworks, shop.customerNetworks) &&
+                Arrays.equals(openingHoursSpecification, shop.openingHoursSpecification) &&
+                Objects.equals(external, shop.external);
+    }
 
-        return id.equals(shop.id);
+    @Override
+    public int hashCode() {
+        int result = Objects.hash(id, externalId, name, street, zipCode, city, country, state, phone, isPreLaunch, links, latitude, longitude, external);
+        result = 31 * result + Arrays.hashCode(services);
+        result = 31 * result + Arrays.hashCode(customerNetworks);
+        result = 31 * result + Arrays.hashCode(openingHoursSpecification);
+        return result;
     }
 
     public String toShortString() {
@@ -238,6 +262,7 @@ public String toString() {
                 ", country='" + country + '\'' +
                 ", state='" + state + '\'' +
                 ", phone='" + phone + '\'' +
+                ", isPreLaunch=" + isPreLaunch +
                 ", links=" + links +
                 ", latitude=" + latitude +
                 ", longitude=" + longitude +

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

@@ -135,6 +135,10 @@ public void setup(Application app, Config config, final SetupCompletionListener
         if (config.bundledMetadataAssetPath != null) {
             readMetadata();
             setupCompletionListener.onReady();
+
+            if (config.loadActiveShops) {
+                loadActiveShops();
+            }
         } else {
             metadataDownloader.loadAsync(new Downloader.Callback() {
                 @Override
@@ -151,6 +155,10 @@ protected void onDataLoaded(boolean wasStillValid) {
                     }
 
                     setupCompletionListener.onReady();
+
+                    if (config.loadActiveShops) {
+                        loadActiveShops();
+                    }
                 }
 
                 @Override
@@ -479,15 +487,30 @@ private void updateMetadata() {
             protected void onDataLoaded(boolean wasStillValid) {
                 if (!wasStillValid) {
                     readMetadata();
+                    notifyMetadataUpdated();
+                }
 
-                    for (OnMetadataUpdateListener listener : onMetaDataUpdateListeners) {
-                        listener.onMetaDataUpdated();
-                    }
+                if (config.loadActiveShops) {
+                    loadActiveShops();
                 }
             }
         });
     }
 
+    private void loadActiveShops() {
+        for (Project project : projects) {
+            project.loadActiveShops(() -> {
+                notifyMetadataUpdated();
+            });
+        }
+    }
+
+    private void notifyMetadataUpdated() {
+        for (OnMetadataUpdateListener listener : onMetaDataUpdateListeners) {
+            listener.onMetaDataUpdated();
+        }
+    }
+
     private void checkCartTimeouts() {
         for (Project project : projects) {
             project.getShoppingCart().checkForTimeout();
@@ -753,5 +776,10 @@ public static class Config {
 
         /** Vibrate while adding a product to the cart, by default false */
         public boolean vibrateToConfirmCartFilled = false;
+
+        /** Set to true, to load shops that are marked as pre launch
+         *  and are not part of the original metadata in the backend
+         *  (for example for testing shops in production before a go-live) **/
+        public boolean loadActiveShops = false;
     }
 }

sample/src/main/java/io/snabble/testapp/App.java

@@ -83,8 +83,8 @@ public void onReady() {
                 SnabbleUI.useProject(project);
 
                 // select the first shop for demo purposes
-                if (project.getShops().length > 0) {
-                    project.setCheckedInShop(project.getShops()[0]);
+                if (project.getShops().size() > 0) {
+                    project.setCheckedInShop(project.getShops().get(0));
                 }
 
                 // you can update the local database asynchronously, you can still query

sample/src/main/java/io/snabble/testapp/HomeFragment.java

@@ -99,8 +99,8 @@ public void onItemSelected(AdapterView<?> parent, View view, int position, long
 
                 updateShops(v);
 
-                if (project.getShops().length > 0) {
-                    project.setCheckedInShop(project.getShops()[0]);
+                if (project.getShops().size() > 0) {
+                    project.setCheckedInShop(project.getShops().get(0));
                 }
             }
 
@@ -117,7 +117,7 @@ public void onNothingSelected(AdapterView<?> parent) {
 
     private void updateShops(View v) {
         Project project = SnabbleUI.getProject();
-        final List<Shop> shopList = Arrays.asList(project.getShops());
+        final List<Shop> shopList = project.getShops();
         Spinner shops = v.findViewById(R.id.shops);
         shops.setAdapter(new ArrayAdapter<Shop>(requireContext(), R.layout.item_dropdown, shopList) {
             @NonNull

ui/src/main/java/io/snabble/sdk/ui/payment/PaymentOptionsView.kt

@@ -180,7 +180,9 @@ open class PaymentOptionsView @JvmOverloads constructor(
                                         args.putSerializable(SelectPaymentMethodFragment.ARG_PAYMENT_METHOD_LIST, ArrayList(listOf(
                                             PaymentMethod.VISA,
                                             PaymentMethod.MASTERCARD,
-                                            PaymentMethod.AMEX))
+                                            PaymentMethod.AMEX,
+                                            PaymentMethod.POST_FINANCE_CARD,
+                                            PaymentMethod.TWINT))
                                         )
                                         args.putString(SelectPaymentMethodFragment.ARG_PROJECT_ID, project.id)
                                         dialogFragment.arguments = args