Read metadata after updating it

Author: ajungg

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

@@ -314,34 +314,7 @@ private void updateShops() {
     }
 
     private void setupSdk(Config config, final SetupCompletionListener setupCompletionListener) {
-        updateShops();
-
-        Map<String, String> urls = metadataDownloader.getUrls();
-        if (urls == null || urls.get("appdb") == null) {
-            Logger.e("Metadata does not contain url for product database updates. No product database updates possible");
-        }
-
-        JsonObject projectSettings = metadataDownloader.getProject();
-
-        currency = Currency.getInstance(JsonUtils.getStringOpt(projectSettings, "currency", "EUR"));
-
-        String locale = JsonUtils.getStringOpt(projectSettings, "locale", "de_DE");
-
-        try {
-            currencyLocale = LocaleUtils.toLocale(locale);
-        } catch (IllegalArgumentException e){
-            currencyLocale = Locale.getDefault();
-        }
-
-        if(currencyLocale == null){
-            currencyLocale = Locale.getDefault();
-        }
-
-        currencyFractionDigits = JsonUtils.getIntOpt(projectSettings, "decimalDigits", 2);
-
-        weighPrefixes = JsonUtils.getStringArrayOpt(projectSettings, "weighPrefixes", new String[0]);
-        pricePrefixes = JsonUtils.getStringArrayOpt(projectSettings, "pricePrefixes", new String[0]);
-        unitPrefixes = JsonUtils.getStringArrayOpt(projectSettings, "unitPrefixes", new String[0]);
+        readMetadata();
 
         ProductDatabase.Config dbConfig = new ProductDatabase.Config();
         dbConfig.bundledAssetPath = config.productDbBundledAssetPath;
@@ -379,6 +352,37 @@ public void onError(ProductDatabase.Error error) {
                 });
     }
 
+    private void readMetadata() {
+        updateShops();
+
+        Map<String, String> urls = metadataDownloader.getUrls();
+        if (urls == null || urls.get("appdb") == null) {
+            Logger.e("Metadata does not contain url for product database updates. No product database updates possible");
+        }
+
+        JsonObject projectSettings = metadataDownloader.getProject();
+
+        currency = Currency.getInstance(JsonUtils.getStringOpt(projectSettings, "currency", "EUR"));
+
+        String locale = JsonUtils.getStringOpt(projectSettings, "locale", "de_DE");
+
+        try {
+            currencyLocale = LocaleUtils.toLocale(locale);
+        } catch (IllegalArgumentException e){
+            currencyLocale = Locale.getDefault();
+        }
+
+        if(currencyLocale == null){
+            currencyLocale = Locale.getDefault();
+        }
+
+        currencyFractionDigits = JsonUtils.getIntOpt(projectSettings, "decimalDigits", 2);
+
+        weighPrefixes = JsonUtils.getStringArrayOpt(projectSettings, "weighPrefixes", new String[0]);
+        pricePrefixes = JsonUtils.getStringArrayOpt(projectSettings, "pricePrefixes", new String[0]);
+        unitPrefixes = JsonUtils.getStringArrayOpt(projectSettings, "unitPrefixes", new String[0]);
+    }
+
     private void setupOk(final SetupCompletionListener setupCompletionListener) {
         if (setupCompletionListener != null) {
             setupCompletionListener.onReady(SnabbleSdk.this);
@@ -611,6 +615,8 @@ private void updateMetadata() {
             @Override
             protected void onDataLoaded(boolean wasStillValid) {
                 if (!wasStillValid) {
+                    readMetadata();
+
                     for (OnMetadataUpdateListener listener : onMetaDataUpdateListeners) {
                         listener.onMetaDataUpdated();
                     }