From e193360ba3453a70d9bcae90a34a20f033b8f3f6 Mon Sep 17 00:00:00 2001
From: Rohit Verma <rv17837@outlook.com>
Date: Sun, 3 Aug 2025 12:18:51 +0530
Subject: [PATCH] chore: upgrade target SDK and refactor function signatures to
 resolve build issues

---
 app/build.gradle.kts                          |  4 ++--
 .../fr/free/nrw/commons/utils/ConfigUtils.kt  |  2 +-
 .../fr/free/nrw/commons/utils/ImageUtils.kt   | 24 +++++++++++--------
 3 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 674a6473f..32f2ee415 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -18,12 +18,12 @@ if (isRunningOnTravisAndIsNotPRBuild) {
 
 android {
     namespace = "fr.free.nrw.commons"
-    compileSdk = 34
+    compileSdk = 35
 
     defaultConfig {
         applicationId = "fr.free.nrw.commons"
         minSdk = 21
-        targetSdk = 34
+        targetSdk = 35
         versionCode = 1055
         versionName = "5.6.1"
 
diff --git a/app/src/main/java/fr/free/nrw/commons/utils/ConfigUtils.kt b/app/src/main/java/fr/free/nrw/commons/utils/ConfigUtils.kt
index 332c8d023..9a2b83287 100644
--- a/app/src/main/java/fr/free/nrw/commons/utils/ConfigUtils.kt
+++ b/app/src/main/java/fr/free/nrw/commons/utils/ConfigUtils.kt
@@ -12,7 +12,7 @@ object ConfigUtils {
     val isBetaFlavour: Boolean = BuildConfig.FLAVOR == "beta"
 
     @JvmStatic
-    private fun Context.getVersionName(): String =
+    private fun Context.getVersionName(): String? =
         try {
             packageManager.getPackageInfo(packageName, 0).versionName
         } catch (e: PackageManager.NameNotFoundException) {
diff --git a/app/src/main/java/fr/free/nrw/commons/utils/ImageUtils.kt b/app/src/main/java/fr/free/nrw/commons/utils/ImageUtils.kt
index ebff3d054..fa538bb21 100644
--- a/app/src/main/java/fr/free/nrw/commons/utils/ImageUtils.kt
+++ b/app/src/main/java/fr/free/nrw/commons/utils/ImageUtils.kt
@@ -24,6 +24,7 @@ import io.reactivex.android.schedulers.AndroidSchedulers
 import io.reactivex.disposables.CompositeDisposable
 import io.reactivex.schedulers.Schedulers
 import timber.log.Timber
+import androidx.core.graphics.createBitmap
 
 /**
  * Created by blueSir9 on 3/10/17.
@@ -307,16 +308,19 @@ object ImageUtils {
      * * @return
      */
     @JvmStatic
-    fun addRedBorder(bitmap: Bitmap, borderSize: Int, context: Context): Bitmap {
-        val bmpWithBorder = Bitmap.createBitmap(
-            bitmap.width + borderSize * 2,
-            bitmap.height + borderSize * 2,
-            bitmap.config
-        )
-        val canvas = Canvas(bmpWithBorder)
-        canvas.drawColor(ContextCompat.getColor(context, R.color.deleteRed))
-        canvas.drawBitmap(bitmap, borderSize.toFloat(), borderSize.toFloat(), null)
-        return bmpWithBorder
+    fun addRedBorder(bitmap: Bitmap, borderSize: Int, context: Context): Bitmap? {
+        return bitmap.config?.let { config ->
+            val bmpWithBorder =
+                createBitmap(
+                    width = bitmap.width + borderSize * 2,
+                    height = bitmap.height + borderSize * 2,
+                    config = config
+                )
+            val canvas = Canvas(bmpWithBorder)
+            canvas.drawColor(ContextCompat.getColor(context, R.color.deleteRed))
+            canvas.drawBitmap(bitmap, borderSize.toFloat(), borderSize.toFloat(), null)
+            return bmpWithBorder
+        }
     }
 
     /**