Merge branch 'develop' into fix/crash-on-nightly-incorrect-di-cast

libraries/androidutils/src/main/kotlin/io/element/android/libraries/androidutils/diff/DiffCacheUpdater.kt

@@ -28,7 +28,7 @@ class DiffCacheUpdater<ListItem, CachedItem>(
     private val cacheInvalidator: DiffCacheInvalidator<CachedItem> = DefaultDiffCacheInvalidator(),
     private val areItemsTheSame: (oldItem: ListItem?, newItem: ListItem?) -> Boolean,
 ) {
-    private val lock = Object()
+    private val lock = Any()
     private var prevOriginalList: List<ListItem> = emptyList()
 
     private val listUpdateCallback = object : ListUpdateCallback {

libraries/androidutils/src/main/kotlin/io/element/android/libraries/androidutils/text/LinkifyHelper.kt

@@ -30,6 +30,7 @@ object LinkifyHelper {
         @LinkifyCompat.LinkifyMask linkifyMask: Int = Linkify.WEB_URLS or Linkify.PHONE_NUMBERS or Linkify.EMAIL_ADDRESSES,
     ): CharSequence {
         // Convert the text to a Spannable to be able to add URL spans, return the original text if it's not possible (in tests, i.e.)
+        @Suppress("USELESS_ELVIS")
         val spannable = text.toSpannable() ?: return text
 
         // Get all URL spans, as they will be removed by LinkifyCompat.addLinks