#3529 Captions/depictions are not saved to Commons - weaken type of categories - copy list on Contribution creation

Author: macgills

app/src/main/java/fr/free/nrw/commons/Media.java

@@ -53,7 +53,7 @@ public class Media implements Parcelable {
      * Wikibase Identifier associated with media files
      */
     public String pageId;
-    public ArrayList<String> categories; // as loaded at runtime?
+    private List<String> categories; // as loaded at runtime?
     /**
      * Depicts is a feature part of Structured data. Multiple Depictions can be added for an image just like categories.
      * However unlike categories depictions is multi-lingual
@@ -447,8 +447,8 @@ public void setCoordinates(@Nullable LatLng coordinates) {
      * @return file categories as an ArrayList of Strings
      */
     @SuppressWarnings("unchecked")
-    public ArrayList<String> getCategories() {
-        return (ArrayList<String>) categories.clone(); // feels dirty
+    public List<String> getCategories() {
+        return categories;
     }
 
 
@@ -460,8 +460,7 @@ public ArrayList<String> getCategories() {
      * @param categories file categories as a list of Strings
      */
     public void setCategories(List<String> categories) {
-        this.categories.clear();
-        this.categories.addAll(categories);
+        this.categories = categories;
     }
 
     /**

app/src/main/java/fr/free/nrw/commons/contributions/Contribution.java

@@ -10,7 +10,6 @@
 import fr.free.nrw.commons.upload.WikidataPlace;
 import fr.free.nrw.commons.upload.structure.depictions.DepictedItem;
 import java.util.ArrayList;
-import java.util.Collection;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
@@ -44,13 +43,13 @@ public Contribution() {
 
     public Contribution(final UploadItem item, final SessionManager sessionManager,
         final List<DepictedItem> depictedItems,
-        final Collection<String> categories) {
+        final List<String> categories) {
         super(item.getMediaUri(), null, item.getFileName(), UploadMediaDetail.formatCaptions(item.getUploadMediaDetails()), UploadMediaDetail.formatList(item.getUploadMediaDetails()), -1, null, new Date(), sessionManager.getAuthorName());
         decimalCoords = item.getGpsCoords().getDecimalCoords();
         dateCreatedSource = "";
-        this.depictedItems.addAll(depictedItems);
+        this.depictedItems = depictedItems;
         wikidataPlace = WikidataPlace.from(item.getPlace());
-        this.categories.addAll(categories);
+        this.categories = categories;
     }
 
     public Contribution(final MwQueryLogEvent queryLogEvent, final String user) {

app/src/main/java/fr/free/nrw/commons/db/Converters.java

@@ -45,13 +45,13 @@ public static String uriToString(Uri uri) {
     }
 
     @TypeConverter
-    public static String listObjectToString(ArrayList<String> objectList) {
+    public static String listObjectToString(List<String> objectList) {
         return writeObjectToString(objectList);
     }
 
     @TypeConverter
-    public static ArrayList<String> stringToArrayListObject(String objectList) {
-        return readObjectWithTypeToken(objectList, new TypeToken<ArrayList<String>>() {});
+    public static List<String> stringToArrayListObject(String objectList) {
+        return readObjectWithTypeToken(objectList, new TypeToken<List<String>>() {});
     }
 
     @TypeConverter

app/src/main/java/fr/free/nrw/commons/upload/PageContentsCreator.java

@@ -7,8 +7,8 @@
 import fr.free.nrw.commons.settings.Prefs.Licenses;
 import fr.free.nrw.commons.utils.ConfigUtils;
 import java.text.SimpleDateFormat;
-import java.util.ArrayList;
 import java.util.Date;
+import java.util.List;
 import java.util.Locale;
 import javax.inject.Inject;
 import org.apache.commons.lang3.StringUtils;
@@ -56,7 +56,7 @@ public String createFrom(Contribution contribution) {
         .append(licenseTemplateFor(contribution.getLicense())).append("\n\n")
         .append("{{Uploaded from Mobile|platform=Android|version=")
         .append(ConfigUtils.getVersionNameWithSha(context)).append("}}\n");
-    final ArrayList<String> categories = contribution.getCategories();
+    final List<String> categories = contribution.getCategories();
     if (categories != null && categories.size() != 0) {
       for (int i = 0; i < categories.size(); i++) {
         buffer.append("\n[[Category:").append(categories.get(i)).append("]]");

app/src/main/java/fr/free/nrw/commons/upload/UploadModel.java

@@ -75,7 +75,7 @@ public void cleanUp() {
     }
 
     public void setSelectedCategories(List<String> selectedCategories) {
-        this.selectedCategories = newListOf(selectedCategories);
+        this.selectedCategories = selectedCategories;
     }
 
     /**
@@ -144,7 +144,7 @@ public Observable<Contribution> buildContributions() {
         return Observable.fromIterable(items).map(item ->
         {
             final Contribution contribution = new Contribution(
-                item, sessionManager, selectedDepictions, selectedCategories);
+                item, sessionManager, newListOf(selectedDepictions), newListOf(selectedCategories));
             Timber.d("Created timestamp while building contribution is %s, %s",
                     item.getCreatedTimestamp(),
                     new Date(item.getCreatedTimestamp()));