Remove dead code.
This commit is contained in:
Benoit Marty
parent
50c3e65998
commit
265ccae48f
1 changed files with 1 additions and 115 deletions
|
|
@ -16,9 +16,6 @@
|
||||||
|
|
||||||
package io.element.android.libraries.matrix.api.core
|
package io.element.android.libraries.matrix.api.core
|
||||||
|
|
||||||
import io.element.android.libraries.androidutils.metadata.isInDebug
|
|
||||||
import timber.log.Timber
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* This class contains pattern to match the different Matrix ids
|
* This class contains pattern to match the different Matrix ids
|
||||||
* Ref: https://matrix.org/docs/spec/appendices#identifier-grammar
|
* Ref: https://matrix.org/docs/spec/appendices#identifier-grammar
|
||||||
|
|
@ -31,7 +28,7 @@ object MatrixPatterns {
|
||||||
// See https://matrix.org/docs/spec/appendices#historical-user-ids
|
// See https://matrix.org/docs/spec/appendices#historical-user-ids
|
||||||
// Sadly, we need to relax the regex pattern a bit as there already exist some ids that don't match the spec.
|
// Sadly, we need to relax the regex pattern a bit as there already exist some ids that don't match the spec.
|
||||||
private const val MATRIX_USER_IDENTIFIER_REGEX = "^@.*?$DOMAIN_REGEX$"
|
private const val MATRIX_USER_IDENTIFIER_REGEX = "^@.*?$DOMAIN_REGEX$"
|
||||||
val PATTERN_CONTAIN_MATRIX_USER_IDENTIFIER = MATRIX_USER_IDENTIFIER_REGEX.toRegex(RegexOption.IGNORE_CASE)
|
private val PATTERN_CONTAIN_MATRIX_USER_IDENTIFIER = MATRIX_USER_IDENTIFIER_REGEX.toRegex(RegexOption.IGNORE_CASE)
|
||||||
|
|
||||||
// regex pattern to find room ids in a string.
|
// regex pattern to find room ids in a string.
|
||||||
private const val MATRIX_ROOM_IDENTIFIER_REGEX = "![A-Z0-9.-]+$DOMAIN_REGEX"
|
private const val MATRIX_ROOM_IDENTIFIER_REGEX = "![A-Z0-9.-]+$DOMAIN_REGEX"
|
||||||
|
|
@ -54,52 +51,6 @@ object MatrixPatterns {
|
||||||
private const val MATRIX_EVENT_IDENTIFIER_V4_REGEX = "\\$[A-Z0-9\\-_]+"
|
private const val MATRIX_EVENT_IDENTIFIER_V4_REGEX = "\\$[A-Z0-9\\-_]+"
|
||||||
private val PATTERN_CONTAIN_MATRIX_EVENT_IDENTIFIER_V4 = MATRIX_EVENT_IDENTIFIER_V4_REGEX.toRegex(RegexOption.IGNORE_CASE)
|
private val PATTERN_CONTAIN_MATRIX_EVENT_IDENTIFIER_V4 = MATRIX_EVENT_IDENTIFIER_V4_REGEX.toRegex(RegexOption.IGNORE_CASE)
|
||||||
|
|
||||||
// regex pattern to find group ids in a string.
|
|
||||||
private const val MATRIX_GROUP_IDENTIFIER_REGEX = "\\+[A-Z0-9=_\\-./]+$DOMAIN_REGEX"
|
|
||||||
private val PATTERN_CONTAIN_MATRIX_GROUP_IDENTIFIER = MATRIX_GROUP_IDENTIFIER_REGEX.toRegex(RegexOption.IGNORE_CASE)
|
|
||||||
|
|
||||||
// regex pattern to find permalink with message id.
|
|
||||||
// Android does not support in URL so extract it.
|
|
||||||
private const val PERMALINK_BASE_REGEX = "https://matrix\\.to/#/"
|
|
||||||
private const val APP_BASE_REGEX = "https://[A-Z0-9.-]+\\.[A-Z]{2,}/[A-Z]{3,}/#/room/"
|
|
||||||
const val SEP_REGEX = "/"
|
|
||||||
|
|
||||||
private const val LINK_TO_ROOM_ID_REGEXP = PERMALINK_BASE_REGEX + MATRIX_ROOM_IDENTIFIER_REGEX + SEP_REGEX + MATRIX_EVENT_IDENTIFIER_REGEX
|
|
||||||
private val PATTERN_CONTAIN_MATRIX_TO_PERMALINK_ROOM_ID = LINK_TO_ROOM_ID_REGEXP.toRegex(RegexOption.IGNORE_CASE)
|
|
||||||
|
|
||||||
private const val LINK_TO_ROOM_ALIAS_REGEXP = PERMALINK_BASE_REGEX + MATRIX_ROOM_ALIAS_REGEX + SEP_REGEX + MATRIX_EVENT_IDENTIFIER_REGEX
|
|
||||||
private val PATTERN_CONTAIN_MATRIX_TO_PERMALINK_ROOM_ALIAS = LINK_TO_ROOM_ALIAS_REGEXP.toRegex(RegexOption.IGNORE_CASE)
|
|
||||||
|
|
||||||
private const val LINK_TO_APP_ROOM_ID_REGEXP = APP_BASE_REGEX + MATRIX_ROOM_IDENTIFIER_REGEX + SEP_REGEX + MATRIX_EVENT_IDENTIFIER_REGEX
|
|
||||||
private val PATTERN_CONTAIN_APP_LINK_PERMALINK_ROOM_ID = LINK_TO_APP_ROOM_ID_REGEXP.toRegex(RegexOption.IGNORE_CASE)
|
|
||||||
|
|
||||||
private const val LINK_TO_APP_ROOM_ALIAS_REGEXP = APP_BASE_REGEX + MATRIX_ROOM_ALIAS_REGEX + SEP_REGEX + MATRIX_EVENT_IDENTIFIER_REGEX
|
|
||||||
private val PATTERN_CONTAIN_APP_LINK_PERMALINK_ROOM_ALIAS = LINK_TO_APP_ROOM_ALIAS_REGEXP.toRegex(RegexOption.IGNORE_CASE)
|
|
||||||
|
|
||||||
// ascii characters in the range \x20 (space) to \x7E (~)
|
|
||||||
val ORDER_STRING_REGEX = "[ -~]+".toRegex()
|
|
||||||
|
|
||||||
// list of patterns to find some matrix item.
|
|
||||||
val MATRIX_PATTERNS = listOf(
|
|
||||||
PATTERN_CONTAIN_MATRIX_TO_PERMALINK_ROOM_ID,
|
|
||||||
PATTERN_CONTAIN_MATRIX_TO_PERMALINK_ROOM_ALIAS,
|
|
||||||
PATTERN_CONTAIN_APP_LINK_PERMALINK_ROOM_ID,
|
|
||||||
PATTERN_CONTAIN_APP_LINK_PERMALINK_ROOM_ALIAS,
|
|
||||||
PATTERN_CONTAIN_MATRIX_USER_IDENTIFIER,
|
|
||||||
PATTERN_CONTAIN_MATRIX_ALIAS,
|
|
||||||
PATTERN_CONTAIN_MATRIX_ROOM_IDENTIFIER,
|
|
||||||
PATTERN_CONTAIN_MATRIX_EVENT_IDENTIFIER,
|
|
||||||
PATTERN_CONTAIN_MATRIX_GROUP_IDENTIFIER
|
|
||||||
)
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Tells if a string is a valid session Id. This is an alias for [isUserId]
|
|
||||||
*
|
|
||||||
* @param str the string to test
|
|
||||||
* @return true if the string is a valid session id
|
|
||||||
*/
|
|
||||||
fun isSessionId(str: String?) = isUserId(str)
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Tells if a string is a valid user Id.
|
* Tells if a string is a valid user Id.
|
||||||
*
|
*
|
||||||
|
|
@ -158,69 +109,4 @@ object MatrixPatterns {
|
||||||
* @return true if the string is a valid thread id.
|
* @return true if the string is a valid thread id.
|
||||||
*/
|
*/
|
||||||
fun isThreadId(str: String?) = isEventId(str)
|
fun isThreadId(str: String?) = isEventId(str)
|
||||||
|
|
||||||
/**
|
|
||||||
* Tells if a string is a valid group id.
|
|
||||||
*
|
|
||||||
* @param str the string to test
|
|
||||||
* @return true if the string is a valid group id.
|
|
||||||
*/
|
|
||||||
fun isGroupId(str: String?): Boolean {
|
|
||||||
return str != null && str matches PATTERN_CONTAIN_MATRIX_GROUP_IDENTIFIER
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Extract server name from a matrix id.
|
|
||||||
*
|
|
||||||
* @param matrixId
|
|
||||||
* @return null if not found or if matrixId is null
|
|
||||||
*/
|
|
||||||
fun extractServerNameFromId(matrixId: String?): String? {
|
|
||||||
return matrixId?.substringAfter(":", missingDelimiterValue = "")?.takeIf { it.isNotEmpty() }
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Extract user name from a matrix id.
|
|
||||||
*
|
|
||||||
* @param matrixId
|
|
||||||
* @return null if the input is not a valid matrixId
|
|
||||||
*/
|
|
||||||
fun extractUserNameFromId(matrixId: String): String? {
|
|
||||||
return if (isUserId(matrixId)) {
|
|
||||||
matrixId.removePrefix("@").substringBefore(":", missingDelimiterValue = "")
|
|
||||||
} else {
|
|
||||||
null
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Orders which are not strings, or do not consist solely of ascii characters in the range \x20 (space) to \x7E (~),
|
|
||||||
* or consist of more than 50 characters, are forbidden and the field should be ignored if received.
|
|
||||||
*/
|
|
||||||
fun isValidOrderString(order: String?): Boolean {
|
|
||||||
return order != null && order.length < 50 && order matches ORDER_STRING_REGEX
|
|
||||||
}
|
|
||||||
|
|
||||||
/*
|
|
||||||
fun candidateAliasFromRoomName(roomName: String, domain: String): String {
|
|
||||||
return roomName.lowercase()
|
|
||||||
.replaceSpaceChars(replacement = "_")
|
|
||||||
.removeInvalidRoomNameChars()
|
|
||||||
.take(MatrixConstants.maxAliasLocalPartLength(domain))
|
|
||||||
}
|
|
||||||
*/
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Return the domain form a userId.
|
|
||||||
* Examples:
|
|
||||||
* - "@alice:domain.org".getDomain() will return "domain.org"
|
|
||||||
* - "@bob:domain.org:3455".getDomain() will return "domain.org:3455"
|
|
||||||
*/
|
|
||||||
fun String.getServerName(): String {
|
|
||||||
if (isInDebug && !isUserId(this)) {
|
|
||||||
// They are some invalid userId localpart in the wild, but the domain part should be there anyway
|
|
||||||
Timber.w("Not a valid user ID: $this")
|
|
||||||
}
|
|
||||||
return substringAfter(":")
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue