Fixed bug with media files and autocomplete appearance - wrong media …

…files were used
hamoz · May 17, 2019 · cc8864f · cc8864f
1 parent e8165f0
commit cc8864f
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/collect_app/src/main/java/org/odk/collect/android/adapters/AbstractSelectListAdapter.java b/collect_app/src/main/java/org/odk/collect/android/adapters/AbstractSelectListAdapter.java
@@ -135,7 +135,7 @@ View setUpNoButtonsView(int index) {
         View view = new View(context);
         int itemPadding = context.getResources().getDimensionPixelSize(R.dimen.select_item_border);
 
-        SelectChoice selectChoice = items.get(index);
+        SelectChoice selectChoice = filteredItems.get(index);
 
         String imageURI = selectChoice instanceof ExternalSelectChoice
                 ? ((ExternalSelectChoice) selectChoice).getImage()
@@ -213,7 +213,7 @@ void bind(final int index) {
                 view.removeAllViews();
                 view.addView(setUpNoButtonsView(index));
             } else {
-                widget.addMediaFromChoice(mediaLayout, index, setUpButton(index));
+                widget.addMediaFromChoice(mediaLayout, index, setUpButton(index), filteredItems);
             }
         }
     }

diff --git a/collect_app/src/main/java/org/odk/collect/android/widgets/SelectWidget.java b/collect_app/src/main/java/org/odk/collect/android/widgets/SelectWidget.java
@@ -27,6 +27,7 @@
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
+import org.javarosa.core.model.SelectChoice;
 import org.javarosa.form.api.FormEntryCaption;
 import org.javarosa.form.api.FormEntryPrompt;
 import org.odk.collect.android.R;
@@ -37,6 +38,7 @@
 import org.odk.collect.android.views.MediaLayout;
 
 import java.util.ArrayList;
+import java.util.List;
 
 public abstract class SelectWidget extends ItemsWidget {
 
@@ -125,7 +127,7 @@ public void initMediaLayoutSetUp(MediaLayout mediaLayout) {
     /**
      * Pull media from the current item and add it to the media layout.
      */
-    public void addMediaFromChoice(MediaLayout mediaLayout, int index, TextView textView) {
+    public void addMediaFromChoice(MediaLayout mediaLayout, int index, TextView textView, List<SelectChoice> items) {
         String audioURI = getFormEntryPrompt().getSpecialFormSelectChoiceText(items.get(index), FormEntryCaption.TEXT_FORM_AUDIO);
 
         String imageURI;