Merge branch 'main' into recent-search

neeldoshii · Dec 11, 2024 · 5415471 · 5415471
2 parents 59fe558 + 9a876fa
commit 5415471
Show file tree

Hide file tree

Showing 65 changed files with 2,161 additions and 2,057 deletions.
diff --git a/app/src/main/java/fr/free/nrw/commons/AboutActivity.java b/app/src/main/java/fr/free/nrw/commons/AboutActivity.java
@@ -180,8 +180,8 @@ public void launchTranslate(View view) {
             getString(R.string.about_translate_cancel),
             positiveButtonRunnable,
             () -> {},
-            spinner,
-            true);
+            spinner
+        );
     }
 
 }
diff --git a/app/src/main/java/fr/free/nrw/commons/LocationPicker/LocationPickerActivity.kt b/app/src/main/java/fr/free/nrw/commons/LocationPicker/LocationPickerActivity.kt
@@ -372,16 +372,18 @@ class LocationPickerActivity : BaseActivity(), LocationPermissionCallback {
      */
     private fun removeLocationFromImage() {
         media?.let {
-            compositeDisposable.add(
-                coordinateEditHelper.makeCoordinatesEdit(
-                    applicationContext, it, "0.0", "0.0", "0.0f"
-                )
-                    .subscribeOn(Schedulers.io())
-                    .observeOn(AndroidSchedulers.mainThread())
-                    .subscribe { _ ->
-                        Timber.d("Coordinates removed from the image")
-                    }
+            coordinateEditHelper.makeCoordinatesEdit(
+                applicationContext, it, "0.0", "0.0", "0.0f"
             )
+                ?.subscribeOn(Schedulers.io())
+                ?.observeOn(AndroidSchedulers.mainThread())
+                ?.subscribe { _ ->
+                    Timber.d("Coordinates removed from the image")
+                }?.let { it1 ->
+                    compositeDisposable.add(
+                        it1
+                    )
+                }
         }
         setResult(RESULT_OK, Intent())
         finish()
@@ -473,19 +475,21 @@ class LocationPickerActivity : BaseActivity(), LocationPermissionCallback {
     fun updateCoordinates(latitude: String, longitude: String, accuracy: String) {
         media?.let {
             try {
-                compositeDisposable.add(
-                    coordinateEditHelper.makeCoordinatesEdit(
-                        applicationContext,
-                        it,
-                        latitude,
-                        longitude,
-                        accuracy
-                    ).subscribeOn(Schedulers.io())
-                        .observeOn(AndroidSchedulers.mainThread())
-                        .subscribe { _ ->
-                            Timber.d("Coordinates updated")
-                        }
-                )
+                coordinateEditHelper.makeCoordinatesEdit(
+                    applicationContext,
+                    it,
+                    latitude,
+                    longitude,
+                    accuracy
+                )?.subscribeOn(Schedulers.io())
+                    ?.observeOn(AndroidSchedulers.mainThread())
+                    ?.subscribe { _ ->
+                        Timber.d("Coordinates updated")
+                    }?.let { it1 ->
+                        compositeDisposable.add(
+                            it1
+                        )
+                    }
             } catch (e: Exception) {
                 if (e.localizedMessage == CsrfTokenClient.ANONYMOUS_TOKEN_MESSAGE) {
                     val username = sessionManager.userName

diff --git a/app/src/main/java/fr/free/nrw/commons/WelcomeActivity.java b/app/src/main/java/fr/free/nrw/commons/WelcomeActivity.java
@@ -50,6 +50,7 @@ public void onCreate(final Bundle savedInstanceState) {
             copyrightBinding = PopupForCopyrightBinding.inflate(getLayoutInflater());
             final View contactPopupView = copyrightBinding.getRoot();
             dialogBuilder.setView(contactPopupView);
+            dialogBuilder.setCancelable(false);
             dialog = dialogBuilder.create();
             dialog.show();
 

diff --git a/app/src/main/java/fr/free/nrw/commons/auth/LoginActivity.kt b/app/src/main/java/fr/free/nrw/commons/auth/LoginActivity.kt
@@ -319,7 +319,7 @@ class LoginActivity : AccountAuthenticatorActivity() {
             isIndeterminate = true
             setTitle(getString(R.string.logging_in_title))
             setMessage(getString(R.string.logging_in_message))
-            setCanceledOnTouchOutside(false)
+            setCancelable(false)
         }
         progressDialog!!.show()
     }

diff --git a/app/src/main/java/fr/free/nrw/commons/category/CategoriesModel.kt b/app/src/main/java/fr/free/nrw/commons/category/CategoriesModel.kt
@@ -78,7 +78,13 @@ class CategoriesModel
 
             // Newly used category...
             if (category == null) {
-                category = Category(null, item.name, item.description, item.thumbnail, Date(), 0)
+                category = Category(
+                    null, item.name,
+                    item.description,
+                    item.thumbnail,
+                    Date(),
+                    0
+                )
             }
             category.incTimesUsed()
             categoryDao.save(category)

diff --git a/app/src/main/java/fr/free/nrw/commons/category/Category.java b/app/src/main/java/fr/free/nrw/commons/category/Category.java
diff --git a/app/src/main/java/fr/free/nrw/commons/category/Category.kt b/app/src/main/java/fr/free/nrw/commons/category/Category.kt
@@ -0,0 +1,17 @@
+package fr.free.nrw.commons.category
+
+import android.net.Uri
+import java.util.Date
+
+data class Category(
+    var contentUri: Uri? = null,
+    val name: String? = null,
+    val description: String? = null,
+    val thumbnail: String? = null,
+    val lastUsed: Date? = null,
+    var timesUsed: Int = 0
+) {
+    fun incTimesUsed() {
+        timesUsed++
+    }
+}
diff --git a/app/src/main/java/fr/free/nrw/commons/category/CategoryClickedListener.java b/app/src/main/java/fr/free/nrw/commons/category/CategoryClickedListener.java
diff --git a/app/src/main/java/fr/free/nrw/commons/category/CategoryClickedListener.kt b/app/src/main/java/fr/free/nrw/commons/category/CategoryClickedListener.kt
@@ -0,0 +1,5 @@
+package fr.free.nrw.commons.category
+
+interface CategoryClickedListener {
+    fun categoryClicked(item: CategoryItem)
+}