From a9797a706af0ad8f18f83c1317b69cb19b034326 Mon Sep 17 00:00:00 2001
From: Sean Mac Gillicuddy <seantheappdev@gmail.com>
Date: Tue, 7 Apr 2020 13:40:16 +0100
Subject: [PATCH] #3222 Merge master into Structured Data branch, fix conflicts
 - fix bad merge

---
 .../main/java/fr/free/nrw/commons/Media.java  | 24 ++-----------------
 1 file changed, 2 insertions(+), 22 deletions(-)

diff --git a/app/src/main/java/fr/free/nrw/commons/Media.java b/app/src/main/java/fr/free/nrw/commons/Media.java
index a77d3ac2e..f28dcdb6b 100644
--- a/app/src/main/java/fr/free/nrw/commons/Media.java
+++ b/app/src/main/java/fr/free/nrw/commons/Media.java
@@ -60,7 +60,7 @@ public class Media implements Parcelable {
      * 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
      */
-    public List<Map<String, String>> depictionList;
+    public ArrayList<Map<String, String>> depictionList;
     /**
      * The above hashmap is fetched from API and to diplay in Explore
      * However this list of depictions is for storing and retrieving depictions from local storage or cache
@@ -625,27 +625,7 @@ public class Media implements Parcelable {
     public int describeContents() {
         return 0;
     }
-    /**
-     * 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
-     */
-    public ArrayList<Map<String, String>> depictionList;
-    /**
-     * The above hashmap is fetched from API and to diplay in Explore
-     * However this list of depictions is for storing and retrieving depictions from local storage or cache
-     */
-    public ArrayList<String> depictions;
-    public boolean requestedDeletion;
-    public HashMap<String, String> descriptions; // multilingual descriptions as loaded
-    /**
-     * This hasmap stores the list of multilingual captions, where
-     * key of the HashMap is the language and value is the caption in the corresponding language
-     * Ex: key = "en", value: "<caption in short in English>"
-     *     key = "de" , value: "<caption in german>"
-     */
-    public Map<String, String> captions;
-    public HashMap<String, String> tags = new HashMap<>();
-    @Nullable public  LatLng coordinates;
+
     /**
      * Creates a way to transfer information between two or more
      * activities.