Merge pull request #5852 from element-hq/renovate/io.nlopez.compose.rules-detekt-0.x

fix(deps): update dependency io.nlopez.compose.rules:detekt to v0.5.1

build.gradle.kts

@@ -46,7 +46,7 @@ allprojects {
         config.from(files("$rootDir/tools/detekt/detekt.yml"))
     }
     dependencies {
-        detektPlugins("io.nlopez.compose.rules:detekt:0.4.28")
+        detektPlugins("io.nlopez.compose.rules:detekt:0.5.1")
         detektPlugins(project(":tests:detekt-rules"))
     }
 

features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/pin/DefaultPinCodeManager.kt

@@ -71,7 +71,7 @@ class DefaultPinCodeManager(
                     lockScreenStore.onWrongPin()
                 }
             }
-        } catch (failure: Throwable) {
+        } catch (_: Throwable) {
             false
         }
     }

features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/debug/EventDebugInfoView.kt

@@ -112,7 +112,7 @@ fun EventDebugInfoView(
 private fun prettyJSON(maybeJSON: String): String {
     return try {
         JSONObject(maybeJSON).toString(2)
-    } catch (e: JSONException) {
+    } catch (_: JSONException) {
         // Prefer not pretty-printing over crashing if the data is not actually JSON
         maybeJSON
     }

libraries/androidutils/src/main/kotlin/io/element/android/libraries/androidutils/browser/ChromeCustomTab.kt

@@ -60,7 +60,7 @@ fun Activity.openUrlInChromeCustomTab(
                 })
             }
             .launchUrl(this, url.toUri())
-    } catch (activityNotFoundException: ActivityNotFoundException) {
+    } catch (_: ActivityNotFoundException) {
         openUrlInExternalApp(url)
     }
 }

libraries/androidutils/src/main/kotlin/io/element/android/libraries/androidutils/hash/Hash.kt

@@ -20,7 +20,7 @@ fun String.hash() = try {
     digest.digest()
         .joinToString("") { String.format(Locale.ROOT, "%02X", it) }
         .lowercase(Locale.ROOT)
-} catch (exc: Exception) {
+} catch (_: Exception) {
     // Should not happen, but just in case
     hashCode().toString()
 }

libraries/androidutils/src/main/kotlin/io/element/android/libraries/androidutils/system/SystemUtils.kt

@@ -32,7 +32,7 @@ fun Context.getApplicationLabel(packageName: String): String {
     return try {
         val ai = packageManager.getApplicationInfoCompat(packageName, 0)
         packageManager.getApplicationLabel(ai).toString()
-    } catch (e: PackageManager.NameNotFoundException) {
+    } catch (_: PackageManager.NameNotFoundException) {
         packageName
     }
 }
@@ -96,7 +96,7 @@ fun Context.startNotificationSettingsIntent(
         } else {
             startActivity(intent)
         }
-    } catch (activityNotFoundException: ActivityNotFoundException) {
+    } catch (_: ActivityNotFoundException) {
         toast(noActivityFoundMessage)
     }
 }
@@ -112,7 +112,7 @@ fun Context.openAppSettingsPage(
                 data = Uri.fromParts("package", packageName, null)
             }
         )
-    } catch (activityNotFoundException: ActivityNotFoundException) {
+    } catch (_: ActivityNotFoundException) {
         toast(noActivityFoundMessage)
     }
 }
@@ -126,7 +126,7 @@ fun Context.startInstallFromSourceIntent(
         .setData("package:$packageName".toUri())
     try {
         activityResultLauncher.launch(intent)
-    } catch (activityNotFoundException: ActivityNotFoundException) {
+    } catch (_: ActivityNotFoundException) {
         toast(noActivityFoundMessage)
     }
 }
@@ -157,7 +157,7 @@ fun Context.startSharePlainTextIntent(
         } else {
             startActivity(intent)
         }
-    } catch (activityNotFoundException: ActivityNotFoundException) {
+    } catch (_: ActivityNotFoundException) {
         toast(noActivityFoundMessage)
     }
 }

libraries/core/src/main/kotlin/io/element/android/libraries/core/hash/Hash.kt

@@ -21,7 +21,7 @@ fun String.md5() = try {
     digest.digest()
         .joinToString("") { String.format(locale, "%02X", it) }
         .lowercase(locale)
-} catch (exc: Exception) {
+} catch (_: Exception) {
     // Should not happen, but just in case
     hashCode().toString()
 }

libraries/core/src/main/kotlin/io/element/android/libraries/core/uri/UrlUtils.kt

@@ -14,7 +14,7 @@ fun String.isValidUrl(): Boolean {
     return try {
         URI(this).toURL()
         true
-    } catch (t: Throwable) {
+    } catch (_: Throwable) {
         false
     }
 }

libraries/fullscreenintent/impl/src/main/kotlin/io/element/android/libraries/fullscreenintent/impl/FullScreenIntentPermissionsPresenter.kt

@@ -88,7 +88,7 @@ class FullScreenIntentPermissionsPresenter(
                     "package:${buildMeta.applicationId}".toUri()
                 )
                 externalIntentLauncher.launch(intent)
-            } catch (e: ActivityNotFoundException) {
+            } catch (_: ActivityNotFoundException) {
                 val intent = Intent(Settings.ACTION_APP_NOTIFICATION_SETTINGS)
                     .putExtra(Settings.EXTRA_APP_PACKAGE, buildMeta.applicationId)
                 externalIntentLauncher.launch(intent)

libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/roomlist/RoomList.kt

@@ -65,7 +65,7 @@ suspend fun RoomList.awaitLoaded(timeout: Duration = Duration.INFINITE) {
                 it is RoomList.LoadingState.Loaded
             }
         }
-    } catch (timeoutException: TimeoutCancellationException) {
+    } catch (_: TimeoutCancellationException) {
         Timber.d("awaitAllRoomsAreLoaded: no response after $timeout")
     }
 }

libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/RoomSyncSubscriber.kt

@@ -34,7 +34,7 @@ class RoomSyncSubscriber(
                     }
                     subscribedRoomIds.add(roomId)
                 } catch (exception: Exception) {
-                    Timber.e("Failed to subscribe to room $roomId")
+                    Timber.e(exception, "Failed to subscribe to room $roomId")
                 }
             }
         }

libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/roomlist/RoomListExtensions.kt

@@ -48,7 +48,7 @@ fun RoomListInterface.loadingStateFlow(): Flow<RoomListLoadingState> =
         try {
             send(result.state)
         } catch (exception: Exception) {
-            Timber.d("loadingStateFlow() initialState failed.")
+            Timber.d(exception, "loadingStateFlow() initialState failed.")
         }
         result.stateStream
     }.catch {

libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/util/Error.kt

@@ -14,10 +14,10 @@ import timber.log.Timber
 fun logError(throwable: Throwable) {
     when (throwable) {
         is ClientException.Generic -> {
-            Timber.e("Error ${throwable.msg}", throwable)
+            Timber.e(throwable, "Error ${throwable.msg}")
         }
         else -> {
-            Timber.e("Error", throwable)
+            Timber.e(throwable, "Error")
         }
     }
 }

libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/widget/RustWidgetDriver.kt

@@ -62,7 +62,7 @@ class RustWidgetDriver(
     override suspend fun send(message: String) {
         try {
             driverAndHandle.handle.send(message)
-        } catch (e: IllegalStateException) {
+        } catch (_: IllegalStateException) {
             // The handle is closed, ignore
         }
     }

libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/troubleshoot/PushLoopbackTest.kt

@@ -56,7 +56,7 @@ class PushLoopbackTest(
         }
         val testPushResult = try {
             pushService.testPush(sessionId)
-        } catch (pusherRejected: PushGatewayFailure.PusherRejected) {
+        } catch (_: PushGatewayFailure.PusherRejected) {
             val hasQuickFix = pushService.getCurrentPushProvider(sessionId)?.canRotateToken() == true
             delegate.updateState(
                 description = stringProvider.getString(R.string.troubleshoot_notifications_test_push_loop_back_failure_1),

libraries/pushproviders/firebase/src/main/kotlin/io/element/android/libraries/pushproviders/firebase/FirebaseStore.kt

@@ -40,7 +40,7 @@ class SharedPreferencesFirebaseStore(
             if (k == PREFS_KEY_FCM_TOKEN) {
                 try {
                     flow.value = getFcmToken()
-                } catch (e: Exception) {
+                } catch (_: Exception) {
                     flow.value = null
                 }
             }

tests/testutils/src/main/kotlin/io/element/android/tests/testutils/LongTask.kt

@@ -34,7 +34,7 @@ suspend fun awaitWithLatch(timeout: Duration = 300.milliseconds, block: (Complet
         withTimeout(timeout) {
             latch.also(block).await()
         }
-    } catch (exception: TimeoutCancellationException) {
+    } catch (_: TimeoutCancellationException) {
         latch.complete(Unit)
     }
 }

tools/detekt/detekt.yml

@@ -150,7 +150,7 @@ exceptions:
   TooGenericExceptionCaught:
     active: false
   SwallowedException:
-    active: false
+    active: true
   ThrowingExceptionsWithoutMessageOrCause:
     active: true
   TooGenericExceptionThrown:
@@ -224,27 +224,12 @@ comments:
 Compose:
   CompositionLocalAllowlist:
     active: true
-    # You can optionally define a list of CompositionLocals that are allowed here
-    allowedCompositionLocals:
-      - LocalCompoundColors
-      - LocalSnackbarDispatcher
-      - LocalCameraPositionState
-      - LocalMediaItemPresenterFactories
-      - LocalTimelineItemPresenterFactories
-      - LocalRoomMemberProfilesCache
-      - LocalMentionSpanUpdater
-      - LocalAnalyticsService
-      - LocalBuildMeta
-      - LocalUiTestMode
-      - LocalSdkIntVersionProvider
   CompositionLocalNaming:
     active: true
   ContentEmitterReturningValues:
     active: true
     # You can optionally add your own composables here
     # contentEmitters: MyComposable,MyOtherComposable
-  ModifierComposable:
-    active: true
   ModifierMissing:
     active: true
   ModifierReused:
@@ -267,8 +252,6 @@ Compose:
     active: true
   PreviewPublic:
     active: true
-    # You can optionally disable that only previews with @PreviewParameter are flagged
-    previewPublicOnlyIfParams: false
   RememberMissing:
     active: true
   UnstableCollections: