APPS-55 Persist used project + improve initialization and view behavior

build.gradle

@@ -11,7 +11,7 @@ buildscript {
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath "org.jetbrains.dokka:dokka-gradle-plugin:$kotlin_version"
         classpath "org.jetbrains.dokka:dokka-base:$kotlin_version"
-        classpath 'com.android.tools.build:gradle:7.0.4'
+        classpath 'com.android.tools.build:gradle:7.1.1'
         classpath 'gradle.plugin.com.github.jlouns:gradle-cross-platform-exec-plugin:0.5.0'
         classpath 'gradle.plugin.gmazzo:sqlite-plugin:0.2'
     }

core/build.gradle

@@ -10,8 +10,6 @@ android {
     defaultConfig {
         minSdkVersion project.minSdkVersion
         targetSdkVersion project.targetSdkVersion
-        versionCode project.versionCode
-        versionName project.sdkVersion
         testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
         consumerProguardFiles 'proguard-rules.pro'
 
@@ -59,17 +57,17 @@ dependencies {
     implementation 'org.apache.commons:commons-lang3:3.12.0'
     implementation 'org.iban4j:iban4j:3.2.1'
     implementation 'com.caverock:androidsvg-aar:1.4'
-    implementation 'com.google.android.gms:play-services-wallet:18.1.3'
-    implementation 'androidx.appcompat:appcompat:1.3.1'
-    implementation 'androidx.biometric:biometric:1.2.0-alpha03'
+    implementation 'com.google.android.gms:play-services-wallet:19.1.0'
+    implementation 'androidx.appcompat:appcompat:1.4.1'
+    implementation 'androidx.biometric:biometric:1.2.0-alpha04'
 
     api "com.squareup.okhttp3:okhttp:${project.okhttpVersion}"
     implementation "com.squareup.okhttp3:logging-interceptor:${project.okhttpVersion}"
 
-    api 'com.google.code.gson:gson:2.8.8'
+    api 'com.google.code.gson:gson:2.8.9'
 
     testImplementation 'junit:junit:4.13.2'
-    testImplementation 'org.robolectric:robolectric:4.6.1'
+    testImplementation 'org.robolectric:robolectric:4.7.3'
     testImplementation "com.squareup.okhttp3:mockwebserver:${project.okhttpVersion}"
 
     androidTestImplementation 'androidx.test:rules:1.4.0'

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

@@ -28,7 +28,8 @@ class AcceptedLanguageInterceptor : Interceptor {
     override fun intercept(chain: Interceptor.Chain): Response {
         var request: Request = chain.request()
         val url = request.url.toString()
-        if (url.startsWith(Snabble.getInstance().endpointBaseUrl)) {
+        val baseUrl = Snabble.endpointBaseUrl
+        if (url.startsWith(baseUrl)) {
             request = request.newBuilder()
                 .addHeader("Accept-Language", acceptedLanguagesHeader)
                 .build()

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

@@ -0,0 +1,133 @@
+package io.snabble.sdk
+
+import android.content.Context
+import io.snabble.sdk.utils.GsonHolder
+import org.apache.commons.io.IOUtils
+import java.io.File
+import java.io.FileInputStream
+import java.io.FileOutputStream
+import java.nio.charset.Charset
+import java.util.concurrent.TimeUnit
+import javax.net.ssl.SSLSocketFactory
+import javax.net.ssl.X509TrustManager
+
+data class Config (
+    /**
+     * The endpoint url of the snabble backend. For example "https://api.snabble.io" for the Production environment.
+     */
+    @JvmField
+    var endpointBaseUrl: String = Environment.PRODUCTION.baseUrl,
+
+    /**
+     * The project identifier, which is used in the communication with the backend.
+     */
+    @JvmField
+    var appId: String? = null,
+
+    /**
+     * The secret needed for Totp token generation
+     */
+    @JvmField
+    var secret: String? = null,
+
+    /**
+     * Relative path from the assets folder which points to a bundled file which contains the metadata
+     *
+     *
+     * This file gets initially used to initialize the sdk before network requests are made,
+     * or be able to use the sdk in the case of no network connection.
+     *
+     * Optional. If no file is specified every time the sdk is initialized we wait for a network response
+     * from the backend.
+     *
+     * It is HIGHLY recommended to provide bundled metadata to allow the sdk to function
+     * without having a network connection.
+     */
+    @JvmField
+    var bundledMetadataAssetPath: String? = null,
+
+    /**
+     * Optional. Used to override the versionName appended to the metadata url.
+     *
+     * Defaults to the versionName in the app package.
+     *
+     * Must be in the format %d.%d
+     */
+    @JvmField
+    var versionName: String? = null,
+
+    /**
+     * If set to true, creates an full text index to support searching in the product database
+     * using findByName or searchByName.
+     *
+     * Note that this increases setup time of the ProductDatabase, and it may not be
+     * immediately available offline.
+     */
+    @JvmField
+    var generateSearchIndex: Boolean = false,
+
+    /**
+     * The time that the database is allowed to be out of date. After the specified time in
+     * milliseconds the database only uses online requests for asynchronous requests.
+     *
+     * Successfully calling [ProductDatabase.update] resets the timer.
+     *
+     * The time is specified in milliseconds.
+     *
+     * The default value is 1 hour.
+     */
+    @JvmField
+    var maxProductDatabaseAge: Long = TimeUnit.HOURS.toMillis(1),
+
+    /**
+     * The time that the shopping cart is allowed to be alive after the last modification.
+     *
+     * The time is specified in milliseconds.
+     *
+     * The default value is 4 hours.
+     */
+    @JvmField
+    var maxShoppingCartAge: Long  = TimeUnit.HOURS.toMillis(4),
+
+    /** If set to true, disables certificate pinning  */
+    @JvmField
+    var disableCertificatePinning: Boolean = false,
+
+    /** SQL queries that will get executed in order on the product database  */
+    @JvmField
+    var initialSQL: List<String> = emptyList(),
+
+    /** Vibrate while adding a product to the cart, by default false  */
+    @JvmField
+    var vibrateToConfirmCartFilled: Boolean = 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)  */
+    @JvmField
+    var loadActiveShops: Boolean = false,
+
+    /**
+     * The radius in which the CheckInManager tries to check in a shop.
+     *
+     * In meters.
+     */
+    @JvmField
+    var checkInRadius: Float = 500.0f,
+
+    /**
+     * The radius in which the CheckInManager tries to stay in a shop, if already in it.
+     * If outside of this radius and the lastSeenThreshold, you will be checked out.
+     */
+    @JvmField
+    var checkOutRadius: Float = 1000.0f,
+
+    /**
+     * The time in milliseconds which we keep you checked in at a shop.
+     *
+     * The timer will be refreshed while you are still inside the shop
+     * and only begins to run if you are not inside the checkOutRadius anymore.
+     */
+    @JvmField
+    var lastSeenThreshold: Long = TimeUnit.MINUTES.toMillis(15),
+)

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

@@ -97,7 +97,7 @@ class Coupons (
             }
         }
         project.urls["coupons"]?.let { path ->
-            val couponsUrl = Snabble.getInstance().absoluteUrl(path) ?: return
+            val couponsUrl = Snabble.absoluteUrl(path)
             isLoading.setAsap(true)
 
             val request = Request.Builder()

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

@@ -0,0 +1,7 @@
+package io.snabble.sdk
+
+enum class InitializationState {
+    INITIALIZING,
+    INITIALIZED,
+    ERROR,
+}

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

@@ -42,7 +42,7 @@ static OkHttpClient createOkHttpClient(Application application) {
         logging.setLevel(HttpLoggingInterceptor.Level.BASIC);
         builder.addInterceptor(logging);
 
-        Snabble.Config config = Snabble.getInstance().getConfig();
+        Config config = Snabble.getInstance().getConfig();
         builder.addInterceptor(new UserAgentInterceptor(application));
 
         if (!Snabble.getInstance().getConfig().disableCertificatePinning) {
@@ -56,11 +56,7 @@ static OkHttpClient createOkHttpClient(Application application) {
             builder.certificatePinner(certificatePinnerBuilder.build());
         }
 
-        if (config.sslSocketFactory != null && config.x509TrustManager != null) {
-            builder.sslSocketFactory(config.sslSocketFactory, config.x509TrustManager);
-        } else {
-            LetsEncryptCertHelper.addLetsEncryptCertificatesForMarshmallowOrEarlier(builder);
-        }
+        LetsEncryptCertHelper.addLetsEncryptCertificatesForMarshmallowOrEarlier(builder);
 
         return builder.build();
     }

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

@@ -74,11 +74,9 @@ public class ProductDatabase {
         this.productApi = new ProductApi(project);
 
         if (open()) {
-            String[] initialSQL = Snabble.getInstance().getConfig().initialSQL;
-            if (initialSQL != null) {
-                for (String sql : initialSQL) {
-                    exec(sql);
-                }
+            List<String> initialSQL = Snabble.getInstance().getConfig().initialSQL;
+            for (String sql : initialSQL) {
+                exec(sql);
             }
         } else {
             Logger.i("Product database is missing. Offline products are not available.");

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

@@ -62,6 +62,7 @@ public class Project {
 
     private RoundingMode roundingMode;
     private BarcodeFormat[] supportedBarcodeFormats;
+    @Nullable
     private Shop checkedInShop;
     private CustomerCardInfo[] acceptedCustomerCardInfos;
     private CustomerCardInfo requiredCustomerCardInfo;
@@ -95,13 +96,10 @@ public class Project {
                 .addInterceptor(new SnabbleAuthorizationInterceptor(this))
                 .addInterceptor(new AcceptedLanguageInterceptor())
                 .build();
-
         parse(jsonObject);
-
         internalStorageDirectory = new File(snabble.getInternalStorageDirectory(), id + "/");
 
         boolean generateSearchIndex = snabble.getConfig().generateSearchIndex;
-
         productDatabase = new ProductDatabase(this, id + ".sqlite3", generateSearchIndex);
         shoppingCartStorage = new ShoppingCartStorage(this);
         checkout = new Checkout(this);
@@ -320,7 +318,6 @@ void parse(JsonObject jsonObject) {
             coupons.setInternalProjectCoupons(couponList);
         }
         coupons.update();
-
         notifyUpdate();
     }
 
@@ -490,12 +487,17 @@ public String getText(String key, String defaultValue) {
      * Sets the shop used for receiving store specific prices and identification in the
      * payment process.
      */
-    public void setCheckedInShop(Shop checkedInShop) {
+    public void setCheckedInShop(@Nullable Shop checkedInShop) {
         String currentShopId = this.checkedInShop != null ? this.checkedInShop.getId() : "";
         String newShopId = checkedInShop != null ? checkedInShop.getId() : "";
 
         if (!currentShopId.equals(newShopId)) {
             this.checkedInShop = checkedInShop;
+            if (newShopId.equals("")) {
+                snabble.getUserPreferences().setLastCheckedInShopId(null);
+            } else {
+                snabble.getUserPreferences().setLastCheckedInShopId(newShopId);
+            }
             events.updateShop(checkedInShop);
             getShoppingCart().updatePrices(false);
         }