gronod/talk-android
1
0
Fork 1
mirror of https://github.com/nextcloud/talk-android synced 2025-08-05 19:15:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

style(ktlint): Fix formatting for ktlint check to succeed

Browse Source 
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
This commit is contained in:
Andy Scherzinger 2025-07-09 20:28:23 +02:00
parent 2e5bcc174c
commit 669a528b14
No known key found for this signature in database
GPG Key ID: 6CADC7E3523C308B
5 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/src/androidTest/java/com/nextcloud/talk/data/database/dao/ChatBlocksDaoTest.kt
View File

@ -180,8 +180,8 @@ class ChatBlocksDaoTest {
scheduledForDeletion = java.lang.Boolean.FALSE scheduledForDeletion = java.lang.Boolean.FALSE
) )
private fun createConversationEntity(accountId: Long, token: String, roomName: String): ConversationEntity { private fun createConversationEntity(accountId: Long, token: String, roomName: String) =
return ConversationEntity( ConversationEntity(
internalId = "$accountId@$token", internalId = "$accountId@$token",
accountId = accountId, accountId = accountId,
token = token, token = token,
@ -229,5 +229,4 @@ class ChatBlocksDaoTest {
participantType = Participant.ParticipantType.DUMMY, participantType = Participant.ParticipantType.DUMMY,
recordingConsentRequired = 1 recordingConsentRequired = 1
) )
}
} }

5
app/src/androidTest/java/com/nextcloud/talk/utils/ShareUtilsIT.kt
View File

@ -23,8 +23,8 @@ class ShareUtilsIT {
assertEquals(TEST_DATE_IN_MILLIS, HttpUtils.parseDate("Mon, 09 Apr 2008 23:55:38 GMT")?.time) assertEquals(TEST_DATE_IN_MILLIS, HttpUtils.parseDate("Mon, 09 Apr 2008 23:55:38 GMT")?.time)
} }
private fun parseDate2(dateStr: String): Date { private fun parseDate2(dateStr: String): Date =
return DateUtils.parseDate( DateUtils.parseDate(
dateStr, Locale.US, dateStr, Locale.US,
HttpUtils.httpDateFormatStr, HttpUtils.httpDateFormatStr,
// RFC 822, updated by RFC 1123 with any TZ // 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 // RI bug 6641315 claims a cookie of this format was once served by www.yahoo.com
"EEE MMM d yyyy HH:mm:ss z" "EEE MMM d yyyy HH:mm:ss z"
) )
}
companion object { companion object {
private const val TEST_DATE_IN_MILLIS = 1207778138000 private const val TEST_DATE_IN_MILLIS = 1207778138000

4
app/src/gplay/java/com/nextcloud/talk/utils/ClosedInterfaceImpl.kt
View File

@ -24,7 +24,9 @@ import com.nextcloud.talk.jobs.GetFirebasePushTokenWorker
import java.util.concurrent.TimeUnit import java.util.concurrent.TimeUnit
@AutoInjector(NextcloudTalkApplication::class) @AutoInjector(NextcloudTalkApplication::class)
class ClosedInterfaceImpl : ClosedInterface, ProviderInstaller.ProviderInstallListener { class ClosedInterfaceImpl :
ClosedInterface,
ProviderInstaller.ProviderInstallListener {
override val isGooglePlayServicesAvailable: Boolean = isGPlayServicesAvailable() override val isGooglePlayServicesAvailable: Boolean = isGPlayServicesAvailable()

7
app/src/main/java/com/nextcloud/talk/account/WebViewLoginActivity.kt
View File

@ -155,7 +155,9 @@ class WebViewLoginActivity : BaseActivity() {
val webauthnOptionsBuilder = WebauthnDialogOptions.builder().setShowSdkLogo(true).setAllowSkipPin(true) val webauthnOptionsBuilder = WebauthnDialogOptions.builder().setShowSdkLogo(true).setAllowSkipPin(true)
webViewWebauthnBridge = WebViewWebauthnBridge.createInstanceForWebView( webViewWebauthnBridge = WebViewWebauthnBridge.createInstanceForWebView(
this, binding.webview, webauthnOptionsBuilder this,
binding.webview,
webauthnOptionsBuilder
) )
CookieSyncManager.createInstance(this) CookieSyncManager.createInstance(this)
@ -430,7 +432,8 @@ class WebViewLoginActivity : BaseActivity() {
return null 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) !TextUtils.isEmpty(loginData.token)
) { ) {
loginData loginData

6
app/src/main/java/com/nextcloud/talk/chat/ChatActivity.kt
View File

@ -723,7 +723,8 @@ class ChatActivity :
) { ) {
val retentionPeriod = retentionOfSIPRoom(spreedCapabilities) val retentionPeriod = retentionOfSIPRoom(spreedCapabilities)
val systemMessage = currentConversation?.lastMessage?.systemMessageType val systemMessage = currentConversation?.lastMessage?.systemMessageType
if (retentionPeriod != 0 && ( if (retentionPeriod != 0 &&
(
systemMessage == ChatMessage.SystemMessageType.CALL_ENDED || systemMessage == ChatMessage.SystemMessageType.CALL_ENDED ||
systemMessage == ChatMessage.SystemMessageType.CALL_ENDED_EVERYONE systemMessage == ChatMessage.SystemMessageType.CALL_ENDED_EVERYONE
) )
@ -740,7 +741,8 @@ class ChatActivity :
) { ) {
val retentionPeriod = retentionOfInstantMeetingRoom(spreedCapabilities) val retentionPeriod = retentionOfInstantMeetingRoom(spreedCapabilities)
val systemMessage = currentConversation?.lastMessage?.systemMessageType val systemMessage = currentConversation?.lastMessage?.systemMessageType
if (retentionPeriod != 0 && ( if (retentionPeriod != 0 &&
(
systemMessage == ChatMessage.SystemMessageType.CALL_ENDED || systemMessage == ChatMessage.SystemMessageType.CALL_ENDED ||
systemMessage == ChatMessage.SystemMessageType.CALL_ENDED_EVERYONE systemMessage == ChatMessage.SystemMessageType.CALL_ENDED_EVERYONE
) )