From afd2ecd384cf00f5caf9a08d6210d22c66b6372f Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Fri, 5 Feb 2021 12:10:25 +0100
Subject: [PATCH] Remove duplicated method

---
 .../android/sdk/api/util/UrlExtensions.kt     |  7 ++++++
 .../widgets/DefaultWidgetURLFormatter.kt      | 24 ++-----------------
 2 files changed, 9 insertions(+), 22 deletions(-)

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/util/UrlExtensions.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/util/UrlExtensions.kt
index 17f27b2514..d40de1a0df 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/util/UrlExtensions.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/util/UrlExtensions.kt
@@ -35,3 +35,10 @@ fun StringBuilder.appendParamToUrl(param: String, value: String): StringBuilder
 
     return this
 }
+
+fun StringBuilder.appendParamsToUrl(params: Map<String, String>): StringBuilder {
+    params.forEach { (param, value) ->
+        appendParamToUrl(param, value)
+    }
+    return this
+}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/widgets/DefaultWidgetURLFormatter.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/widgets/DefaultWidgetURLFormatter.kt
index 94dba75205..db74e76b31 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/widgets/DefaultWidgetURLFormatter.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/widgets/DefaultWidgetURLFormatter.kt
@@ -20,11 +20,12 @@ import org.matrix.android.sdk.api.MatrixConfiguration
 import org.matrix.android.sdk.api.session.integrationmanager.IntegrationManagerConfig
 import org.matrix.android.sdk.api.session.integrationmanager.IntegrationManagerService
 import org.matrix.android.sdk.api.session.widgets.WidgetURLFormatter
+import org.matrix.android.sdk.api.util.appendParamToUrl
+import org.matrix.android.sdk.api.util.appendParamsToUrl
 import org.matrix.android.sdk.internal.session.SessionLifecycleObserver
 import org.matrix.android.sdk.internal.session.SessionScope
 import org.matrix.android.sdk.internal.session.integrationmanager.IntegrationManager
 import org.matrix.android.sdk.internal.session.widgets.token.GetScalarTokenTask
-import java.net.URLEncoder
 import javax.inject.Inject
 
 @SessionScope
@@ -90,25 +91,4 @@ internal class DefaultWidgetURLFormatter @Inject constructor(private val integra
         }
         return false
     }
-
-    private fun StringBuilder.appendParamsToUrl(params: Map<String, String>): StringBuilder {
-        params.forEach { (param, value) ->
-            appendParamToUrl(param, value)
-        }
-        return this
-    }
-
-    private fun StringBuilder.appendParamToUrl(param: String, value: String): StringBuilder {
-        if (contains("?")) {
-            append("&")
-        } else {
-            append("?")
-        }
-
-        append(param)
-        append("=")
-        append(URLEncoder.encode(value, "utf-8"))
-
-        return this
-    }
 }