Create extension `String.isMxcUrl()`

changelog.d/4158.removal

@@ -0,0 +1 @@
+Create extension `String.isMxcUrl()`

matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/MatrixUrls.kt

@@ -0,0 +1,26 @@
+/*
+ * Copyright 2021 The Matrix.org Foundation C.I.C.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.matrix.android.sdk.api
+
+/**
+ * This class contains pattern to match Matrix Url, aka mxc urls
+ */
+object MatrixUrls {
+    const val MATRIX_CONTENT_URI_SCHEME = "mxc://"
+
+    fun String.isMxcUrl() = startsWith(MATRIX_CONTENT_URI_SCHEME)
+}

matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/DefaultContentUrlResolver.kt

@@ -16,14 +16,14 @@
 
 package org.matrix.android.sdk.internal.session.content
 
+import org.matrix.android.sdk.api.MatrixUrls
+import org.matrix.android.sdk.api.MatrixUrls.isMxcUrl
 import org.matrix.android.sdk.api.auth.data.HomeServerConnectionConfig
 import org.matrix.android.sdk.api.session.content.ContentUrlResolver
 import org.matrix.android.sdk.internal.network.NetworkConstants
 import org.matrix.android.sdk.internal.util.ensureTrailingSlash
 import javax.inject.Inject
 
-private const val MATRIX_CONTENT_URI_SCHEME = "mxc://"
-
 internal class DefaultContentUrlResolver @Inject constructor(homeServerConnectionConfig: HomeServerConnectionConfig) : ContentUrlResolver {
 
     private val baseUrl = homeServerConnectionConfig.homeServerUriBase.toString().ensureTrailingSlash()
@@ -33,7 +33,7 @@ internal class DefaultContentUrlResolver @Inject constructor(homeServerConnectio
     override fun resolveFullSize(contentUrl: String?): String? {
         return contentUrl
                 // do not allow non-mxc content URLs
-                ?.takeIf { it.isValidMatrixContentUrl() }
+                ?.takeIf { it.isMxcUrl() }
                 ?.let {
                     resolve(
                             contentUrl = it,
@@ -45,7 +45,7 @@ internal class DefaultContentUrlResolver @Inject constructor(homeServerConnectio
     override fun resolveThumbnail(contentUrl: String?, width: Int, height: Int, method: ContentUrlResolver.ThumbnailMethod): String? {
         return contentUrl
                 // do not allow non-mxc content URLs
-                ?.takeIf { it.isValidMatrixContentUrl() }
+                ?.takeIf { it.isMxcUrl() }
                 ?.let {
                     resolve(
                             contentUrl = it,
@@ -58,7 +58,7 @@ internal class DefaultContentUrlResolver @Inject constructor(homeServerConnectio
     private fun resolve(contentUrl: String,
                         prefix: String,
                         params: String = ""): String? {
-        var serverAndMediaId = contentUrl.removePrefix(MATRIX_CONTENT_URI_SCHEME)
+        var serverAndMediaId = contentUrl.removePrefix(MatrixUrls.MATRIX_CONTENT_URI_SCHEME)
         val fragmentOffset = serverAndMediaId.indexOf("#")
         var fragment = ""
         if (fragmentOffset >= 0) {
@@ -68,8 +68,4 @@ internal class DefaultContentUrlResolver @Inject constructor(homeServerConnectio
 
         return baseUrl + prefix + serverAndMediaId + params + fragment
     }
-
-    private fun String.isValidMatrixContentUrl(): Boolean {
-        return startsWith(MATRIX_CONTENT_URI_SCHEME)
-    }
 }

matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/DefaultSendService.kt

@@ -25,6 +25,7 @@ import dagger.assisted.Assisted
 import dagger.assisted.AssistedFactory
 import dagger.assisted.AssistedInject
 import kotlinx.coroutines.launch
+import org.matrix.android.sdk.api.MatrixUrls.isMxcUrl
 import org.matrix.android.sdk.api.session.content.ContentAttachmentData
 import org.matrix.android.sdk.api.session.events.model.Event
 import org.matrix.android.sdk.api.session.events.model.isAttachmentMessage
@@ -130,7 +131,7 @@ internal class DefaultSendService @AssistedInject constructor(
             val messageContent = clearContent?.toModel<MessageContent>() as? MessageWithAttachmentContent ?: return NoOpCancellable
 
             val url = messageContent.getFileUrl() ?: return NoOpCancellable
-            if (url.startsWith("mxc://")) {
+            if (url.isMxcUrl()) {
                 // We need to resend only the message as the attachment is ok
                 localEchoRepository.updateSendState(localEcho.eventId, roomId, SendState.UNSENT)
                 return sendEvent(localEcho.root)

vector/src/main/java/im/vector/app/features/command/CommandParser.kt

@@ -20,6 +20,7 @@ import im.vector.app.core.extensions.isEmail
 import im.vector.app.core.extensions.isMsisdn
 import im.vector.app.features.home.room.detail.ChatEffect
 import org.matrix.android.sdk.api.MatrixPatterns
+import org.matrix.android.sdk.api.MatrixUrls.isMxcUrl
 import org.matrix.android.sdk.api.session.identity.ThreePid
 import timber.log.Timber
 
@@ -92,7 +93,7 @@ object CommandParser {
                     if (messageParts.size == 2) {
                         val url = messageParts[1]
 
-                        if (url.startsWith("mxc://")) {
+                        if (url.isMxcUrl()) {
                             ParsedCommand.ChangeRoomAvatar(url)
                         } else {
                             ParsedCommand.ErrorSyntax(Command.ROOM_AVATAR)
@@ -105,7 +106,7 @@ object CommandParser {
                     if (messageParts.size == 2) {
                         val url = messageParts[1]
 
-                        if (url.startsWith("mxc://")) {
+                        if (url.isMxcUrl()) {
                             ParsedCommand.ChangeAvatarForRoom(url)
                         } else {
                             ParsedCommand.ErrorSyntax(Command.CHANGE_AVATAR_FOR_ROOM)

vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/MessageItemFactory.kt

@@ -69,6 +69,7 @@ import im.vector.app.features.media.ImageContentRenderer
 import im.vector.app.features.media.VideoContentRenderer
 import me.gujun.android.span.span
 import org.commonmark.node.Document
+import org.matrix.android.sdk.api.MatrixUrls.isMxcUrl
 import org.matrix.android.sdk.api.session.Session
 import org.matrix.android.sdk.api.session.events.model.RelationType
 import org.matrix.android.sdk.api.session.events.model.toModel
@@ -213,7 +214,7 @@ class MessageItemFactory @Inject constructor(
             if (informationData.sentByMe && !informationData.sendState.isSent()) {
                 it
             } else {
-                it.takeIf { it.startsWith("mxc://") }
+                it.takeIf { it.isMxcUrl() }
             }
         } ?: ""
         return MessageFileItem_()
@@ -244,7 +245,7 @@ class MessageItemFactory @Inject constructor(
             if (informationData.sentByMe && !informationData.sendState.isSent()) {
                 it
             } else {
-                it.takeIf { it.startsWith("mxc://") }
+                it.takeIf { it.isMxcUrl() }
             }
         } ?: ""