Changed constructor of BaseHttpRequest

backbonesk · Jun 17, 2020 · b790cc8 · b790cc8
1 parent 91e8dd4
commit b790cc8
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 5 deletions.
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/app/build.gradle b/app/build.gradle
@@ -12,7 +12,7 @@ android {
         minSdkVersion 23
         targetSdkVersion 29
         versionCode 1
-        versionName "1.0.3"
+        versionName "1.0.4"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }

diff --git a/app/src/main/java/sk/backbone/android/shared/repositories/server/client/BaseHttpRequest.kt b/app/src/main/java/sk/backbone/android/shared/repositories/server/client/BaseHttpRequest.kt
@@ -12,6 +12,7 @@ import org.json.JSONException
 import org.json.JSONObject
 import sk.backbone.android.shared.repositories.server.client.exceptions.BaseHttpException
 import sk.backbone.android.shared.repositories.server.client.exceptions.IExceptionDescriptionProvider
+import sk.backbone.android.shared.utils.notNullValuesOnly
 import java.io.UnsupportedEncodingException
 import java.nio.charset.Charset
 import kotlin.coroutines.Continuation
@@ -20,9 +21,9 @@ import kotlin.coroutines.resumeWithException
 
 abstract class BaseHttpRequest<T>(
     continuation: Continuation<T?>,
-    requestMethod: Int,
-    uri: Uri,
-    body: String,
+    protected val requestMethod: Int,
+    protected val uri: Uri,
+    protected val body: String,
     parseSuccessResponse: (JSONObject?) -> T?,
     errorParser: IExceptionDescriptionProvider
 ): JsonRequest<JSONObject>(requestMethod, uri.toString(), body, onSuccess(continuation, parseSuccessResponse), onError(errorParser, continuation)){
@@ -53,6 +54,16 @@ abstract class BaseHttpRequest<T>(
     }
 
     companion object {
+        private fun getUri(schema: String, serverAddress: String, apiVersion: String, endpoint: String, queryParameters: MutableMap<String, String?>?){
+            val urlBuilder = Uri.Builder().scheme(schema).encodedAuthority(serverAddress).appendEncodedPath(apiVersion).appendEncodedPath(endpoint).apply {
+                queryParameters?.let {
+                    for (key in it.notNullValuesOnly().keys){
+                        this.appendQueryParameter(key, queryParameters[key])
+                    }
+                }
+            }
+        }
+
         private fun <T>onSuccess(continuation: Continuation<T?>, parseSuccessResponse: (JSONObject?) -> T?): Response.Listener<JSONObject?>{
             return Response.Listener {
                 Log.i("HttpResponseBody", it.toString())