From a308a1c8b560538575cf0c37a487fbbb8390e3c6 Mon Sep 17 00:00:00 2001
From: Shashank Kumar <126143257+shashankiitbhu@users.noreply.github.com>
Date: Wed, 14 Feb 2024 14:35:13 +0530
Subject: [PATCH] Fix Methods Usage Incompatible with Android API Level 21
 (#5525)

---
 .../nrw/commons/upload/UploadMediaDetailAdapter.java | 12 +++++++++---
 .../fr/free/nrw/commons/utils/CommonsDateUtil.java   |  2 +-
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/fr/free/nrw/commons/upload/UploadMediaDetailAdapter.java b/app/src/main/java/fr/free/nrw/commons/upload/UploadMediaDetailAdapter.java
index 2669e426e..b8b2f4d82 100644
--- a/app/src/main/java/fr/free/nrw/commons/upload/UploadMediaDetailAdapter.java
+++ b/app/src/main/java/fr/free/nrw/commons/upload/UploadMediaDetailAdapter.java
@@ -146,6 +146,7 @@ public class UploadMediaDetailAdapter extends
             RecognizerIntent.EXTRA_LANGUAGE,
             locale
         );
+
         try {
             if (activity == null) {
                 fragment.startActivityForResult(intent, REQUEST_CODE_FOR_VOICE_INPUT);
@@ -182,9 +183,14 @@ public class UploadMediaDetailAdapter extends
      */
     public void removeDescription(final UploadMediaDetail uploadMediaDetail, final int position) {
         selectedLanguages.remove(position);
-        final int ListPosition =
-            (int) selectedLanguages.keySet().stream().filter(e -> e < position).count();
-        this.uploadMediaDetails.remove(uploadMediaDetails.get(ListPosition));
+        int listPosition = 0;
+        List<Integer> keysList = new ArrayList<>(selectedLanguages.keySet());
+        for (Integer key : keysList) {
+            if (key < position) {
+                listPosition++;
+            }
+        }
+        this.uploadMediaDetails.remove(uploadMediaDetails.get(listPosition));
         int i = position + 1;
         while (selectedLanguages.containsKey(i)) {
             selectedLanguages.remove(i);
diff --git a/app/src/main/java/fr/free/nrw/commons/utils/CommonsDateUtil.java b/app/src/main/java/fr/free/nrw/commons/utils/CommonsDateUtil.java
index f831baa0a..39ddca683 100644
--- a/app/src/main/java/fr/free/nrw/commons/utils/CommonsDateUtil.java
+++ b/app/src/main/java/fr/free/nrw/commons/utils/CommonsDateUtil.java
@@ -36,7 +36,7 @@ public class CommonsDateUtil {
      * @return timestamp
      */
         public static SimpleDateFormat getIso8601DateFormatTimestamp() {
-            final SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ssX",
+            final SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'",
                 Locale.ROOT);
             simpleDateFormat.setTimeZone(TimeZone.getTimeZone("UTC"));
             return simpleDateFormat;