From 7ba51665b973790075d6eb9545deff49a3678640 Mon Sep 17 00:00:00 2001
From: u7602081 <jun.zhu@anu.edu.au>
Date: Sat, 26 Oct 2024 00:57:09 +1100
Subject: [PATCH] Fix filename conflict issue by appending numbers in
 parentheses

---
 app/build.gradle                                     |  1 +
 .../free/nrw/commons/upload/worker/UploadWorker.kt   | 12 ++++--------
 build.gradle                                         |  2 +-
 3 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 43c1695dab..b21d02b392 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -50,6 +50,7 @@ dependencies {
     implementation "com.google.android.material:material:1.9.0"
     implementation 'com.karumi:dexter:5.0.0'
     implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0'
+    implementation 'androidx.test.uiautomator:uiautomator:2.2.0'
 
     // Jetpack Compose
     def composeBom = platform('androidx.compose:compose-bom:2024.08.00')
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 fb2ca7b3ac..c919f4d79b 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
@@ -556,20 +556,16 @@ class UploadWorker(
                     fileName
                 } else {
                     if (fileName.indexOf('.') == -1) {
-                        "$fileName $sequenceNumber"
+                        "$fileName ($sequenceNumber)"
                     } else {
-                        val regex =
-                            Pattern.compile("^(.*)(\\..+?)$")
+                        val regex = Pattern.compile("^(.*)(\\..+?)$")
                         val regexMatcher = regex.matcher(fileName)
-                        regexMatcher.replaceAll("$1 $sequenceNumber$2")
+                        regexMatcher.replaceAll("$1 ($sequenceNumber)$2")
                     }
                 }
             if (!mediaClient
                     .checkPageExistsUsingTitle(
-                        String.format(
-                            "File:%s",
-                            sequenceFileName,
-                        ),
+                        String.format("File:%s", sequenceFileName)
                     ).blockingGet()
             ) {
                 break
diff --git a/build.gradle b/build.gradle
index 003163cb8f..e11d4f4fa4 100644
--- a/build.gradle
+++ b/build.gradle
@@ -6,7 +6,7 @@ buildscript {
         maven { url "https://plugins.gradle.org/m2/" }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.5.0'
+        classpath 'com.android.tools.build:gradle:8.6.0'
         classpath 'com.getkeepsafe.dexcount:dexcount-gradle-plugin:0.8.2'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$KOTLIN_VERSION"
         classpath 'org.codehaus.groovy:groovy-all:2.4.15'