diff --git a/app/src/androidTest/java/com/nextcloud/talk/data/database/dao/ChatBlocksDaoTest.kt b/app/src/androidTest/java/com/nextcloud/talk/data/database/dao/ChatBlocksDaoTest.kt
index 8e077f863..6c87b61a7 100644
--- a/app/src/androidTest/java/com/nextcloud/talk/data/database/dao/ChatBlocksDaoTest.kt
+++ b/app/src/androidTest/java/com/nextcloud/talk/data/database/dao/ChatBlocksDaoTest.kt
@@ -180,8 +180,8 @@ class ChatBlocksDaoTest {
             scheduledForDeletion = java.lang.Boolean.FALSE
         )
 
-    private fun createConversationEntity(accountId: Long, token: String, roomName: String): ConversationEntity {
-        return ConversationEntity(
+    private fun createConversationEntity(accountId: Long, token: String, roomName: String) =
+        ConversationEntity(
             internalId = "$accountId@$token",
             accountId = accountId,
             token = token,
@@ -229,5 +229,4 @@ class ChatBlocksDaoTest {
             participantType = Participant.ParticipantType.DUMMY,
             recordingConsentRequired = 1
         )
-    }
 }
diff --git a/app/src/androidTest/java/com/nextcloud/talk/utils/ShareUtilsIT.kt b/app/src/androidTest/java/com/nextcloud/talk/utils/ShareUtilsIT.kt
index 47afb647e..ea1ab84b0 100644
--- a/app/src/androidTest/java/com/nextcloud/talk/utils/ShareUtilsIT.kt
+++ b/app/src/androidTest/java/com/nextcloud/talk/utils/ShareUtilsIT.kt
@@ -23,8 +23,8 @@ class ShareUtilsIT {
         assertEquals(TEST_DATE_IN_MILLIS, HttpUtils.parseDate("Mon, 09 Apr 2008 23:55:38 GMT")?.time)
     }
 
-    private fun parseDate2(dateStr: String): Date {
-        return DateUtils.parseDate(
+    private fun parseDate2(dateStr: String): Date =
+        DateUtils.parseDate(
             dateStr, Locale.US,
             HttpUtils.httpDateFormatStr,
             // RFC 822, updated by RFC 1123 with any TZ
@@ -48,7 +48,6 @@ class ShareUtilsIT {
             // RI bug 6641315 claims a cookie of this format was once served by www.yahoo.com
             "EEE MMM d yyyy HH:mm:ss z"
         )
-    }
 
     companion object {
         private const val TEST_DATE_IN_MILLIS = 1207778138000
diff --git a/app/src/gplay/java/com/nextcloud/talk/utils/ClosedInterfaceImpl.kt b/app/src/gplay/java/com/nextcloud/talk/utils/ClosedInterfaceImpl.kt
index 6a2fd0d3b..b16da48f0 100644
--- a/app/src/gplay/java/com/nextcloud/talk/utils/ClosedInterfaceImpl.kt
+++ b/app/src/gplay/java/com/nextcloud/talk/utils/ClosedInterfaceImpl.kt
@@ -24,7 +24,9 @@ import com.nextcloud.talk.jobs.GetFirebasePushTokenWorker
 import java.util.concurrent.TimeUnit
 
 @AutoInjector(NextcloudTalkApplication::class)
-class ClosedInterfaceImpl : ClosedInterface, ProviderInstaller.ProviderInstallListener {
+class ClosedInterfaceImpl :
+    ClosedInterface,
+    ProviderInstaller.ProviderInstallListener {
 
     override val isGooglePlayServicesAvailable: Boolean = isGPlayServicesAvailable()
 
diff --git a/app/src/main/java/com/nextcloud/talk/account/WebViewLoginActivity.kt b/app/src/main/java/com/nextcloud/talk/account/WebViewLoginActivity.kt
index 581002cdc..38a6c2a4b 100644
--- a/app/src/main/java/com/nextcloud/talk/account/WebViewLoginActivity.kt
+++ b/app/src/main/java/com/nextcloud/talk/account/WebViewLoginActivity.kt
@@ -155,7 +155,9 @@ class WebViewLoginActivity : BaseActivity() {
 
         val webauthnOptionsBuilder = WebauthnDialogOptions.builder().setShowSdkLogo(true).setAllowSkipPin(true)
         webViewWebauthnBridge = WebViewWebauthnBridge.createInstanceForWebView(
-            this, binding.webview, webauthnOptionsBuilder
+            this,
+            binding.webview,
+            webauthnOptionsBuilder
         )
 
         CookieSyncManager.createInstance(this)
@@ -430,7 +432,8 @@ class WebViewLoginActivity : BaseActivity() {
                 return null
             }
         }
-        return if (!TextUtils.isEmpty(loginData.serverUrl) && !TextUtils.isEmpty(loginData.username) &&
+        return if (!TextUtils.isEmpty(loginData.serverUrl) &&
+            !TextUtils.isEmpty(loginData.username) &&
             !TextUtils.isEmpty(loginData.token)
         ) {
             loginData
diff --git a/app/src/main/java/com/nextcloud/talk/chat/ChatActivity.kt b/app/src/main/java/com/nextcloud/talk/chat/ChatActivity.kt
index ea5540e76..4ad332bcd 100644
--- a/app/src/main/java/com/nextcloud/talk/chat/ChatActivity.kt
+++ b/app/src/main/java/com/nextcloud/talk/chat/ChatActivity.kt
@@ -723,7 +723,8 @@ class ChatActivity :
                         ) {
                             val retentionPeriod = retentionOfSIPRoom(spreedCapabilities)
                             val systemMessage = currentConversation?.lastMessage?.systemMessageType
-                            if (retentionPeriod != 0 && (
+                            if (retentionPeriod != 0 &&
+                                (
                                     systemMessage == ChatMessage.SystemMessageType.CALL_ENDED ||
                                         systemMessage == ChatMessage.SystemMessageType.CALL_ENDED_EVERYONE
                                     )
@@ -740,7 +741,8 @@ class ChatActivity :
                         ) {
                             val retentionPeriod = retentionOfInstantMeetingRoom(spreedCapabilities)
                             val systemMessage = currentConversation?.lastMessage?.systemMessageType
-                            if (retentionPeriod != 0 && (
+                            if (retentionPeriod != 0 &&
+                                (
                                     systemMessage == ChatMessage.SystemMessageType.CALL_ENDED ||
                                         systemMessage == ChatMessage.SystemMessageType.CALL_ENDED_EVERYONE
                                     )