use a dedicated url for static resources (#2799)

* + Fix #2613 * + Fix static url for image
openfoodfacts · Jun 28, 2019 · 9b4a3e2 · 9b4a3e2
1 parent 0767451
commit 9b4a3e2
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -59,6 +59,7 @@ android {
             buildConfigField 'String', 'OFOTHERLINKAPP', '"org.openbeautyfacts.scanner"'
             buildConfigField 'String', 'OFWEBSITE', '"https://world.openfoodfacts.org/"'
             buildConfigField 'String', 'WIKIDATA', '"https://www.wikidata.org/wiki/Special:EntityData/"'
+            buildConfigField 'String', 'STATICURL', '"https://static.openfoodfacts.org"'
 
         }
 
@@ -69,6 +70,7 @@ android {
             buildConfigField 'String', 'OFOTHERLINKAPP', '"org.openfoodfacts.scanner"'
             buildConfigField 'String', 'OFWEBSITE', '"https://world.openbeautyfacts.org/"'
             buildConfigField 'String', 'WIKIDATA', '"https://www.wikidata.org/wiki/Special:EntityData/"'
+            buildConfigField 'String', 'STATICURL', '"https://static.openbeautyfacts.org"'
         }
         opff {
             applicationId "org.openpetfoodfacts.scanner"
@@ -77,6 +79,7 @@ android {
             buildConfigField 'String', 'OFOTHERLINKAPP', '"org.openfoodfacts.scanner"'
             buildConfigField 'String', 'OFWEBSITE', '"https://world.openpetfoodfacts.org/"'
             buildConfigField 'String', 'WIKIDATA', '"https://www.wikidata.org/wiki/Special:EntityData/"'
+            buildConfigField 'String', 'STATICURL', '"https://static.openpetfoodfacts.org"'
         }
         opf {
             applicationId "org.openproductsfacts.scanner"
@@ -85,6 +88,7 @@ android {
             buildConfigField 'String', 'OFOTHERLINKAPP', '"org.openfoodfacts.scanner"'
             buildConfigField 'String', 'OFWEBSITE', '"https://world.openproductsfacts.org/"'
             buildConfigField 'String', 'WIKIDATA', '"https://www.wikidata.org/wiki/Special:EntityData/"'
+            buildConfigField 'String', 'STATICURL', '"https://static.openproductsfacts.org"'
         }
     }
 

diff --git a/app/src/main/java/openfoodfacts/github/scrachx/openfood/fragments/ProductPhotosFragment.java b/app/src/main/java/openfoodfacts/github/scrachx/openfood/fragments/ProductPhotosFragment.java
@@ -9,7 +9,7 @@
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-
+import openfoodfacts.github.scrachx.openfood.BuildConfig;
 import openfoodfacts.github.scrachx.openfood.R;
 import openfoodfacts.github.scrachx.openfood.models.Product;
 import openfoodfacts.github.scrachx.openfood.models.State;
@@ -107,7 +107,7 @@ public void openFullScreen(String mUrlImage) {
     @Override
     public void onImageClick(int position) {
 
-        String baseUrlString = "https://static.openfoodfacts.org/images/products/";
+        String baseUrlString = BuildConfig.STATICURL+ "/images/products/";
         String barcodePattern = product.getCode();
         if (barcodePattern.length() > 8) {
             barcodePattern = new StringBuilder(product.getCode())

diff --git a/app/src/main/java/openfoodfacts/github/scrachx/openfood/images/ImageKeyHelper.java b/app/src/main/java/openfoodfacts/github/scrachx/openfood/images/ImageKeyHelper.java
@@ -1,6 +1,7 @@
 package openfoodfacts.github.scrachx.openfood.images;
 
 import android.os.Bundle;
+import openfoodfacts.github.scrachx.openfood.BuildConfig;
 import openfoodfacts.github.scrachx.openfood.R;
 import openfoodfacts.github.scrachx.openfood.models.Product;
 import openfoodfacts.github.scrachx.openfood.models.ProductImageField;
@@ -74,7 +75,7 @@ public static int getResourceId(ProductImageField field) {
     }
 
     public static String getImageUrl(String barcode, String imageName, String size) {
-        String baseUrlString = "https://static.openfoodfacts.org/images/products/";
+        String baseUrlString = BuildConfig.STATICURL+ "/images/products/";
         String barcodePattern = barcode;
         if (barcodePattern.length() > 8) {
             barcodePattern = new StringBuilder(barcode)