diff --git a/app/lint.xml b/app/lint.xml index 0f1909bdd..60b314e87 100644 --- a/app/lint.xml +++ b/app/lint.xml @@ -49,4 +49,8 @@ + + + + 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 "" } diff --git a/build.gradle b/build.gradle index 308270ea9..249ef3440 100644 --- a/build.gradle +++ b/build.gradle @@ -21,7 +21,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:8.9.2' + classpath 'com.android.tools.build:gradle:8.10.0' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${kotlinVersion}" classpath "org.jetbrains.kotlin:kotlin-serialization:${kotlinVersion}" classpath 'com.github.spotbugs.snom:spotbugs-gradle-plugin:6.1.11' diff --git a/gradle/verification-keyring.keys b/gradle/verification-keyring.keys index 5fa784cd0..0c9d9f946 100644 --- a/gradle/verification-keyring.keys +++ b/gradle/verification-keyring.keys @@ -1810,6 +1810,50 @@ D6aQF9AkWwwt0KnH445Fg84An1hG98Cj9efdOoxMt6lAEHX1eHLq =ZGKN -----END PGP PUBLIC KEY BLOCK----- +pub CA80D1F0EB6CA4BA +uid Sylwester Lachiewicz + +sub 5EAB8AD72016DF52 +-----BEGIN PGP PUBLIC KEY BLOCK----- + +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 +=AKpr +-----END PGP PUBLIC KEY BLOCK----- + pub CB43338E060CF9FA uid Evgeny Mandrikov (CODE SIGNING KEY) diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml index 79574b44a..891a0e574 100644 --- a/gradle/verification-metadata.xml +++ b/gradle/verification-metadata.xml @@ -90,6 +90,7 @@ + @@ -109,6 +110,7 @@ + @@ -262,6 +264,7 @@ + @@ -2133,6 +2136,14 @@ + + + + + + + + @@ -2205,6 +2216,14 @@ + + + + + + + + @@ -2277,6 +2296,14 @@ + + + + + + + + @@ -4649,6 +4676,14 @@ + + + + + + + + @@ -4721,6 +4756,14 @@ + + + + + + + + @@ -4793,6 +4836,14 @@ + + + + + + + + @@ -4865,6 +4916,14 @@ + + + + + + + + @@ -4937,6 +4996,14 @@ + + + + + + + + @@ -5009,6 +5076,14 @@ + + + + + + + + @@ -5121,6 +5196,14 @@ + + + + + + + + @@ -5193,6 +5276,14 @@ + + + + + + + + @@ -5265,6 +5356,14 @@ + + + + + + + + @@ -5337,6 +5436,14 @@ + + + + + + + + @@ -5409,6 +5516,14 @@ + + + + + + + + @@ -5481,6 +5596,14 @@ + + + + + + + + @@ -5553,6 +5676,14 @@ + + + + + + + + @@ -5625,6 +5756,14 @@ + + + + + + + + @@ -5673,6 +5812,14 @@ + + + + + + + + @@ -5745,6 +5892,14 @@ + + + + + + + + @@ -5817,6 +5972,14 @@ + + + + + + + + @@ -5889,6 +6052,14 @@ + + + + + + + + @@ -5961,6 +6132,14 @@ + + + + + + + + @@ -6033,6 +6212,14 @@ + + + + + + + + @@ -6105,6 +6292,14 @@ + + + + + + + + @@ -6217,6 +6412,22 @@ + + + + + + + + + + + + + + + + @@ -6305,6 +6516,14 @@ + + + + + + + + @@ -6393,6 +6612,14 @@ + + + + + + + + @@ -6481,6 +6708,14 @@ + + + + + + + + @@ -6593,6 +6828,14 @@ + + + + + + + + @@ -6665,6 +6908,14 @@ + + + + + + + + @@ -6857,6 +7108,14 @@ + + + + + + + + @@ -7089,6 +7348,14 @@ + + + + + + + + @@ -7161,6 +7428,14 @@ + + + + + + + + @@ -7233,6 +7508,14 @@ + + + + + + + + @@ -7305,6 +7588,14 @@ + + + + + + + + @@ -7377,6 +7668,14 @@ + + + + + + + + @@ -7449,6 +7748,14 @@ + + + + + + + + @@ -7521,6 +7828,14 @@ + + + + + + + + @@ -7561,6 +7876,14 @@ + + + + + + + + @@ -7601,6 +7924,14 @@ + + + + + + + + @@ -7673,6 +8004,14 @@ + + + + + + + + @@ -7745,6 +8084,14 @@ + + + + + + + + @@ -7817,6 +8164,14 @@ + + + + + + + + @@ -7889,6 +8244,14 @@ + + + + + + + + @@ -7961,6 +8324,14 @@ + + + + + + + + @@ -8033,6 +8404,14 @@ + + + + + + + + @@ -8105,6 +8484,14 @@ + + + + + + + + @@ -8177,6 +8564,14 @@ + + + + + + + + @@ -8249,6 +8644,14 @@ + + + + + + + + @@ -8321,6 +8724,14 @@ + + + + + + + + @@ -8393,6 +8804,14 @@ + + + + + + + + @@ -8609,6 +9028,14 @@ + + + + + + + + @@ -8681,6 +9108,14 @@ + + + + + + + + @@ -8753,6 +9188,14 @@ + + + + + + + + @@ -9716,6 +10159,14 @@ + + + + + + + + @@ -10015,6 +10466,14 @@ + + + + + + + + @@ -10299,6 +10758,14 @@ + + + + + + + + @@ -10378,6 +10845,11 @@ + + + + + @@ -10801,6 +11273,11 @@ + + + + + @@ -10822,6 +11299,14 @@ + + + + + + + + @@ -10838,6 +11323,14 @@ + + + + + + + + @@ -10874,6 +11367,11 @@ + + + + + @@ -12195,6 +12693,14 @@ + + + + + + + + @@ -12221,6 +12727,14 @@ + + + + + + + + @@ -12242,6 +12756,22 @@ + + + + + + + + + + + + + + + + @@ -12263,6 +12793,14 @@ + + + + + + + + @@ -12284,6 +12822,14 @@ + + + + + + + + @@ -12305,6 +12851,14 @@ + + + + + + + + @@ -12334,11 +12888,35 @@ + + + + + + + + + + + + + + + + + + + + + + + + @@ -12352,6 +12930,14 @@ + + + + + + + + @@ -12365,6 +12951,14 @@ + + + + + + + + @@ -12378,6 +12972,14 @@ + + + + + + + + @@ -12391,6 +12993,14 @@ + + + + + + + + @@ -12404,6 +13014,14 @@ + + + + + + + + @@ -12417,6 +13035,14 @@ + + + + + + + + @@ -12430,6 +13056,14 @@ + + + + + + + + @@ -12443,6 +13077,11 @@ + + + + + @@ -12453,6 +13092,14 @@ + + + + + + + + @@ -12476,6 +13123,14 @@ + + + + + + + + @@ -12489,6 +13144,14 @@ + + + + + + + + @@ -12550,6 +13213,14 @@ + + + + + + + + @@ -13251,6 +13922,14 @@ + + + + + + + + @@ -13261,6 +13940,11 @@ + + + + + @@ -13272,6 +13956,11 @@ + + + + + @@ -15823,6 +16512,14 @@ + + + + + + + + @@ -15841,6 +16538,14 @@ + + + + + + + + @@ -15854,6 +16559,14 @@ + + + + + + + + @@ -15872,6 +16585,14 @@ + + + + + + + + @@ -15885,6 +16606,14 @@ + + + + + + + + diff --git a/scripts/analysis/lint-results.txt b/scripts/analysis/lint-results.txt index 2210ca0ed..5e5772063 100644 --- a/scripts/analysis/lint-results.txt +++ b/scripts/analysis/lint-results.txt @@ -1,2 +1,2 @@ DO NOT TOUCH; GENERATED BY DRONE - Lint Report: 9 errors and 99 warnings + Lint Report: 10 errors and 99 warnings