From 240ec8f98ef0ea07a9e387813509028f7ac349f0 Mon Sep 17 00:00:00 2001 From: Andy Scherzinger Date: Wed, 14 May 2025 10:16:29 +0200 Subject: [PATCH] style(lint): Unnecessary lambda with trim() The lambda argument ({ it <= ' ' }) is unnecessary Signed-off-by: Andy Scherzinger --- .../com/nextcloud/talk/account/ServerSelectionActivity.kt | 2 +- .../com/nextcloud/talk/adapters/items/AdvancedUserItem.kt | 8 ++++---- .../java/com/nextcloud/talk/adapters/items/ContactItem.kt | 4 ++-- .../com/nextcloud/talk/adapters/items/ConversationItem.kt | 2 +- .../com/nextcloud/talk/adapters/items/ParticipantItem.kt | 4 ++-- .../java/com/nextcloud/talk/chat/MessageInputFragment.kt | 2 +- .../com/nextcloud/talk/chat/data/model/ChatMessage.kt | 2 +- .../com/nextcloud/talk/data/source/local/TalkDatabase.kt | 2 +- .../main/java/com/nextcloud/talk/utils/DisplayUtils.kt | 8 ++++---- 9 files changed, 17 insertions(+), 17 deletions(-) diff --git a/app/src/main/java/com/nextcloud/talk/account/ServerSelectionActivity.kt b/app/src/main/java/com/nextcloud/talk/account/ServerSelectionActivity.kt index c150dd6dd..473263568 100644 --- a/app/src/main/java/com/nextcloud/talk/account/ServerSelectionActivity.kt +++ b/app/src/main/java/com/nextcloud/talk/account/ServerSelectionActivity.kt @@ -212,7 +212,7 @@ class ServerSelectionActivity : BaseActivity() { @Suppress("Detekt.TooGenericExceptionCaught") private fun checkServerAndProceed() { dispose() - var url: String = binding.serverEntryTextInputEditText.text.toString().trim { it <= ' ' } + var url: String = binding.serverEntryTextInputEditText.text.toString().trim() showserverEntryProgressBar() if (binding.importOrChooseProviderText.visibility != View.INVISIBLE) { binding.importOrChooseProviderText.visibility = View.INVISIBLE diff --git a/app/src/main/java/com/nextcloud/talk/adapters/items/AdvancedUserItem.kt b/app/src/main/java/com/nextcloud/talk/adapters/items/AdvancedUserItem.kt index a69735505..5dce78d17 100644 --- a/app/src/main/java/com/nextcloud/talk/adapters/items/AdvancedUserItem.kt +++ b/app/src/main/java/com/nextcloud/talk/adapters/items/AdvancedUserItem.kt @@ -36,9 +36,9 @@ class AdvancedUserItem( private val viewThemeUtils: ViewThemeUtils, private val actionRequiredCount: Int ) : AbstractFlexibleItem(), IFilterable { - override fun equals(o: Any?): Boolean { - return if (o is AdvancedUserItem) { - model == o.model + override fun equals(other: Any?): Boolean { + return if (other is AdvancedUserItem) { + model == other.model } else { false } @@ -98,7 +98,7 @@ class AdvancedUserItem( return model.displayName != null && Pattern .compile(constraint, Pattern.CASE_INSENSITIVE or Pattern.LITERAL) - .matcher(model.displayName!!.trim { it <= ' ' }) + .matcher(model.displayName!!.trim()) .find() } diff --git a/app/src/main/java/com/nextcloud/talk/adapters/items/ContactItem.kt b/app/src/main/java/com/nextcloud/talk/adapters/items/ContactItem.kt index 36fa9a24d..4f726ca92 100644 --- a/app/src/main/java/com/nextcloud/talk/adapters/items/ContactItem.kt +++ b/app/src/main/java/com/nextcloud/talk/adapters/items/ContactItem.kt @@ -57,10 +57,10 @@ class ContactItem( return model.displayName != null && ( Pattern.compile(constraint!!, Pattern.CASE_INSENSITIVE or Pattern.LITERAL) - .matcher(model.displayName!!.trim { it <= ' ' }) + .matcher(model.displayName!!.trim()) .find() || Pattern.compile(constraint!!, Pattern.CASE_INSENSITIVE or Pattern.LITERAL) - .matcher(model.calculatedActorId!!.trim { it <= ' ' }) + .matcher(model.calculatedActorId!!.trim()) .find() ) } 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 64c3f171e..9ccf8733d 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 @@ -319,7 +319,7 @@ class ConversationItem( return model.displayName != null && Pattern .compile(constraint!!, Pattern.CASE_INSENSITIVE or Pattern.LITERAL) - .matcher(model.displayName!!.trim { it <= ' ' }) + .matcher(model.displayName.trim()) .find() } diff --git a/app/src/main/java/com/nextcloud/talk/adapters/items/ParticipantItem.kt b/app/src/main/java/com/nextcloud/talk/adapters/items/ParticipantItem.kt index 4dac6c2b1..0d7d53083 100644 --- a/app/src/main/java/com/nextcloud/talk/adapters/items/ParticipantItem.kt +++ b/app/src/main/java/com/nextcloud/talk/adapters/items/ParticipantItem.kt @@ -292,9 +292,9 @@ class ParticipantItem( override fun filter(constraint: String?): Boolean { return model.displayName != null && ( Pattern.compile(constraint, Pattern.CASE_INSENSITIVE or Pattern.LITERAL) - .matcher(model.displayName!!.trim { it <= ' ' }).find() || + .matcher(model.displayName!!.trim()).find() || Pattern.compile(constraint, Pattern.CASE_INSENSITIVE or Pattern.LITERAL) - .matcher(model.calculatedActorId!!.trim { it <= ' ' }).find() + .matcher(model.calculatedActorId!!.trim()).find() ) } diff --git a/app/src/main/java/com/nextcloud/talk/chat/MessageInputFragment.kt b/app/src/main/java/com/nextcloud/talk/chat/MessageInputFragment.kt index 754bae7c5..c6041ccd4 100644 --- a/app/src/main/java/com/nextcloud/talk/chat/MessageInputFragment.kt +++ b/app/src/main/java/com/nextcloud/talk/chat/MessageInputFragment.kt @@ -373,7 +373,7 @@ class MessageInputFragment : Fragment() { if (editable.subSequence( editable.getSpanStart(mentionSpan), editable.getSpanEnd(mentionSpan) - ).toString().trim { it <= ' ' } != mentionSpan.label + ).toString().trim() != mentionSpan.label ) { editable.removeSpan(mentionSpan) } diff --git a/app/src/main/java/com/nextcloud/talk/chat/data/model/ChatMessage.kt b/app/src/main/java/com/nextcloud/talk/chat/data/model/ChatMessage.kt index f80886fa4..3be97d912 100644 --- a/app/src/main/java/com/nextcloud/talk/chat/data/model/ChatMessage.kt +++ b/app/src/main/java/com/nextcloud/talk/chat/data/model/ChatMessage.kt @@ -239,7 +239,7 @@ data class ChatMessage( } } return if (!messageTypesToIgnore.contains(getCalculateMessageType())) { - message!!.trim { it <= ' ' } + message!!.trim() } else { null } diff --git a/app/src/main/java/com/nextcloud/talk/data/source/local/TalkDatabase.kt b/app/src/main/java/com/nextcloud/talk/data/source/local/TalkDatabase.kt index 5c3656c76..94f5a3709 100644 --- a/app/src/main/java/com/nextcloud/talk/data/source/local/TalkDatabase.kt +++ b/app/src/main/java/com/nextcloud/talk/data/source/local/TalkDatabase.kt @@ -102,7 +102,7 @@ abstract class TalkDatabase : RoomDatabase() { .getString(R.string.nc_app_product_name) .lowercase(Locale.getDefault()) .replace(" ", "_") - .trim { it <= ' ' } + + .trim() + ".sqlite" return Room diff --git a/app/src/main/java/com/nextcloud/talk/utils/DisplayUtils.kt b/app/src/main/java/com/nextcloud/talk/utils/DisplayUtils.kt index c0c3741fd..46b77639a 100644 --- a/app/src/main/java/com/nextcloud/talk/utils/DisplayUtils.kt +++ b/app/src/main/java/com/nextcloud/talk/utils/DisplayUtils.kt @@ -401,14 +401,14 @@ object DisplayUtils { if (url!!.length >= HTTP_MIN_LENGTH && HTTP_PROTOCOL.equals(url.substring(0, HTTP_MIN_LENGTH), ignoreCase = true) ) { - return url.substring(HTTP_PROTOCOL.length).trim { it <= ' ' } + return url.substring(HTTP_PROTOCOL.length).trim() } return if (url.length >= HTTPS_MIN_LENGTH && HTTPS_PROTOCOL.equals(url.substring(0, HTTPS_MIN_LENGTH), ignoreCase = true) ) { - url.substring(HTTPS_PROTOCOL.length).trim { it <= ' ' } + url.substring(HTTPS_PROTOCOL.length).trim() } else { - url.trim { it <= ' ' } + url.trim() } } @@ -420,7 +420,7 @@ object DisplayUtils { */ fun beautifyTwitterHandle(handle: String?): String { return if (handle != null) { - val trimmedHandle = handle.trim { it <= ' ' } + val trimmedHandle = handle.trim() if (TextUtils.isEmpty(trimmedHandle)) { return "" }