Merge branch 'feat/libcurl' into 'master'

chore: expose HttpClient and HttpClientCanceler See merge request TankerHQ/sdk-android!268
TankerHQ · Jul 22, 2022 · 1524534 · 1524534
2 parents 900b7fa + 4dd52c8
commit 1524534
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/tanker-bindings/build.gradle b/tanker-bindings/build.gradle
@@ -140,6 +140,12 @@ tasks.dokkaJavadoc.configure {
                 matchingRegex.set("io\\.tanker\\.api\\.Identity")
                 suppress.set(true)
             }
+
+            // Exclude HttpClient api
+            perPackageOption {
+                matchingRegex.set("io\\.tanker\\.api\\.HttpClient")
+                suppress.set(true)
+            }
         }
     }
 }

diff --git a/tanker-bindings/src/main/kotlin/io/tanker/api/HttpClient.kt b/tanker-bindings/src/main/kotlin/io/tanker/api/HttpClient.kt
@@ -11,7 +11,7 @@ import okhttp3.RequestBody.Companion.toRequestBody
 import java.io.IOException
 import java.util.concurrent.atomic.AtomicInteger
 
-internal class HttpClient(private val tankerLib: TankerLib, private val sdkType: String, private val sdkVersion: String) : TankerLib.HttpSendRequestCallback {
+class HttpClient(private val tankerLib: TankerLib, private val sdkType: String, private val sdkVersion: String) : TankerLib.HttpSendRequestCallback {
     companion object {
         val JSON = "application/json; charset=utf-8".toMediaTypeOrNull()!!
     }
@@ -96,7 +96,7 @@ internal class HttpClient(private val tankerLib: TankerLib, private val sdkType:
     }
 }
 
-internal class HttpClientCanceler(private val httpClient: HttpClient) : TankerLib.HttpCancelRequestCallback {
+class HttpClientCanceler(private val httpClient: HttpClient) : TankerLib.HttpCancelRequestCallback {
     override fun callback(crequest: TankerHttpRequest, requestHandle: Pointer?, data: Pointer?) {
         val requestId = Pointer.nativeValue(requestHandle).toInt()
         synchronized(httpClient) {

diff --git a/tanker-bindings/src/main/kotlin/io/tanker/api/TankerOptions.kt b/tanker-bindings/src/main/kotlin/io/tanker/api/TankerOptions.kt
@@ -6,7 +6,7 @@ import io.tanker.bindings.DatastoreLib
 import io.tanker.bindings.TankerLib
 import io.tanker.datastore.DatastoreOptions
 
-internal class HttpOptions : Structure() {
+class HttpOptions : Structure() {
     @JvmField var httpSendRequest: TankerLib.HttpSendRequestCallback? = null
     @JvmField var httpCancelRequest: TankerLib.HttpCancelRequestCallback? = null
     @JvmField var httpData: Pointer? = Pointer.NULL