Merge branch 'fix_large_image_combo'

MarcusWolschon · Sep 3, 2023 · eb84fec · eb84fec
2 parents 5170bfa + 757e4b9
commit eb84fec
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 4 deletions.
diff --git a/src/androidTest/java/de/blau/android/propertyeditor/ImageComboSelectorTest.java b/src/androidTest/java/de/blau/android/propertyeditor/ImageComboSelectorTest.java
@@ -39,6 +39,10 @@
 import de.blau.android.prefs.Preferences;
 import de.blau.android.prefs.PresetLoader;
 import de.blau.android.presets.Preset;
+import de.blau.android.presets.PresetComboField;
+import de.blau.android.presets.PresetItem;
+import de.blau.android.util.StringWithDescription;
+import de.blau.android.util.StringWithDescriptionAndIcon;
 
 @RunWith(AndroidJUnit4.class)
 @LargeTest
@@ -149,4 +153,28 @@ public void bicycleParking() {
         assertNotNull(n);
         assertTrue(n.hasTag("bicycle_parking", "handlebar_holder"));
     }
+
+    /**
+     * Check that the images can actually be opened
+     */
+    @Test
+    public void checkImage() {
+        Preset[] presets = App.getCurrentPresets(main);
+        for (Preset p:presets) {
+            PresetItem item =p.getItemByName("Parking", null);
+            if (item != null) {
+                PresetComboField combo = (PresetComboField) item.getField("bicycle_parking");
+                for (StringWithDescription value: combo.getValues()) {
+                    if ("stands".equals(value.getValue()) && value instanceof StringWithDescriptionAndIcon) {
+                        String imagePath = ((StringWithDescriptionAndIcon) value).getImagePath();
+                        if (imagePath != null) {
+                            assertTrue(new File(imagePath).exists());
+                            return;
+                        }
+                    }
+                }
+            }
+        }
+        fail("preset not found");
+    }
 }
diff --git a/src/main/java/de/blau/android/presets/PresetParser.java b/src/main/java/de/blau/android/presets/PresetParser.java
@@ -791,7 +791,7 @@ public void endElement(String uri, String localName, String name) throws SAXExce
              */
             @NonNull
             private String getImagePath(@NonNull Preset preset, @NonNull String imagePath) {
-                return preset.isDefault() ? imagePath : preset.getDirectory().toString() + imagePath;
+                return preset.isDefault() ? imagePath : preset.getDirectory().getAbsolutePath() + "/" + imagePath;
             }
         });
     }

diff --git a/src/main/java/de/blau/android/propertyeditor/tagform/ComboImageLoader.java b/src/main/java/de/blau/android/propertyeditor/tagform/ComboImageLoader.java
@@ -22,16 +22,16 @@ public class ComboImageLoader extends ImageLoader {
 
     private static final long serialVersionUID = 1L;
 
-    private List<Value> values; // NOSONAR
-    private String      key;
+    private final List<Value> values; // NOSONAR
+    private final String      key;
 
     /**
      * Construct a new loader
      * 
      * @param key the key
      * @param values a list of values
      */
-    ComboImageLoader(String key, @NonNull List<Value> values) {
+    ComboImageLoader(@NonNull String key, @NonNull List<Value> values) {
         this.key = key;
         this.values = values;
     }