From 059e0ecec5bc93db78f14489652f3abf30ea9328 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 24 May 2023 01:57:32 +0000 Subject: [PATCH 1/6] Build(deps): Bump io.gitlab.arturbosch.detekt:detekt-formatting Bumps [io.gitlab.arturbosch.detekt:detekt-formatting](https://github.com/detekt/detekt) from 1.22.0 to 1.23.0. - [Release notes](https://github.com/detekt/detekt/releases) - [Commits](https://github.com/detekt/detekt/commits) --- updated-dependencies: - dependency-name: io.gitlab.arturbosch.detekt:detekt-formatting dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- app/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/build.gradle b/app/build.gradle index 96f26bf54..e6dde6ee4 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -160,7 +160,7 @@ configurations.all { } dependencies { - detektPlugins("io.gitlab.arturbosch.detekt:detekt-formatting:1.22.0") + detektPlugins("io.gitlab.arturbosch.detekt:detekt-formatting:1.23.0") implementation fileTree(include: ['*'], dir: 'libs') From 6bc58e12e4c06c31ed23281c5691ea7ac6de9ee8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 24 May 2023 01:57:16 +0000 Subject: [PATCH 2/6] Build(deps): Bump io.gitlab.arturbosch.detekt:detekt-gradle-plugin Bumps [io.gitlab.arturbosch.detekt:detekt-gradle-plugin](https://github.com/detekt/detekt) from 1.22.0 to 1.23.0. - [Release notes](https://github.com/detekt/detekt/releases) - [Commits](https://github.com/detekt/detekt/commits) --- updated-dependencies: - dependency-name: io.gitlab.arturbosch.detekt:detekt-gradle-plugin dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 9aa69707d..a8b435ddd 100644 --- a/build.gradle +++ b/build.gradle @@ -38,7 +38,7 @@ buildscript { classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${kotlinVersion}" classpath "org.jetbrains.kotlin:kotlin-serialization:${kotlinVersion}" classpath 'com.github.spotbugs.snom:spotbugs-gradle-plugin:5.0.14' - classpath "io.gitlab.arturbosch.detekt:detekt-gradle-plugin:1.22.0" + classpath "io.gitlab.arturbosch.detekt:detekt-gradle-plugin:1.23.0" classpath "org.jlleitschuh.gradle:ktlint-gradle:11.3.2" // NOTE: Do not place your application dependencies here; they belong From f7e5881d87826844c2c3070e64a0e0bf98288bd8 Mon Sep 17 00:00:00 2001 From: Andy Scherzinger Date: Wed, 24 May 2023 09:38:56 +0200 Subject: [PATCH 3/6] Fix any detekt formatting issues Signed-off-by: Andy Scherzinger --- .../talk/adapters/items/ConversationItem.kt | 2 +- .../IncomingLinkPreviewMessageViewHolder.kt | 4 ++-- .../IncomingLocationMessageViewHolder.kt | 4 ++-- .../messages/IncomingPollMessageViewHolder.kt | 7 +++---- .../messages/IncomingTextMessageViewHolder.kt | 4 ++-- .../IncomingVoiceMessageViewHolder.kt | 7 +++---- .../OutcomingLinkPreviewMessageViewHolder.kt | 4 ++-- .../OutcomingLocationMessageViewHolder.kt | 4 ++-- .../OutcomingPollMessageViewHolder.kt | 7 +++---- .../OutcomingVoiceMessageViewHolder.kt | 7 +++---- .../com/nextcloud/talk/chat/ChatActivity.kt | 2 ++ .../AccountVerificationController.kt | 12 +++++------ .../ConversationInfoActivity.kt | 3 +-- .../talk/extensions/ImageViewExtensions.kt | 16 +++++++------- .../talk/jobs/ContactAddressBookWorker.kt | 12 +++++------ .../json/capabilities/SpreedCapability.kt | 3 +-- .../talk/models/json/status/StatusType.kt | 21 ++++++++++++++++++- .../nextcloud/talk/profile/ProfileActivity.kt | 16 +++++++------- .../talk/webrtc/WebSocketInstance.kt | 4 ++-- 19 files changed, 76 insertions(+), 63 deletions(-) diff --git a/app/src/main/java/com/nextcloud/talk/adapters/items/ConversationItem.kt b/app/src/main/java/com/nextcloud/talk/adapters/items/ConversationItem.kt index 26b5d22b5..01991f8de 100644 --- a/app/src/main/java/com/nextcloud/talk/adapters/items/ConversationItem.kt +++ b/app/src/main/java/com/nextcloud/talk/adapters/items/ConversationItem.kt @@ -245,7 +245,7 @@ class ConversationItem( model.lastMessage!!.activeUser = user val text = if (model.lastMessage!!.getCalculateMessageType() === ChatMessage.MessageType - .REGULAR_TEXT_MESSAGE + .REGULAR_TEXT_MESSAGE ) { calculateRegularLastMessageText(appContext) } else { diff --git a/app/src/main/java/com/nextcloud/talk/adapters/messages/IncomingLinkPreviewMessageViewHolder.kt b/app/src/main/java/com/nextcloud/talk/adapters/messages/IncomingLinkPreviewMessageViewHolder.kt index 264515c8b..2f381e55d 100644 --- a/app/src/main/java/com/nextcloud/talk/adapters/messages/IncomingLinkPreviewMessageViewHolder.kt +++ b/app/src/main/java/com/nextcloud/talk/adapters/messages/IncomingLinkPreviewMessageViewHolder.kt @@ -45,8 +45,8 @@ import com.stfalcon.chatkit.messages.MessageHolders import javax.inject.Inject @AutoInjector(NextcloudTalkApplication::class) -class IncomingLinkPreviewMessageViewHolder(incomingView: View, payload: Any) : MessageHolders -.IncomingTextMessageViewHolder(incomingView, payload) { +class IncomingLinkPreviewMessageViewHolder(incomingView: View, payload: Any) : + MessageHolders.IncomingTextMessageViewHolder(incomingView, payload) { private val binding: ItemCustomIncomingLinkPreviewMessageBinding = ItemCustomIncomingLinkPreviewMessageBinding.bind(itemView) diff --git a/app/src/main/java/com/nextcloud/talk/adapters/messages/IncomingLocationMessageViewHolder.kt b/app/src/main/java/com/nextcloud/talk/adapters/messages/IncomingLocationMessageViewHolder.kt index 1355efb66..4e19aac50 100644 --- a/app/src/main/java/com/nextcloud/talk/adapters/messages/IncomingLocationMessageViewHolder.kt +++ b/app/src/main/java/com/nextcloud/talk/adapters/messages/IncomingLocationMessageViewHolder.kt @@ -57,8 +57,8 @@ import java.net.URLEncoder import javax.inject.Inject @AutoInjector(NextcloudTalkApplication::class) -class IncomingLocationMessageViewHolder(incomingView: View, payload: Any) : MessageHolders -.IncomingTextMessageViewHolder(incomingView, payload) { +class IncomingLocationMessageViewHolder(incomingView: View, payload: Any) : + MessageHolders.IncomingTextMessageViewHolder(incomingView, payload) { private val binding: ItemCustomIncomingLocationMessageBinding = ItemCustomIncomingLocationMessageBinding.bind(itemView) diff --git a/app/src/main/java/com/nextcloud/talk/adapters/messages/IncomingPollMessageViewHolder.kt b/app/src/main/java/com/nextcloud/talk/adapters/messages/IncomingPollMessageViewHolder.kt index 061926fd6..ea13b5718 100644 --- a/app/src/main/java/com/nextcloud/talk/adapters/messages/IncomingPollMessageViewHolder.kt +++ b/app/src/main/java/com/nextcloud/talk/adapters/messages/IncomingPollMessageViewHolder.kt @@ -45,11 +45,10 @@ import com.stfalcon.chatkit.messages.MessageHolders import javax.inject.Inject @AutoInjector(NextcloudTalkApplication::class) -class IncomingPollMessageViewHolder(incomingView: View, payload: Any) : MessageHolders -.IncomingTextMessageViewHolder(incomingView, payload) { +class IncomingPollMessageViewHolder(incomingView: View, payload: Any) : + MessageHolders.IncomingTextMessageViewHolder(incomingView, payload) { - private val binding: ItemCustomIncomingPollMessageBinding = - ItemCustomIncomingPollMessageBinding.bind(itemView) + private val binding: ItemCustomIncomingPollMessageBinding = ItemCustomIncomingPollMessageBinding.bind(itemView) @Inject lateinit var context: Context diff --git a/app/src/main/java/com/nextcloud/talk/adapters/messages/IncomingTextMessageViewHolder.kt b/app/src/main/java/com/nextcloud/talk/adapters/messages/IncomingTextMessageViewHolder.kt index 7d685410e..b4b1a6516 100644 --- a/app/src/main/java/com/nextcloud/talk/adapters/messages/IncomingTextMessageViewHolder.kt +++ b/app/src/main/java/com/nextcloud/talk/adapters/messages/IncomingTextMessageViewHolder.kt @@ -55,8 +55,8 @@ import com.stfalcon.chatkit.messages.MessageHolders import javax.inject.Inject @AutoInjector(NextcloudTalkApplication::class) -class IncomingTextMessageViewHolder(itemView: View, payload: Any) : MessageHolders -.IncomingTextMessageViewHolder(itemView, payload) { +class IncomingTextMessageViewHolder(itemView: View, payload: Any) : + MessageHolders.IncomingTextMessageViewHolder(itemView, payload) { private val binding: ItemCustomIncomingTextMessageBinding = ItemCustomIncomingTextMessageBinding.bind(itemView) diff --git a/app/src/main/java/com/nextcloud/talk/adapters/messages/IncomingVoiceMessageViewHolder.kt b/app/src/main/java/com/nextcloud/talk/adapters/messages/IncomingVoiceMessageViewHolder.kt index 346a3ef65..4f387b60d 100644 --- a/app/src/main/java/com/nextcloud/talk/adapters/messages/IncomingVoiceMessageViewHolder.kt +++ b/app/src/main/java/com/nextcloud/talk/adapters/messages/IncomingVoiceMessageViewHolder.kt @@ -55,11 +55,10 @@ import java.util.concurrent.ExecutionException import javax.inject.Inject @AutoInjector(NextcloudTalkApplication::class) -class IncomingVoiceMessageViewHolder(incomingView: View, payload: Any) : MessageHolders -.IncomingTextMessageViewHolder(incomingView, payload) { +class IncomingVoiceMessageViewHolder(incomingView: View, payload: Any) : + MessageHolders.IncomingTextMessageViewHolder(incomingView, payload) { - private val binding: ItemCustomIncomingVoiceMessageBinding = - ItemCustomIncomingVoiceMessageBinding.bind(itemView) + private val binding: ItemCustomIncomingVoiceMessageBinding = ItemCustomIncomingVoiceMessageBinding.bind(itemView) @JvmField @Inject diff --git a/app/src/main/java/com/nextcloud/talk/adapters/messages/OutcomingLinkPreviewMessageViewHolder.kt b/app/src/main/java/com/nextcloud/talk/adapters/messages/OutcomingLinkPreviewMessageViewHolder.kt index b6f94b88d..3b7aef294 100644 --- a/app/src/main/java/com/nextcloud/talk/adapters/messages/OutcomingLinkPreviewMessageViewHolder.kt +++ b/app/src/main/java/com/nextcloud/talk/adapters/messages/OutcomingLinkPreviewMessageViewHolder.kt @@ -44,8 +44,8 @@ import com.stfalcon.chatkit.messages.MessageHolders import javax.inject.Inject @AutoInjector(NextcloudTalkApplication::class) -class OutcomingLinkPreviewMessageViewHolder(outcomingView: View, payload: Any) : MessageHolders -.OutcomingTextMessageViewHolder(outcomingView, payload) { +class OutcomingLinkPreviewMessageViewHolder(outcomingView: View, payload: Any) : + MessageHolders.OutcomingTextMessageViewHolder(outcomingView, payload) { private val binding: ItemCustomOutcomingLinkPreviewMessageBinding = ItemCustomOutcomingLinkPreviewMessageBinding.bind(itemView) diff --git a/app/src/main/java/com/nextcloud/talk/adapters/messages/OutcomingLocationMessageViewHolder.kt b/app/src/main/java/com/nextcloud/talk/adapters/messages/OutcomingLocationMessageViewHolder.kt index fb06ea434..3b3b31dd0 100644 --- a/app/src/main/java/com/nextcloud/talk/adapters/messages/OutcomingLocationMessageViewHolder.kt +++ b/app/src/main/java/com/nextcloud/talk/adapters/messages/OutcomingLocationMessageViewHolder.kt @@ -54,8 +54,8 @@ import javax.inject.Inject import kotlin.math.roundToInt @AutoInjector(NextcloudTalkApplication::class) -class OutcomingLocationMessageViewHolder(incomingView: View) : MessageHolders -.OutcomingTextMessageViewHolder(incomingView) { +class OutcomingLocationMessageViewHolder(incomingView: View) : + MessageHolders.OutcomingTextMessageViewHolder(incomingView) { private val binding: ItemCustomOutcomingLocationMessageBinding = ItemCustomOutcomingLocationMessageBinding.bind(itemView) private val realView: View = itemView diff --git a/app/src/main/java/com/nextcloud/talk/adapters/messages/OutcomingPollMessageViewHolder.kt b/app/src/main/java/com/nextcloud/talk/adapters/messages/OutcomingPollMessageViewHolder.kt index f73619641..99d94330a 100644 --- a/app/src/main/java/com/nextcloud/talk/adapters/messages/OutcomingPollMessageViewHolder.kt +++ b/app/src/main/java/com/nextcloud/talk/adapters/messages/OutcomingPollMessageViewHolder.kt @@ -45,11 +45,10 @@ import com.stfalcon.chatkit.messages.MessageHolders import javax.inject.Inject @AutoInjector(NextcloudTalkApplication::class) -class OutcomingPollMessageViewHolder(outcomingView: View, payload: Any) : MessageHolders -.OutcomingTextMessageViewHolder(outcomingView, payload) { +class OutcomingPollMessageViewHolder(outcomingView: View, payload: Any) : + MessageHolders.OutcomingTextMessageViewHolder(outcomingView, payload) { - private val binding: ItemCustomOutcomingPollMessageBinding = - ItemCustomOutcomingPollMessageBinding.bind(itemView) + private val binding: ItemCustomOutcomingPollMessageBinding = ItemCustomOutcomingPollMessageBinding.bind(itemView) @Inject lateinit var context: Context diff --git a/app/src/main/java/com/nextcloud/talk/adapters/messages/OutcomingVoiceMessageViewHolder.kt b/app/src/main/java/com/nextcloud/talk/adapters/messages/OutcomingVoiceMessageViewHolder.kt index f8b79fb63..b754ab1e9 100644 --- a/app/src/main/java/com/nextcloud/talk/adapters/messages/OutcomingVoiceMessageViewHolder.kt +++ b/app/src/main/java/com/nextcloud/talk/adapters/messages/OutcomingVoiceMessageViewHolder.kt @@ -51,11 +51,10 @@ import java.util.concurrent.ExecutionException import javax.inject.Inject @AutoInjector(NextcloudTalkApplication::class) -class OutcomingVoiceMessageViewHolder(outcomingView: View) : MessageHolders -.OutcomingTextMessageViewHolder(outcomingView) { +class OutcomingVoiceMessageViewHolder(outcomingView: View) : + MessageHolders.OutcomingTextMessageViewHolder(outcomingView) { - private val binding: ItemCustomOutcomingVoiceMessageBinding = - ItemCustomOutcomingVoiceMessageBinding.bind(itemView) + private val binding: ItemCustomOutcomingVoiceMessageBinding = ItemCustomOutcomingVoiceMessageBinding.bind(itemView) @JvmField @Inject 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 633e86794..3ab372485 100644 --- a/app/src/main/java/com/nextcloud/talk/chat/ChatActivity.kt +++ b/app/src/main/java/com/nextcloud/talk/chat/ChatActivity.kt @@ -3136,6 +3136,7 @@ class ChatActivity : inner class ReactionAddedObserver : Observer { override fun onSubscribe(d: Disposable) { + // unused atm } override fun onNext(reactionAddedModel: ReactionAddedModel) { @@ -3159,6 +3160,7 @@ class ChatActivity : inner class ReactionDeletedObserver : Observer { override fun onSubscribe(d: Disposable) { + // unused atm } override fun onNext(reactionDeletedModel: ReactionDeletedModel) { diff --git a/app/src/main/java/com/nextcloud/talk/controllers/AccountVerificationController.kt b/app/src/main/java/com/nextcloud/talk/controllers/AccountVerificationController.kt index 387b5aaed..8d84602d6 100644 --- a/app/src/main/java/com/nextcloud/talk/controllers/AccountVerificationController.kt +++ b/app/src/main/java/com/nextcloud/talk/controllers/AccountVerificationController.kt @@ -78,13 +78,11 @@ import java.net.CookieManager import javax.inject.Inject @AutoInjector(NextcloudTalkApplication::class) -class AccountVerificationController(args: Bundle? = null) : - BaseController( - R.layout.controller_account_verification, - args - ) { +class AccountVerificationController(args: Bundle? = null) : BaseController( + R.layout.controller_account_verification, args +) { private val binding: ControllerAccountVerificationBinding? by - viewBinding(ControllerAccountVerificationBinding::bind) + viewBinding(ControllerAccountVerificationBinding::bind) @Inject lateinit var ncApi: NcApi @@ -294,7 +292,7 @@ class AccountVerificationController(args: Bundle? = null) : binding?.progressText?.text = """ ${binding?.progressText?.text} """ - .trimIndent() + resources!!.getString(R.string.nc_display_name_not_stored) + .trimIndent() + resources!!.getString(R.string.nc_display_name_not_stored) abortVerification() } diff --git a/app/src/main/java/com/nextcloud/talk/conversationinfo/ConversationInfoActivity.kt b/app/src/main/java/com/nextcloud/talk/conversationinfo/ConversationInfoActivity.kt index 0727c909d..de1cf8918 100644 --- a/app/src/main/java/com/nextcloud/talk/conversationinfo/ConversationInfoActivity.kt +++ b/app/src/main/java/com/nextcloud/talk/conversationinfo/ConversationInfoActivity.kt @@ -309,8 +309,7 @@ class ConversationInfoActivity : requireFutureDateTime = true, currentDateTime = currentTimeCalendar, show24HoursView = true, - dateTimeCallback = { _, - dateTime -> + dateTimeCallback = { _, dateTime -> reconfigureLobbyTimerView(dateTime) submitLobbyChanges() } diff --git a/app/src/main/java/com/nextcloud/talk/extensions/ImageViewExtensions.kt b/app/src/main/java/com/nextcloud/talk/extensions/ImageViewExtensions.kt index b69a704f0..dae30d5ef 100644 --- a/app/src/main/java/com/nextcloud/talk/extensions/ImageViewExtensions.kt +++ b/app/src/main/java/com/nextcloud/talk/extensions/ImageViewExtensions.kt @@ -57,8 +57,7 @@ fun ImageView.loadConversationAvatar( conversation: Conversation, ignoreCache: Boolean, viewThemeUtils: ViewThemeUtils? -): io.reactivex.disposables -.Disposable { +): io.reactivex.disposables.Disposable { val imageRequestUri = ApiUtils.getUrlForConversationAvatarWithVersion( 1, user.baseUrl, @@ -100,8 +99,7 @@ fun ImageView.loadUserAvatar( avatarId: String, requestBigSize: Boolean = true, ignoreCache: Boolean -): io.reactivex.disposables -.Disposable { +): io.reactivex.disposables.Disposable { val imageRequestUri = ApiUtils.getUrlForAvatar( user.baseUrl, avatarId, @@ -117,8 +115,7 @@ private fun ImageView.loadAvatarInternal( url: String, ignoreCache: Boolean, errorPlaceholder: Drawable? -): io.reactivex.disposables -.Disposable { +): io.reactivex.disposables.Disposable { val cachePolicy = if (ignoreCache) { CachePolicy.WRITE_ONLY } else { @@ -215,8 +212,11 @@ fun ImageView.loadImage(url: String, user: User, placeholder: Drawable? = null): return DisposableWrapper(context.imageLoader.enqueue(requestBuilder.build())) } -fun ImageView.loadAvatarOrImagePreview(url: String, user: User, placeholder: Drawable? = null): io.reactivex -.disposables.Disposable { +fun ImageView.loadAvatarOrImagePreview( + url: String, + user: User, + placeholder: Drawable? = null +): io.reactivex.disposables.Disposable { return if (url.contains("/avatar/")) { loadAvatarInternal(user, url, false, null) } else { diff --git a/app/src/main/java/com/nextcloud/talk/jobs/ContactAddressBookWorker.kt b/app/src/main/java/com/nextcloud/talk/jobs/ContactAddressBookWorker.kt index 9e9448a5c..2fbc97b3b 100644 --- a/app/src/main/java/com/nextcloud/talk/jobs/ContactAddressBookWorker.kt +++ b/app/src/main/java/com/nextcloud/talk/jobs/ContactAddressBookWorker.kt @@ -456,9 +456,9 @@ class ContactAddressBookWorker(val context: Context, workerParameters: WorkerPar Manifest.permission.WRITE_CONTACTS ) == PackageManager.PERMISSION_GRANTED && ContextCompat.checkSelfPermission( - context, - Manifest.permission.READ_CONTACTS - ) == PackageManager.PERMISSION_GRANTED + context, + Manifest.permission.READ_CONTACTS + ) == PackageManager.PERMISSION_GRANTED ) { WorkManager .getInstance() @@ -476,9 +476,9 @@ class ContactAddressBookWorker(val context: Context, workerParameters: WorkerPar Manifest.permission.WRITE_CONTACTS ) != PackageManager.PERMISSION_GRANTED || ContextCompat.checkSelfPermission( - context, - Manifest.permission.READ_CONTACTS - ) != PackageManager.PERMISSION_GRANTED + context, + Manifest.permission.READ_CONTACTS + ) != PackageManager.PERMISSION_GRANTED ) { activity.requestPermissions( arrayOf( diff --git a/app/src/main/java/com/nextcloud/talk/models/json/capabilities/SpreedCapability.kt b/app/src/main/java/com/nextcloud/talk/models/json/capabilities/SpreedCapability.kt index df50bbb77..509687890 100644 --- a/app/src/main/java/com/nextcloud/talk/models/json/capabilities/SpreedCapability.kt +++ b/app/src/main/java/com/nextcloud/talk/models/json/capabilities/SpreedCapability.kt @@ -37,8 +37,7 @@ data class SpreedCapability( @JsonField(name = ["features"]) var features: List?, @JsonField(name = ["config"]) - var config: HashMap>? + var config: HashMap>? ) : Parcelable { // This constructor is added to work with the 'com.bluelinelabs.logansquare.annotation.JsonObject' constructor() : this(null, null) diff --git a/app/src/main/java/com/nextcloud/talk/models/json/status/StatusType.kt b/app/src/main/java/com/nextcloud/talk/models/json/status/StatusType.kt index 4e8eda9b4..5a34f3e23 100644 --- a/app/src/main/java/com/nextcloud/talk/models/json/status/StatusType.kt +++ b/app/src/main/java/com/nextcloud/talk/models/json/status/StatusType.kt @@ -1,3 +1,22 @@ +/* + * Nextcloud Talk application + * + * @author Tim Krüger + * Copyright (C) 2023 Tim Krüger + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ package com.nextcloud.talk.models.json.status enum class StatusType(val string: String) { @@ -5,5 +24,5 @@ enum class StatusType(val string: String) { OFFLINE("offline"), DND("dnd"), AWAY("away"), - INVISIBLE("invisible"); + INVISIBLE("invisible") } diff --git a/app/src/main/java/com/nextcloud/talk/profile/ProfileActivity.kt b/app/src/main/java/com/nextcloud/talk/profile/ProfileActivity.kt index 893ffe63a..e571028be 100644 --- a/app/src/main/java/com/nextcloud/talk/profile/ProfileActivity.kt +++ b/app/src/main/java/com/nextcloud/talk/profile/ProfileActivity.kt @@ -300,13 +300,13 @@ class ProfileActivity : BaseActivity() { adapter!!.setData(createUserInfoDetails(userInfo)) if (isAllEmpty( arrayOf( - userInfo?.displayName, - userInfo?.phone, - userInfo?.email, - userInfo?.address, - userInfo?.twitter, - userInfo?.website - ) + userInfo?.displayName, + userInfo?.phone, + userInfo?.email, + userInfo?.address, + userInfo?.twitter, + userInfo?.website + ) ) ) { binding.userinfoList.visibility = View.GONE @@ -755,7 +755,7 @@ class ProfileActivity : BaseActivity() { PHONE("phone", "phoneScope"), ADDRESS("address", "addressScope"), WEBSITE("website", "websiteScope"), - TWITTER("twitter", "twitterScope"); + TWITTER("twitter", "twitterScope") } companion object { diff --git a/app/src/main/java/com/nextcloud/talk/webrtc/WebSocketInstance.kt b/app/src/main/java/com/nextcloud/talk/webrtc/WebSocketInstance.kt index 6b249f18a..b057a638a 100644 --- a/app/src/main/java/com/nextcloud/talk/webrtc/WebSocketInstance.kt +++ b/app/src/main/java/com/nextcloud/talk/webrtc/WebSocketInstance.kt @@ -289,8 +289,8 @@ class WebSocketInstance internal constructor( val (_, roomWebSocketMessage) = LoganSquare.parse(text, JoinedRoomOverallWebSocketMessage::class.java) if (roomWebSocketMessage != null) { currentRoomToken = roomWebSocketMessage.roomId - if (roomWebSocketMessage - .roomPropertiesWebSocketMessage != null && + if ( + roomWebSocketMessage.roomPropertiesWebSocketMessage != null && !TextUtils.isEmpty(currentRoomToken) ) { sendRoomJoinedEvent() From c6e082c6b124af785ef2c4ae34ce46cd3d62ac2c Mon Sep 17 00:00:00 2001 From: Andy Scherzinger Date: Wed, 24 May 2023 09:47:27 +0200 Subject: [PATCH 4/6] Replace any magic numbers detekt-ed Signed-off-by: Andy Scherzinger --- .../nextcloud/talk/activities/CallNotificationActivity.kt | 3 ++- .../main/java/com/nextcloud/talk/call/ReactionAnimator.kt | 8 ++++++-- .../com/nextcloud/talk/ui/dialog/MoreCallActionsDialog.kt | 3 ++- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/com/nextcloud/talk/activities/CallNotificationActivity.kt b/app/src/main/java/com/nextcloud/talk/activities/CallNotificationActivity.kt index c7eacc2cb..0c5df6a12 100644 --- a/app/src/main/java/com/nextcloud/talk/activities/CallNotificationActivity.kt +++ b/app/src/main/java/com/nextcloud/talk/activities/CallNotificationActivity.kt @@ -258,7 +258,7 @@ class CallNotificationActivity : CallBaseActivity() { notificationHandler.post(object : Runnable { override fun run() { if (NotificationUtils.isNotificationVisible(context, notificationTimestamp!!.toInt())) { - notificationHandler.postDelayed(this, 1000) + notificationHandler.postDelayed(this, ONE_SECOND) } else { finish() } @@ -320,5 +320,6 @@ class CallNotificationActivity : CallBaseActivity() { companion object { const val TAG = "CallNotificationActivity" const val GET_ROOM_RETRY_COUNT: Long = 3 + const val ONE_SECOND: Long = 1000 } } diff --git a/app/src/main/java/com/nextcloud/talk/call/ReactionAnimator.kt b/app/src/main/java/com/nextcloud/talk/call/ReactionAnimator.kt index 3c9c263e0..746644b8c 100644 --- a/app/src/main/java/com/nextcloud/talk/call/ReactionAnimator.kt +++ b/app/src/main/java/com/nextcloud/talk/call/ReactionAnimator.kt @@ -124,7 +124,7 @@ class ReactionAnimator( val emojiView = EmojiTextView(context) emojiView.text = callReaction.emoji - emojiView.textSize = 20f + emojiView.textSize = TEXT_SIZE val nameView = getNameView(callReaction) reactionWrapper.addView(emojiView) @@ -141,7 +141,7 @@ class ReactionAnimator( ViewGroup.LayoutParams.WRAP_CONTENT ) - nameViewParams.setMargins(20, 0, 20, 5) + nameViewParams.setMargins(HORIZONTAL_MARGIN, 0, HORIZONTAL_MARGIN, BOTTOM_MARGIN) nameView.layoutParams = nameViewParams nameView.text = " " + callReaction.userName + " " @@ -176,6 +176,10 @@ class ReactionAnimator( private const val ZERO_ALPHA = 0f private const val ALPHA_PROPERTY = "alpha" + + private const val TEXT_SIZE = 20f + private const val HORIZONTAL_MARGIN: Int = 20 + private const val BOTTOM_MARGIN: Int = 5 } } data class CallReaction( diff --git a/app/src/main/java/com/nextcloud/talk/ui/dialog/MoreCallActionsDialog.kt b/app/src/main/java/com/nextcloud/talk/ui/dialog/MoreCallActionsDialog.kt index f21543272..8e81d3c7e 100644 --- a/app/src/main/java/com/nextcloud/talk/ui/dialog/MoreCallActionsDialog.kt +++ b/app/src/main/java/com/nextcloud/talk/ui/dialog/MoreCallActionsDialog.kt @@ -118,7 +118,7 @@ class MoreCallActionsDialog(private val callActivity: CallActivity) : BottomShee availableReactions.forEach { val emojiView = EmojiTextView(context) emojiView.text = it.toString() - emojiView.textSize = 20f + emojiView.textSize = TEXT_SIZE emojiView.layoutParams = param emojiView.setOnClickListener { view -> @@ -198,5 +198,6 @@ class MoreCallActionsDialog(private val callActivity: CallActivity) : BottomShee companion object { private const val TAG = "MoreCallActionsDialog" + private const val TEXT_SIZE = 20f } } From 502a3f1f595584fd432534bc2d66d31efe9d4cff Mon Sep 17 00:00:00 2001 From: Andy Scherzinger Date: Wed, 24 May 2023 09:47:47 +0200 Subject: [PATCH 5/6] Lower max detekt findings threshold due to latest fixes Signed-off-by: Andy Scherzinger --- detekt.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/detekt.yml b/detekt.yml index dbdbbedcd..51166349c 100644 --- a/detekt.yml +++ b/detekt.yml @@ -1,5 +1,5 @@ build: - maxIssues: 80 + maxIssues: 73 weights: # complexity: 2 # LongParameterList: 1 From 984c8bff5cd595c8f01bf4986fdd1d8f3ad7907a Mon Sep 17 00:00:00 2001 From: Andy Scherzinger Date: Wed, 24 May 2023 10:04:47 +0200 Subject: [PATCH 6/6] further improve formatting Signed-off-by: Andy Scherzinger --- .../talk/adapters/items/ConversationItem.kt | 15 +++---- .../AccountVerificationController.kt | 14 +++---- .../talk/jobs/ContactAddressBookWorker.kt | 40 ++++++------------- .../json/capabilities/SpreedCapability.kt | 10 ++++- .../nextcloud/talk/profile/ProfileActivity.kt | 3 +- 5 files changed, 39 insertions(+), 43 deletions(-) diff --git a/app/src/main/java/com/nextcloud/talk/adapters/items/ConversationItem.kt b/app/src/main/java/com/nextcloud/talk/adapters/items/ConversationItem.kt index 01991f8de..6b2372ed4 100644 --- a/app/src/main/java/com/nextcloud/talk/adapters/items/ConversationItem.kt +++ b/app/src/main/java/com/nextcloud/talk/adapters/items/ConversationItem.kt @@ -244,13 +244,14 @@ class ConversationItem( } else { model.lastMessage!!.activeUser = user - val text = if (model.lastMessage!!.getCalculateMessageType() === ChatMessage.MessageType - .REGULAR_TEXT_MESSAGE - ) { - calculateRegularLastMessageText(appContext) - } else { - model.lastMessage!!.lastMessageDisplayText - } + val text = + if ( + model.lastMessage!!.getCalculateMessageType() === ChatMessage.MessageType.REGULAR_TEXT_MESSAGE + ) { + calculateRegularLastMessageText(appContext) + } else { + model.lastMessage!!.lastMessageDisplayText + } holder.binding.dialogLastMessage.text = text } } else { diff --git a/app/src/main/java/com/nextcloud/talk/controllers/AccountVerificationController.kt b/app/src/main/java/com/nextcloud/talk/controllers/AccountVerificationController.kt index 8d84602d6..948bdd872 100644 --- a/app/src/main/java/com/nextcloud/talk/controllers/AccountVerificationController.kt +++ b/app/src/main/java/com/nextcloud/talk/controllers/AccountVerificationController.kt @@ -79,10 +79,12 @@ import javax.inject.Inject @AutoInjector(NextcloudTalkApplication::class) class AccountVerificationController(args: Bundle? = null) : BaseController( - R.layout.controller_account_verification, args + R.layout.controller_account_verification, + args ) { - private val binding: ControllerAccountVerificationBinding? by - viewBinding(ControllerAccountVerificationBinding::bind) + private val binding: ControllerAccountVerificationBinding? by viewBinding( + ControllerAccountVerificationBinding::bind + ) @Inject lateinit var ncApi: NcApi @@ -289,10 +291,8 @@ class AccountVerificationController(args: Bundle? = null) : BaseController( @SuppressLint("SetTextI18n") override fun onError(e: Throwable) { - binding?.progressText?.text = - """ ${binding?.progressText?.text} - """ - .trimIndent() + resources!!.getString(R.string.nc_display_name_not_stored) + binding?.progressText?.text = """ ${binding?.progressText?.text}""".trimIndent() + + resources!!.getString(R.string.nc_display_name_not_stored) abortVerification() } diff --git a/app/src/main/java/com/nextcloud/talk/jobs/ContactAddressBookWorker.kt b/app/src/main/java/com/nextcloud/talk/jobs/ContactAddressBookWorker.kt index 2fbc97b3b..b05258c45 100644 --- a/app/src/main/java/com/nextcloud/talk/jobs/ContactAddressBookWorker.kt +++ b/app/src/main/java/com/nextcloud/talk/jobs/ContactAddressBookWorker.kt @@ -451,40 +451,26 @@ class ContactAddressBookWorker(val context: Context, workerParameters: WorkerPar const val DELETE_ALL = "DELETE_ALL" fun run(context: Context) { - if (ContextCompat.checkSelfPermission( - context, - Manifest.permission.WRITE_CONTACTS - ) == PackageManager.PERMISSION_GRANTED && - ContextCompat.checkSelfPermission( - context, - Manifest.permission.READ_CONTACTS - ) == PackageManager.PERMISSION_GRANTED + if (ContextCompat.checkSelfPermission(context, Manifest.permission.WRITE_CONTACTS) == + PackageManager.PERMISSION_GRANTED && + ContextCompat.checkSelfPermission(context, Manifest.permission.READ_CONTACTS) == + PackageManager.PERMISSION_GRANTED ) { - WorkManager - .getInstance() - .enqueue( - OneTimeWorkRequest.Builder(ContactAddressBookWorker::class.java) - .setInputData(Data.Builder().putBoolean(KEY_FORCE, false).build()) - .build() - ) + WorkManager.getInstance().enqueue( + OneTimeWorkRequest.Builder(ContactAddressBookWorker::class.java) + .setInputData(Data.Builder().putBoolean(KEY_FORCE, false).build()).build() + ) } } fun checkPermission(activity: Activity, context: Context): Boolean { - if (ContextCompat.checkSelfPermission( - context, - Manifest.permission.WRITE_CONTACTS - ) != PackageManager.PERMISSION_GRANTED || - ContextCompat.checkSelfPermission( - context, - Manifest.permission.READ_CONTACTS - ) != PackageManager.PERMISSION_GRANTED + if (ContextCompat.checkSelfPermission(context, Manifest.permission.WRITE_CONTACTS) != + PackageManager.PERMISSION_GRANTED || + ContextCompat.checkSelfPermission(context, Manifest.permission.READ_CONTACTS) != + PackageManager.PERMISSION_GRANTED ) { activity.requestPermissions( - arrayOf( - Manifest.permission.WRITE_CONTACTS, - Manifest.permission.READ_CONTACTS - ), + arrayOf(Manifest.permission.WRITE_CONTACTS, Manifest.permission.READ_CONTACTS), REQUEST_PERMISSION ) return false diff --git a/app/src/main/java/com/nextcloud/talk/models/json/capabilities/SpreedCapability.kt b/app/src/main/java/com/nextcloud/talk/models/json/capabilities/SpreedCapability.kt index 509687890..21078568b 100644 --- a/app/src/main/java/com/nextcloud/talk/models/json/capabilities/SpreedCapability.kt +++ b/app/src/main/java/com/nextcloud/talk/models/json/capabilities/SpreedCapability.kt @@ -37,7 +37,15 @@ data class SpreedCapability( @JsonField(name = ["features"]) var features: List?, @JsonField(name = ["config"]) - var config: HashMap>? + var config: HashMap< + String, + HashMap< + String, + @RawValue + @Contextual + Any + > + >? ) : Parcelable { // This constructor is added to work with the 'com.bluelinelabs.logansquare.annotation.JsonObject' constructor() : this(null, null) diff --git a/app/src/main/java/com/nextcloud/talk/profile/ProfileActivity.kt b/app/src/main/java/com/nextcloud/talk/profile/ProfileActivity.kt index e571028be..01eab3bd7 100644 --- a/app/src/main/java/com/nextcloud/talk/profile/ProfileActivity.kt +++ b/app/src/main/java/com/nextcloud/talk/profile/ProfileActivity.kt @@ -298,7 +298,8 @@ class ProfileActivity : BaseActivity() { } binding.loadingContent.visibility = View.VISIBLE adapter!!.setData(createUserInfoDetails(userInfo)) - if (isAllEmpty( + if ( + isAllEmpty( arrayOf( userInfo?.displayName, userInfo?.phone,