Fix kotling warnings for Image.kt and Folder.kt (part of Issue commons-app#5996) (commons-app#6441)

benshung · nicolas-raoul · web-flow · commit 6bc25ccd9beb · 2025-10-05T22:15:39.000+09:00
* added hash code to folder.kt and image.kt to pair with equals

* fixed deprecation in readParcelable function

---------

Co-authored-by: Nicolas Raoul &lt;nicolas.raoul@gmail.com&gt;
diff --git a/app/src/main/java/fr/free/nrw/commons/customselector/model/Folder.kt b/app/src/main/java/fr/free/nrw/commons/customselector/model/Folder.kt
@@ -39,4 +39,11 @@ data class Folder(
 
         return true
     }
+
+    override fun hashCode(): Int {
+        var result = bucketId.hashCode()
+        result = 31 * result + name.hashCode()
+        result = 31 * result + images.hashCode()
+        return result
+    }
 }
diff --git a/app/src/main/java/fr/free/nrw/commons/customselector/model/Image.kt b/app/src/main/java/fr/free/nrw/commons/customselector/model/Image.kt
@@ -1,6 +1,7 @@
 package fr.free.nrw.commons.customselector.model
 
 import android.net.Uri
+import android.os.Build
 import android.os.Parcel
 import android.os.Parcelable
 
@@ -48,7 +49,12 @@ data class Image(
         this(
             parcel.readLong(),
             parcel.readString()!!,
-            parcel.readParcelable(Uri::class.java.classLoader)!!,
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+                parcel.readParcelable(Uri::class.java.classLoader, Uri::class.java)!!
+            } else {
+                @Suppress("DEPRECATION")
+                parcel.readParcelable(Uri::class.java.classLoader)!!
+            },
             parcel.readString()!!,
             parcel.readLong(),
             parcel.readString()!!,
@@ -121,4 +127,16 @@ data class Image(
 
         override fun newArray(size: Int): Array<Image?> = arrayOfNulls(size)
     }
+
+    override fun hashCode(): Int {
+        var result = id.hashCode()
+        result = 31 * result + bucketId.hashCode()
+        result = 31 * result + name.hashCode()
+        result = 31 * result + uri.hashCode()
+        result = 31 * result + path.hashCode()
+        result = 31 * result + bucketName.hashCode()
+        result = 31 * result + sha1.hashCode()
+        result = 31 * result + date.hashCode()
+        return result
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -39,4 +39,11 @@ data class Folder(`
`39`	`39`
`40`	`40`	`return true`
`41`	`41`	`}`
	`42`	`+`
	`43`	`+ override fun hashCode(): Int {`
	`44`	`+ var result = bucketId.hashCode()`
	`45`	`+ result = 31 * result + name.hashCode()`
	`46`	`+ result = 31 * result + images.hashCode()`
	`47`	`+ return result`
	`48`	`+ }`
`42`	`49`	`}`