Merge branch 'main' into fix/nearby-offline-crash-6469

Author: nicolas-raoul

app/build.gradle.kts

@@ -6,6 +6,7 @@ plugins {
     alias(libs.plugins.jetbrains.kotlin.android)
     alias(libs.plugins.kotlin.kapt)
     alias(libs.plugins.kotlin.parcelize)
+    alias(libs.plugins.compose.compiler)
 }
 
 apply(from = "$rootDir/jacoco.gradle")
@@ -182,9 +183,6 @@ android {
         compose = true
     }
     buildToolsVersion = buildToolsVersion
-    composeOptions {
-        kotlinCompilerExtensionVersion = "1.5.8"
-    }
     packaging {
         jniLibs {
             excludes += listOf("META-INF/androidx.*")

app/src/main/java/fr/free/nrw/commons/OkHttpConnectionFactory.kt

@@ -91,14 +91,17 @@ private class UnsuccessfulResponseInterceptor : Interceptor {
                     if (ERRORS_PREFIX == responseBody.string()) {
                         rsp.body.use { body ->
                             val bodyString = body!!.string()
-
-                            throw MwIOException(
-                                "MediaWiki API returned error: $bodyString",
-                                GsonUtil.defaultGson.fromJson(
-                                    bodyString,
-                                    MwErrorResponse::class.java
-                                ).error!!,
+                            
+                            val errorResponse = GsonUtil.defaultGson.fromJson(
+                                bodyString,
+                                MwErrorResponse::class.java
                             )
+                            if (errorResponse?.error != null) {
+                                throw MwIOException(
+                                    "MediaWiki API returned error: $bodyString",
+                                    errorResponse.error
+                                )
+                            }
                         }
                     }
                 }

app/src/main/java/fr/free/nrw/commons/explore/ExploreFragment.kt

@@ -64,6 +64,9 @@ class ExploreFragment : CommonsDaggerSupportFragment() {
             override fun onPageScrollStateChanged(state: Int) = Unit
             override fun onPageSelected(position: Int) {
                 binding!!.viewPager.canScroll = position != 2
+                // based on which tab we are now recreate the options menu
+                activity?.invalidateOptionsMenu()
+
                 if (position == 2) {
                     mapRootFragment?.requestLocationIfNeeded()
                 }
@@ -178,19 +181,6 @@ class ExploreFragment : CommonsDaggerSupportFragment() {
             if (binding!!.viewPager.currentItem == 2) {
                 others.setVisible(true)
             }
-
-            // if on Map tab, show all menu options, else only show search
-            binding!!.viewPager.addOnPageChangeListener(object : OnPageChangeListener {
-                override fun onPageScrolled(position: Int, positionOffset: Float, positionOffsetPixels: Int) = Unit
-                override fun onPageScrollStateChanged(state: Int) = Unit
-                override fun onPageSelected(position: Int) {
-                    binding!!.viewPager.canScroll = position != 2
-                    others.setVisible(position == 2)
-                    if (position == 2) {
-                        mapRootFragment?.requestLocationIfNeeded()
-                    }
-                }
-            })
         } else {
             inflater.inflate(R.menu.menu_search, menu)
         }

app/src/main/java/fr/free/nrw/commons/nearby/presenter/NearbyParentFragmentPresenter.kt

@@ -506,6 +506,93 @@ class NearbyParentFragmentPresenter
         }
     }
 
+    /**
+     * Creates a HashMap mapping place locations (LatLng) to the associated places.
+     *
+     * @param places The list of Places used to create HashMap entries
+     * @param startIndex Only Places with indices between startIndex and places.lastIndex
+     * (inclusive) will be used to create the HashMap. This can be useful for avoiding redundant
+     * computation when calling this method on the same places list multiple times.
+     *
+     * @return The HashMap containing (Place's LatLng, Place) entries.
+     */
+    private fun getLocationPlaceMap(places: List<Place>, startIndex: Int): HashMap<LatLng, Place> {
+        val map = hashMapOf<LatLng, Place>()
+
+        for (i in startIndex..places.lastIndex) {
+            map[places[i].location] = places[i]
+        }
+
+        return map
+    }
+
+    /**
+     * Ensures the correct bookmark boolean value for Places whose bookmarks have changed.
+     * This bookmark information is retrieved from the bookmarkLocationDao.
+     *
+     * @param updatedGroups The MarkerPlaceGroups which will be displayed on the map to the user.
+     * @param bookmarkChangedPlacesIndex Only Places at indices greater than or equal to this number
+     * in bookmarkChangedPlaces will be handled. This can be useful for avoiding redundant
+     * computation when calling this method multiple times.
+     *
+     * @return The updated bookmarkChangedPlacesIndex used in future calls to this method.
+     */
+    private suspend fun handleBookmarksToggled(
+        updatedGroups: MutableList<MarkerPlaceGroup>,
+        bookmarkChangedPlacesIndex: Int
+    ): Int {
+        var i = bookmarkChangedPlacesIndex
+        if (i < bookmarkChangedPlaces.size) {
+            val bookmarkChangedPlacesBacklog = getLocationPlaceMap(bookmarkChangedPlaces, i)
+
+            i += bookmarkChangedPlacesBacklog.size
+            for ((index, group) in updatedGroups.withIndex()) {
+                if (bookmarkChangedPlacesBacklog.containsKey(group.place.location)) {
+                    updatedGroups[index] = MarkerPlaceGroup(
+                        bookmarkLocationDao
+                            .findBookmarkLocation(updatedGroups[index].place.name),
+                        updatedGroups[index].place
+                    )
+                }
+            }
+        }
+
+        return i
+    }
+
+    /**
+     * Ensures any clicked Places are updated using existing Place data
+     * and not by data from regular/batched WikiData server responses.
+     *
+     * @param updatedGroups The MarkerPlaceGroups which will be displayed on the map to the user.
+     * @param clickedPlacesIndex Only Places at indices greater than or equal to this number
+     * in clickedPlaces will be handled. This can be useful for avoiding redundant computation when
+     * calling this method multiple times.
+     *
+     * @return The updated clickedPlacesIndex used in future calls to this method.
+     */
+    private fun handlePlacesClicked(
+        updatedGroups: MutableList<MarkerPlaceGroup>,
+        clickedPlacesIndex: Int
+    ): Int {
+        var i = clickedPlacesIndex
+        if (i < clickedPlaces.size) {
+            val clickedPlacesBacklog = getLocationPlaceMap(clickedPlaces, i)
+
+            i += clickedPlacesBacklog.size
+            for ((index, group) in updatedGroups.withIndex()) {
+                if (clickedPlacesBacklog.containsKey(group.place.location)) {
+                    updatedGroups[index] = MarkerPlaceGroup(
+                        updatedGroups[index].isBookmarked,
+                        clickedPlacesBacklog[group.place.location]
+                    )
+                }
+            }
+        }
+
+        return i
+    }
+
     /**
      * Load the places' details from cache and Wikidata query, and update these details on the map
      * as and when they arrive.
@@ -526,8 +613,6 @@ class NearbyParentFragmentPresenter
             // clear past clicks and bookmarkChanged queues
             clickedPlaces.clear()
             bookmarkChangedPlaces.clear()
-            var clickedPlacesIndex = 0
-            var bookmarkChangedPlacesIndex = 0
 
             val updatedGroups = nearbyPlaceGroups.toMutableList()
             // first load cached places:
@@ -546,50 +631,17 @@ class NearbyParentFragmentPresenter
                 updatedGroups, collectResults)
 
             var collectCount = 0
+            var clickedPlacesIndex = 0
+            var bookmarkChangedPlacesIndex = 0
             while (collectCount < indicesToUpdate.size) {
                 val resultList = collectResults.receive()
 
                 processResults(resultList, updatedGroups)
+                
+                clickedPlacesIndex = handlePlacesClicked(updatedGroups, clickedPlacesIndex)
 
-                // handle any places clicked
-                if (clickedPlacesIndex < clickedPlaces.size) {
-                    val clickedPlacesBacklog = hashMapOf<LatLng, Place>()
-                    while (clickedPlacesIndex < clickedPlaces.size) {
-                        clickedPlacesBacklog.put(
-                            clickedPlaces[clickedPlacesIndex].location,
-                            clickedPlaces[clickedPlacesIndex]
-                        )
-                        ++clickedPlacesIndex
-                    }
-                    for ((index, group) in updatedGroups.withIndex()) {
-                        if (clickedPlacesBacklog.containsKey(group.place.location)) {
-                            updatedGroups[index] = MarkerPlaceGroup(
-                                updatedGroups[index].isBookmarked,
-                                clickedPlacesBacklog[group.place.location]
-                            )
-                        }
-                    }
-                }
-                // handle any bookmarks toggled
-                if (bookmarkChangedPlacesIndex < bookmarkChangedPlaces.size) {
-                    val bookmarkChangedPlacesBacklog = hashMapOf<LatLng, Place>()
-                    while (bookmarkChangedPlacesIndex < bookmarkChangedPlaces.size) {
-                        bookmarkChangedPlacesBacklog.put(
-                            bookmarkChangedPlaces[bookmarkChangedPlacesIndex].location,
-                            bookmarkChangedPlaces[bookmarkChangedPlacesIndex]
-                        )
-                        ++bookmarkChangedPlacesIndex
-                    }
-                    for ((index, group) in updatedGroups.withIndex()) {
-                        if (bookmarkChangedPlacesBacklog.containsKey(group.place.location)) {
-                            updatedGroups[index] = MarkerPlaceGroup(
-                                bookmarkLocationDao
-                                    .findBookmarkLocation(updatedGroups[index].place.name),
-                                updatedGroups[index].place
-                            )
-                        }
-                    }
-                }
+                bookmarkChangedPlacesIndex = handleBookmarksToggled(updatedGroups,
+                                                                    bookmarkChangedPlacesIndex)
                 schedulePlacesUpdate(updatedGroups)
                 collectCount += resultList.size
             }

app/src/main/res/values-ps/strings.xml

@@ -101,7 +101,7 @@
   <string name="menu_from_camera">انځور اخيستل</string>
   <string name="menu_nearby">نژدې</string>
   <string name="provider_contributions">زما پورته کېدنې</string>
-  <string name="menu_copy_link">وېبتړ لمېسل</string>
+  <string name="menu_copy_link">تړونی لمېسل</string>
   <string name="menu_link_copied">وېبتړ ټينگدړې ته لمېسل شوی دی</string>
   <string name="menu_share">شريکول</string>
   <string name="menu_view_file_page">د دوتنې مخ کتل</string>

app/src/main/res/values-se/strings.xml

@@ -116,6 +116,7 @@
   <string name="no_uploads_yet">It leat vel bajásluđen ovttage gova.</string>
   <string name="menu_retry_upload">Geahččal ođđasit</string>
   <string name="menu_cancel_upload">Gaskkalduhte</string>
+  <string name="language_search_all_languages">Buot gielat</string>
   <string name="media_upload_policy">Go sádden dán gova sisa, de seammás julggaštan ahte lea mu bargu, mas ii leat duogášvuoigatvuohta bargui dahje selfiide, ja muđuige soahpá &lt;a href=\"https://commons.wikimedia.org/wiki/Commons:Policies_and_guidelines\"&gt;Wikimedia Commons policies&lt;/a&gt;.</string>
   <string name="menu_download">Viečča</string>
   <string name="preference_license">Dábálaš liseansa</string>

build.gradle.kts

@@ -2,6 +2,7 @@
 plugins {
     alias(libs.plugins.android.application) apply false
     alias(libs.plugins.jetbrains.kotlin.android) apply false
+    alias(libs.plugins.compose.compiler) apply false
     alias(libs.plugins.github.triplet.play) apply false
     alias(libs.plugins.getkeepsafe.dexcount)
 }

gradle.properties

@@ -24,3 +24,6 @@ android.enableJetifier=true
 android.jetifier.ignorelist=bcprov-jdk15on
 android.nonTransitiveRClass=false
 android.nonFinalResIds=false
+
+# Enable K2 mode for KAPT (required for Kotlin 2.0+)
+kapt.use.k2=true

gradle/libs.versions.toml

@@ -33,7 +33,7 @@ glide = "4.12.0"
 gson = "2.8.5"
 junit = "4.13.2"
 junitJupiter = "5.10.0"
-kotlin = "1.9.22"
+kotlin = "2.1.0"
 kotlinStdlib = "1.8.0"
 coroutines = "1.7.3"
 leakcanary = "2.10"
@@ -58,7 +58,7 @@ recyclerview = "1.2.0-alpha02"
 recyclerviewFastscroll = "2.0.1"
 retrofit = "2.8.1"
 robolectric = "4.14.1"
-room = "2.6.1"
+room = "2.7.0"
 rules = "1.5.0"
 runner = "1.5.2"
 rxandroid = "2.1.0"
@@ -208,5 +208,6 @@ android-application = { id = "com.android.application", version.ref = "agp" }
 jetbrains-kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
 kotlin-kapt = { id = "org.jetbrains.kotlin.kapt" }
 kotlin-parcelize = { id = "org.jetbrains.kotlin.plugin.parcelize" }
+compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
 github-triplet-play = { id = "com.github.triplet.play", version.ref = "githubTripletPlay" }
 getkeepsafe-dexcount = { id = "com.getkeepsafe.dexcount", version.ref = "dexcount" }