From 7a685b1241f14bd56e83efffbfcecae6ccc11a50 Mon Sep 17 00:00:00 2001
From: "translatewiki.net" <l10n-bot@translatewiki.net>
Date: Mon, 17 Feb 2025 13:01:49 +0100
Subject: [PATCH 1/4] Localisation updates from https://translatewiki.net.

---
 app/src/main/res/values-iw/strings.xml | 9 ++++++---
 app/src/main/res/values-qq/strings.xml | 2 ++
 app/src/main/res/values-zh/strings.xml | 3 +++
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/app/src/main/res/values-iw/strings.xml b/app/src/main/res/values-iw/strings.xml
index 7f2d9a8f1..010e440b1 100644
--- a/app/src/main/res/values-iw/strings.xml
+++ b/app/src/main/res/values-iw/strings.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Authors:
+* A100Star
 * Ademo
 * Alefar
 * Amire80
@@ -27,7 +28,7 @@
   <string name="commons_website">אתר ויקישיתוף</string>
   <string name="exit_location_picker">יציאה מבורר המיקום</string>
   <string name="submit">שליחה</string>
-  <string name="add_another_description">הוספת יאור אחר</string>
+  <string name="add_another_description">הוספת תיאור אחר</string>
   <string name="add_new_contribution">הוספת תרומה חדשה</string>
   <string name="add_contribution_from_camera">הוספת תרומה ממצלמה</string>
   <string name="add_contribution_from_photos">הוספת תרומה מ־Photos</string>
@@ -38,7 +39,7 @@
   <string name="show_captions_description">תיאור</string>
   <string name="nearby_row_image">תמונה</string>
   <string name="nearby_all">הכול</string>
-  <string name="nearby_filter_toggle">להפעיל למעלה</string>
+  <string name="nearby_filter_toggle">הפעלה</string>
   <string name="nearby_filter_search">תצוגת חיפוש</string>
   <string name="nearby_filter_state">מצב המקום</string>
   <string name="appwidget_img">תמונת היום</string>
@@ -149,7 +150,7 @@
   <string name="provider_modifications">שינויים</string>
   <string name="menu_upload_single">העלאה</string>
   <string name="categories_search_text_hint">חיפוש קטגוריות</string>
-  <string name="depicts_search_text_hint">חפשו פריטים שהמדיה שלך מציגה (הר, טאג\' מהאל, וכו\')</string>
+  <string name="depicts_search_text_hint">חפשו פריטים שהמדיה שלכם מציגה (הר, טאג\' מהאל, וכו\')</string>
   <string name="menu_save_categories">שמירה</string>
   <string name="menu_overflow_desc">תפריט גלישה</string>
   <string name="refresh_button">רענון</string>
@@ -846,9 +847,11 @@
   <string name="usages_on_other_wikis_heading">אתרי ויקי אחרים</string>
   <string name="bullet_point">•</string>
   <string name="file_usages_container_heading">שימושים בקובץ</string>
+  <string name="title_activity_single_web_view">SingleWebViewActivity</string>
   <string name="account">חשבון</string>
   <string name="vanish_account">העלמת חשבון</string>
   <string name="account_vanish_request_confirm_title">אזהרת העלמת חשבון</string>
+  <string name="account_vanish_request_confirm">היעלמות היא &lt;b&gt;מוצא אחרון&lt;/b&gt; וצריך &lt;b&gt;להשתמש בו רק כאשר אתם רוצים להפסיק לערוך לנצח&lt;/b&gt; וגם כדי להסתיר כמה שיותר מהאסוציאציות שלכם בעבר.&lt;br/&gt;&lt;br/&gt;מחיקת חשבון בויקישיתוף נעשית על ידי שינוי שם החשבון שלכם כך שאחרים לא יוכלו לזהות את התרומות שלכם בתהליך שנקרא חשבון היעלמות. &lt;b&gt;היעלמות אינה מבטיחה אנונימיות מוחלטת או הסרה של תרומות לפרויקטים&lt;/b&gt;.</string>
   <string name="caption">כותרת</string>
   <string name="caption_copied_to_clipboard">הכותרת הועתקה ללוח</string>
   <string name="congratulations_all_pictures_in_this_album_have_been_either_uploaded_or_marked_as_not_for_upload">ברכותינו, כל התמונות באלבום הזה הועלו או שסומנו לא להעלאה.</string>
diff --git a/app/src/main/res/values-qq/strings.xml b/app/src/main/res/values-qq/strings.xml
index 1be987f42..6b81a5b50 100644
--- a/app/src/main/res/values-qq/strings.xml
+++ b/app/src/main/res/values-qq/strings.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Authors:
+* A100Star
 * Ajeje Brazorf
 * Amire80
 * Cabal
@@ -26,6 +27,7 @@
 <resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="all">
   <string name="submit">{{Identical|Submit}}</string>
   <string name="nearby_all">{{identical|All}}</string>
+  <string name="nearby_filter_toggle">יש קצת בלבול בתרגום עם להחליף למעלה, למרות שהתרגום באופן טכני נכון, המשמעות באנגלית היא החלפה בין מצבים (במקרה הזה, החלפת מצב פעיל) אז אפשר להשתמש בהפעלה כתרגום</string>
   <string name="uploads_pending_notification_indicator">Status text about number of uploads left.\n* %1$d represents number of uploads left, including current one</string>
   <string name="contributions_subtitle">See the current issue [https://phabricator.wikimedia.org/T267142 T267142]  tracked in Phabricator about the &lt;code&gt;&lt;nowiki&gt;|zero=&lt;/nowiki&gt;&lt;/code&gt; option currently not supported on Translatewiki.net with the custom &lt;code&gt;&lt;nowiki&gt;{{PLURAL}}&lt;/nowiki&gt;&lt;/code&gt; rules used by this project for Android, using a non-MediaWiki syntax.</string>
   <string name="multiple_uploads_title">{{Identical|Upload}}</string>
diff --git a/app/src/main/res/values-zh/strings.xml b/app/src/main/res/values-zh/strings.xml
index 93757701c..7543d98b7 100644
--- a/app/src/main/res/values-zh/strings.xml
+++ b/app/src/main/res/values-zh/strings.xml
@@ -18,6 +18,7 @@
 * Huajing
 * Hydra
 * Ken418
+* Kichin
 * Kuailong
 * Lantianjialiang
 * LittlePaw365
@@ -870,4 +871,6 @@
   <string name="caption">说明</string>
   <string name="caption_copied_to_clipboard">已复制到剪贴板</string>
   <string name="congratulations_all_pictures_in_this_album_have_been_either_uploaded_or_marked_as_not_for_upload">恭喜，专辑中的所有图片都已上传或标记为不上传。</string>
+  <string name="show_in_explore">在探索中显示</string>
+  <string name="show_in_nearby">显示在附近</string>
 </resources>

From 40241b4142f6dad40007077f92101689ff2e98e2 Mon Sep 17 00:00:00 2001
From: Sujal <Sujal24092004+github@gmail.com>
Date: Mon, 17 Feb 2025 19:32:45 +0530
Subject: [PATCH 2/4] Fix #6188 (Nearby upload not being linked from Wikidata),
 though it introduces issue #6191

* Make neccesary changes

* Make neccesary changes

* spacing

---------

Co-authored-by: Nicolas Raoul <nicolas.raoul@gmail.com>
---
 .../main/java/fr/free/nrw/commons/nearby/model/ResultTuple.kt   | 2 +-
 .../main/java/fr/free/nrw/commons/upload/worker/UploadWorker.kt | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/fr/free/nrw/commons/nearby/model/ResultTuple.kt b/app/src/main/java/fr/free/nrw/commons/nearby/model/ResultTuple.kt
index bd411c938..0340082ad 100644
--- a/app/src/main/java/fr/free/nrw/commons/nearby/model/ResultTuple.kt
+++ b/app/src/main/java/fr/free/nrw/commons/nearby/model/ResultTuple.kt
@@ -15,7 +15,7 @@ class ResultTuple {
     }
 
     constructor() {
-        language = ""
+        language = "bug" // Basa Ugi language -  TODO Respect the `Default description language`　setting.
         type = ""
         value = ""
     }
diff --git a/app/src/main/java/fr/free/nrw/commons/upload/worker/UploadWorker.kt b/app/src/main/java/fr/free/nrw/commons/upload/worker/UploadWorker.kt
index 75db6ffc0..6d28085b2 100644
--- a/app/src/main/java/fr/free/nrw/commons/upload/worker/UploadWorker.kt
+++ b/app/src/main/java/fr/free/nrw/commons/upload/worker/UploadWorker.kt
@@ -469,7 +469,7 @@ class UploadWorker(
         contribution: Contribution,
     ) {
         val wikiDataPlace = contribution.wikidataPlace
-        if (wikiDataPlace != null && wikiDataPlace.imageValue == null) {
+        if (wikiDataPlace != null) {
             if (!contribution.hasInvalidLocation()) {
                 var revisionID: Long? = null
                 try {

From 98b25acab9c6c515975cbed0b3dc950b05098dc5 Mon Sep 17 00:00:00 2001
From: Jason-Whitmore <jason@whitmore.email>
Date: Tue, 18 Feb 2025 22:42:24 -0800
Subject: [PATCH 3/4] Fixes Issue 5933: Nearby: Display of all nearby pins
 makes the app sluggish, leads to crashes (#6181)

* Place.java: change getWikiDataEntityID() method to increase speed

Before this commit, this method would perform the String replace method on the Wikidata link every time
getWikiDataEntityID() was called. Also, getWikiDataLink() was called. This caused poor performance
since both method calls are slow.

This commit changes the method to only run the slow methods if the entityID field is empty or
null. Once the field is populated, the method simply returns the field. This change allows
getWikiDataEntityID() to run much faster.

* NearbyParentFragmentPresenter.kt: change async and place update parameters

Before this commit, the parameters that configure the async and place update code contributed to
the slow loading of the red and green map markers.

This commit changes the parameters such that the red and green map markers load much faster.

These parameters may need further tuning. This commit's changes are simply an educated
guess at a good parameter set.

* NearbyParentFragment.kt: rewrite Java Drawable caching code to Kotlin

Before this commit, the code which cached Drawables was written in Java.

This commit rewrites that code into the new Kotlin file, which replaces the Java file.

* NearbyParentFragmentPresenter.kt: change loadPlacesDataAsync to retry HTTP requests after failure

Before this commit, when an HTTP request failed, the entire batch of Places would not get updated,
even if it was only one Place in the batch that caused the failure.

This commit changes the code such that upon HTTP request failure, new HTTP requests are sent with
one Place per request. This allows more Places to be fetched from the server.
---
 .../fr/free/nrw/commons/nearby/Place.java     | 12 +++++-
 .../nearby/fragments/NearbyParentFragment.kt  | 38 +++++++++++++++++--
 .../NearbyParentFragmentPresenter.kt          | 36 ++++++++++++++----
 3 files changed, 73 insertions(+), 13 deletions(-)

diff --git a/app/src/main/java/fr/free/nrw/commons/nearby/Place.java b/app/src/main/java/fr/free/nrw/commons/nearby/Place.java
index 21dd14131..3b3b798eb 100644
--- a/app/src/main/java/fr/free/nrw/commons/nearby/Place.java
+++ b/app/src/main/java/fr/free/nrw/commons/nearby/Place.java
@@ -232,13 +232,23 @@ public class Place implements Parcelable {
      */
     @Nullable
     public String getWikiDataEntityId() {
+        if (this.entityID != null && !this.entityID.equals("")) {
+            return this.entityID;
+        }
+
         if (!hasWikidataLink()) {
             Timber.d("Wikidata entity ID is null for place with sitelink %s", siteLinks.toString());
             return null;
         }
 
+        //Determine entityID from link
         String wikiDataLink = siteLinks.getWikidataLink().toString();
-        return wikiDataLink.replace("http://www.wikidata.org/entity/", "");
+
+        if (wikiDataLink.contains("http://www.wikidata.org/entity/")) {
+            this.entityID = wikiDataLink.substring("http://www.wikidata.org/entity/".length());
+            return this.entityID;
+        }
+        return null;
     }
 
     /**
diff --git a/app/src/main/java/fr/free/nrw/commons/nearby/fragments/NearbyParentFragment.kt b/app/src/main/java/fr/free/nrw/commons/nearby/fragments/NearbyParentFragment.kt
index 90167f8e3..d2e73441d 100644
--- a/app/src/main/java/fr/free/nrw/commons/nearby/fragments/NearbyParentFragment.kt
+++ b/app/src/main/java/fr/free/nrw/commons/nearby/fragments/NearbyParentFragment.kt
@@ -11,6 +11,7 @@ import android.content.IntentFilter
 import android.content.res.Configuration
 import android.graphics.Color
 import android.graphics.Paint
+import android.graphics.drawable.Drawable
 import android.location.Location
 import android.location.LocationManager
 import android.net.Uri
@@ -219,6 +220,7 @@ class NearbyParentFragment : CommonsDaggerSupportFragment(), NearbyParentFragmen
 
     @Volatile
     private var stopQuery = false
+    private var drawableCache: MutableMap<Pair<Context, Int>, Drawable>? = null
 
     // Explore map data (for if we came from Explore)
     private var prevZoom = 0.0
@@ -721,6 +723,7 @@ class NearbyParentFragment : CommonsDaggerSupportFragment(), NearbyParentFragmen
                 startMapWithoutPermission()
             }
         }
+        drawableCache = HashMap()
     }
 
     /**
@@ -1501,7 +1504,7 @@ class NearbyParentFragment : CommonsDaggerSupportFragment(), NearbyParentFragmen
                         marker.showInfoWindow()
                         presenter!!.handlePinClicked(updatedPlace)
                         savePlaceToDatabase(place)
-                        val icon = ContextCompat.getDrawable(
+                        val icon = getDrawable(
                             requireContext(),
                             getIconFor(updatedPlace, isBookMarked)
                         )
@@ -2027,8 +2030,35 @@ class NearbyParentFragment : CommonsDaggerSupportFragment(), NearbyParentFragmen
             )
     }
 
+    /**
+     * Gets the specified Drawable object. This is a wrapper method for ContextCompat.getDrawable().
+     * This method caches results from previous calls for faster retrieval.
+     *
+     * @param context The context to use to get the Drawable
+     * @param id The integer that describes the Drawable resource
+     * @return The Drawable object
+     */
+    private fun getDrawable(context: Context?, id: Int?): Drawable? {
+        if (drawableCache == null || context == null || id == null) {
+            return null
+        }
+
+        val key = Pair(context, id)
+        if (!drawableCache!!.containsKey(key)) {
+            val drawable = ContextCompat.getDrawable(context, id)
+
+            if (drawable != null) {
+                drawableCache!![key] = drawable
+            } else {
+                return null
+            }
+        }
+
+        return drawableCache!![key]
+    }
+
     fun convertToMarker(place: Place, isBookMarked: Boolean): Marker {
-        val icon = ContextCompat.getDrawable(requireContext(), getIconFor(place, isBookMarked))
+        val icon = getDrawable(requireContext(), getIconFor(place, isBookMarked))
         val point = GeoPoint(place.location.latitude, place.location.longitude)
         val marker = Marker(binding!!.map)
         marker.position = point
@@ -2430,7 +2460,7 @@ class NearbyParentFragment : CommonsDaggerSupportFragment(), NearbyParentFragmen
                 Marker.ANCHOR_BOTTOM
             )
             startMarker.icon =
-                ContextCompat.getDrawable(
+                getDrawable(
                     this.requireContext(),
                     fr.free.nrw.commons.R.drawable.current_location_marker
                 )
@@ -2488,7 +2518,7 @@ class NearbyParentFragment : CommonsDaggerSupportFragment(), NearbyParentFragmen
             Marker(binding?.map).apply {
                 position = it
                 setAnchor(Marker.ANCHOR_CENTER, Marker.ANCHOR_BOTTOM)
-                icon = ContextCompat.getDrawable(context, R.drawable.current_location_marker)
+                icon = getDrawable(context, R.drawable.current_location_marker)
                 title = "Your Location"
                 textLabelFontSize = 24
                 overlays.add(this)
diff --git a/app/src/main/java/fr/free/nrw/commons/nearby/presenter/NearbyParentFragmentPresenter.kt b/app/src/main/java/fr/free/nrw/commons/nearby/presenter/NearbyParentFragmentPresenter.kt
index ce268f7a3..ed84751b0 100644
--- a/app/src/main/java/fr/free/nrw/commons/nearby/presenter/NearbyParentFragmentPresenter.kt
+++ b/app/src/main/java/fr/free/nrw/commons/nearby/presenter/NearbyParentFragmentPresenter.kt
@@ -25,9 +25,12 @@ import kotlinx.coroutines.Job
 import kotlinx.coroutines.channels.Channel
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.ensureActive
+import kotlinx.coroutines.job
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
+import okhttp3.internal.wait
 import timber.log.Timber
+import java.io.IOException
 import java.lang.reflect.InvocationHandler
 import java.lang.reflect.Method
 import java.lang.reflect.Proxy
@@ -75,8 +78,8 @@ class NearbyParentFragmentPresenter
      * - **connnectionCount**: number of parallel requests
      */
     private object LoadPlacesAsyncOptions {
-        const val BATCH_SIZE = 3
-        const val CONNECTION_COUNT = 3
+        const val BATCH_SIZE = 10
+        const val CONNECTION_COUNT = 20
     }
 
     private var schedulePlacesUpdateJob: Job? = null
@@ -91,7 +94,7 @@ class NearbyParentFragmentPresenter
     private object SchedulePlacesUpdateOptions {
         var skippedCount = 0
         const val SKIP_LIMIT = 3
-        const val SKIP_DELAY_MS = 500L
+        const val SKIP_DELAY_MS = 100L
     }
 
     // used to tell the asynchronous place detail loading job that the places' bookmarked status
@@ -379,13 +382,32 @@ class NearbyParentFragmentPresenter
                             )
                         } catch (e: Exception) {
                             Timber.tag("NearbyPinDetails").e(e)
-                            collectResults.send(indices.map { Pair(it, updatedGroups[it]) })
+                            //HTTP request failed. Try individual places
+                            for (i in indices) {
+                                launch {
+                                    val onePlaceBatch = mutableListOf<Pair<Int, MarkerPlaceGroup>>()
+                                    try {
+                                        val fetchedPlace = nearbyController.getPlaces(
+                                            mutableListOf(updatedGroups[i].place)
+                                        )
+
+                                        onePlaceBatch.add(Pair(i, MarkerPlaceGroup(
+                                            bookmarkLocationDao.findBookmarkLocation(
+                                                fetchedPlace[0]),fetchedPlace[0])))
+                                    } catch (e: Exception) {
+                                        Timber.tag("NearbyPinDetails").e(e)
+                                        onePlaceBatch.add(Pair(i, updatedGroups[i]))
+                                    }
+                                    collectResults.send(onePlaceBatch)
+                                }
+                            }
                         }
                     }
                 }
             }
             var collectCount = 0
-            for (resultList in collectResults) {
+            while (collectCount < indicesToUpdate.size) {
+                val resultList = collectResults.receive()
                 for ((index, fetchedPlaceGroup) in resultList) {
                     val existingPlace = updatedGroups[index].place
                     val finalPlaceGroup = MarkerPlaceGroup(
@@ -442,9 +464,7 @@ class NearbyParentFragmentPresenter
                     }
                 }
                 schedulePlacesUpdate(updatedGroups)
-                if (++collectCount == totalBatches) {
-                    break
-                }
+                collectCount += resultList.size
             }
             collectResults.close()
         }

From 8d0da865695087018081a37fadab71fad6bf0886 Mon Sep 17 00:00:00 2001
From: Sujal <Sujal24092004+github@gmail.com>
Date: Wed, 19 Feb 2025 18:13:58 +0530
Subject: [PATCH 4/4] Automatically Link APKs in PR Discussion After Building
 (#6195)

* Update android.yml

* Update android.yml

* Update android.yml

* Update android.yml

* Update android.yml
---
 .github/workflows/android.yml | 68 ++++++++++++++++++++++++++++++++++-
 1 file changed, 67 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
index 958c13fda..bcbef52fd 100644
--- a/.github/workflows/android.yml
+++ b/.github/workflows/android.yml
@@ -1,6 +1,11 @@
 name: Android CI
 
-on: [push, pull_request, workflow_dispatch]
+on: [push, pull_request, workflow_dispatch]  
+
+permissions:
+  pull-requests: write
+  contents: read
+  actions: read
 
 concurrency:
   group: build-${{ github.event.pull_request.number || github.ref }}
@@ -102,3 +107,64 @@ jobs:
         with:
           name: prodDebugAPK
           path: app/build/outputs/apk/prod/debug/app-*.apk
+      
+      - name: Comment on PR with APK download links
+        if: github.event_name == 'pull_request'
+        uses: actions/github-script@v6
+        with:
+          github-token: ${{secrets.GITHUB_TOKEN}}
+          script: |
+            try {
+              const token = process.env.GITHUB_TOKEN;
+               if (!token) {
+                throw new Error('GITHUB_TOKEN is not set. Please check workflow permissions.');
+               }
+
+
+              const { data: { artifacts } } = await github.rest.actions.listWorkflowRunArtifacts({
+                owner: context.repo.owner,
+                repo: context.repo.repo,
+                run_id: context.runId
+              });
+
+              if (!artifacts || artifacts.length === 0) {
+                console.log('No artifacts found for this workflow run.');
+                return;
+              }
+
+              const betaArtifact = artifacts.find(artifact => artifact.name === "betaDebugAPK");
+              const prodArtifact = artifacts.find(artifact => artifact.name === "prodDebugAPK");
+
+              if (!betaArtifact || !prodArtifact) {
+                console.log('Could not find both Beta and Prod APK artifacts.');
+                console.log('Available artifacts:', artifacts.map(a => a.name).join(', '));
+                return;
+              }
+
+              const betaDownloadUrl = `${context.serverUrl}/${context.repo.owner}/${context.repo.repo}/suites/${context.runId}/artifacts/${betaArtifact.id}`;
+              const prodDownloadUrl = `${context.serverUrl}/${context.repo.owner}/${context.repo.repo}/suites/${context.runId}/artifacts/${prodArtifact.id}`;
+
+              const commentBody = `
+               📱 **APK for pull request is ready to see the changes** 📱  
+              - [Download Beta APK](${betaDownloadUrl})  
+              - [Download Prod APK](${prodDownloadUrl})
+              `;
+
+              await github.rest.issues.createComment({
+                issue_number: context.issue.number,
+                owner: context.repo.owner,
+                repo: context.repo.repo,
+                body: commentBody
+              });
+        
+              console.log('Successfully posted comment with APK download links');
+            } catch (error) {
+              console.error('Error in PR comment creation:', error);
+              if (error.message.includes('GITHUB_TOKEN')) {
+                core.setFailed('Missing or invalid GITHUB_TOKEN. Please check repository secrets configuration.');
+              } else if (error.status === 403) {
+                core.setFailed('Permission denied. Please check workflow permissions in repository settings.');
+              } else {
+                core.setFailed(`Workflow failed: ${error.message}`);
+              }
+            }