Merge pull request #4953 from nextcloud/renovate/com.android.tools.build-gradle-8.x

fix(deps): update dependency com.android.tools.build:gradle to v8.10.0

app/lint.xml

@@ -49,4 +49,8 @@
     <issue id="ObsoleteLintCustomCheck" severity="warning">
         <ignore path="**/jetified-annotation-experimental-1.**/**/lint.jar" />
     </issue>
+
+    <issue id="Aligned16KB" severity="error">
+        <ignore path="**/jetified-android-database-sqlcipher-4.5.4/**/libsqlcipher.so" />
+    </issue>
 </lint>

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

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<UserItemViewHolder>(), IFilterable<String?> {
-    override fun equals(o: Any?): Boolean {
+    override fun equals(other: Any?): Boolean {
-        return if (o is AdvancedUserItem) {
+        return if (other is AdvancedUserItem) {
-            model == o.model
+            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()
     }
 

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()
                 )
     }

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()
     }
 

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()
             )
     }
 

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)
                             }

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
         }

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

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 ""
             }

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'

gradle/verification-keyring.keys

@@ -1810,6 +1810,50 @@ D6aQF9AkWwwt0KnH445Fg84An1hG98Cj9efdOoxMt6lAEHX1eHLq
 =ZGKN
 -----END PGP PUBLIC KEY BLOCK-----
 
+pub    CA80D1F0EB6CA4BA
+uid    Sylwester Lachiewicz <slachiewicz@apache.org>
+
+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) <mandrikov@gmail.com>
 

scripts/analysis/lint-results.txt

@@ -1,2 +1,2 @@
 DO NOT TOUCH; GENERATED BY DRONE
-      <span class="mdl-layout-title">Lint Report: 9 errors and 99 warnings</span>
+      <span class="mdl-layout-title">Lint Report: 10 errors and 99 warnings</span>