From f385e7466238c101ae8afbd0ea519eb0f3291652 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Mon, 4 Oct 2021 14:13:25 +0200
Subject: [PATCH] Improve reusability of code

---
 .../org/matrix/android/sdk/api/MatrixPatterns.kt  | 15 +++++++--------
 .../android/sdk/internal/util/StringUtils.kt      |  4 +++-
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/MatrixPatterns.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/MatrixPatterns.kt
index 034efc2683..2a26b612fb 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/MatrixPatterns.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/MatrixPatterns.kt
@@ -17,6 +17,8 @@
 package org.matrix.android.sdk.api
 
 import org.matrix.android.sdk.BuildConfig
+import org.matrix.android.sdk.internal.util.removeInvalidRoomNameChars
+import org.matrix.android.sdk.internal.util.replaceSpaceChars
 import timber.log.Timber
 
 /**
@@ -130,8 +132,8 @@ object MatrixPatterns {
     fun isEventId(str: String?): Boolean {
         return str != null &&
                 (str matches PATTERN_CONTAIN_MATRIX_EVENT_IDENTIFIER ||
-                str matches PATTERN_CONTAIN_MATRIX_EVENT_IDENTIFIER_V3 ||
-                str matches PATTERN_CONTAIN_MATRIX_EVENT_IDENTIFIER_V4)
+                        str matches PATTERN_CONTAIN_MATRIX_EVENT_IDENTIFIER_V3 ||
+                        str matches PATTERN_CONTAIN_MATRIX_EVENT_IDENTIFIER_V4)
     }
 
     /**
@@ -164,12 +166,9 @@ object MatrixPatterns {
 
     fun candidateAliasFromRoomName(roomName: String, domain: String): String {
         return roomName.lowercase()
-                // Replace spaces by '_'
-                .let { Regex("\\s").replace(it, "_") }
-                // Remove all invalid chars
-                .let { "[^a-z0-9._%#@=+-]".toRegex().replace(it, "") }
-                // limit length
-                .substring(0, MatrixConstants.maxAliasLocalPartLength(domain))
+                .replaceSpaceChars(replacement = "_")
+                .removeInvalidRoomNameChars()
+                .take(MatrixConstants.maxAliasLocalPartLength(domain))
     }
 
     /**
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/util/StringUtils.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/util/StringUtils.kt
index aa0b92aa45..8a6ec18986 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/util/StringUtils.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/util/StringUtils.kt
@@ -78,7 +78,7 @@ internal val spaceChars = "[\u00A0\u2000-\u200B\u2800\u3000]".toRegex()
 /**
  * Strip all the UTF-8 chars which are actually spaces
  */
-internal fun String.replaceSpaceChars() = replace(spaceChars, "")
+internal fun String.replaceSpaceChars(replacement: String = "") = replace(spaceChars, replacement)
 
 // String.capitalize is now deprecated
 internal fun String.safeCapitalize(): String {
@@ -90,3 +90,5 @@ internal fun String.safeCapitalize(): String {
         }
     }
 }
+
+internal fun String.removeInvalidRoomNameChars() = "[^a-z0-9._%#@=+-]".toRegex().replace(this, "")