Skip to content

Commit b5ed03f

Browse files
author
Rodrigo Gomez Palacio
committed
fixup! Update HTTP Client to take OptionalHeaders object
1 parent 945a278 commit b5ed03f

File tree

2 files changed

+25
-25
lines changed

2 files changed

+25
-25
lines changed

‎OneSignalSDK/onesignal/core/src/main/java/com/onesignal/core/internal/http/IHttpClient.kt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package com.onesignal.core.internal.http
22

3-
import com.onesignal.core.internal.http.impl.OptionalHeaderValues
3+
import com.onesignal.core.internal.http.impl.OptionalHeaders
44
import org.json.JSONObject
55

66
/**
@@ -19,7 +19,7 @@ interface IHttpClient {
1919
suspend fun post(
2020
url: String,
2121
body: JSONObject,
22-
headerValues: OptionalHeaderValues? = null,
22+
headers: OptionalHeaders? = null,
2323
): HttpResponse
2424

2525
/**
@@ -35,7 +35,7 @@ interface IHttpClient {
3535
*/
3636
suspend fun get(
3737
url: String,
38-
headerValues: OptionalHeaderValues? = null,
38+
headers: OptionalHeaders? = null,
3939
): HttpResponse
4040

4141
/**
@@ -49,7 +49,7 @@ interface IHttpClient {
4949
suspend fun put(
5050
url: String,
5151
body: JSONObject,
52-
headerValues: OptionalHeaderValues? = null,
52+
headers: OptionalHeaders? = null,
5353
): HttpResponse
5454

5555
/**
@@ -63,7 +63,7 @@ interface IHttpClient {
6363
suspend fun patch(
6464
url: String,
6565
body: JSONObject,
66-
headerValues: OptionalHeaderValues? = null,
66+
headers: OptionalHeaders? = null,
6767
): HttpResponse
6868

6969
/**
@@ -75,7 +75,7 @@ interface IHttpClient {
7575
*/
7676
suspend fun delete(
7777
url: String,
78-
headerValues: OptionalHeaderValues? = null,
78+
headers: OptionalHeaders? = null,
7979
): HttpResponse
8080
}
8181

‎OneSignalSDK/onesignal/core/src/main/java/com/onesignal/core/internal/http/impl/HttpClient.kt

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -45,37 +45,37 @@ internal class HttpClient(
4545
override suspend fun post(
4646
url: String,
4747
body: JSONObject,
48-
headerValues: OptionalHeaderValues?,
49-
): HttpResponse = makeRequest(url, "POST", body, _configModelStore.model.httpTimeout, headerValues)
48+
headers: OptionalHeaders?,
49+
): HttpResponse = makeRequest(url, "POST", body, _configModelStore.model.httpTimeout, headers)
5050

5151
override suspend fun get(
5252
url: String,
53-
headerValues: OptionalHeaderValues?,
54-
): HttpResponse = makeRequest(url, null, null, _configModelStore.model.httpGetTimeout, headerValues)
53+
headers: OptionalHeaders?,
54+
): HttpResponse = makeRequest(url, null, null, _configModelStore.model.httpGetTimeout, headers)
5555

5656
override suspend fun put(
5757
url: String,
5858
body: JSONObject,
59-
headerValues: OptionalHeaderValues?,
60-
): HttpResponse = makeRequest(url, "PUT", body, _configModelStore.model.httpTimeout, headerValues)
59+
headers: OptionalHeaders?,
60+
): HttpResponse = makeRequest(url, "PUT", body, _configModelStore.model.httpTimeout, headers)
6161

6262
override suspend fun patch(
6363
url: String,
6464
body: JSONObject,
65-
headerValues: OptionalHeaderValues?,
66-
): HttpResponse = makeRequest(url, "PATCH", body, _configModelStore.model.httpTimeout, headerValues)
65+
headers: OptionalHeaders?,
66+
): HttpResponse = makeRequest(url, "PATCH", body, _configModelStore.model.httpTimeout, headers)
6767

6868
override suspend fun delete(
6969
url: String,
70-
headerValues: OptionalHeaderValues?,
71-
): HttpResponse = makeRequest(url, "DELETE", null, _configModelStore.model.httpTimeout, headerValues)
70+
headers: OptionalHeaders?,
71+
): HttpResponse = makeRequest(url, "DELETE", null, _configModelStore.model.httpTimeout, headers)
7272

7373
private suspend fun makeRequest(
7474
url: String,
7575
method: String?,
7676
jsonBody: JSONObject?,
7777
timeout: Int,
78-
headerValues: OptionalHeaderValues?,
78+
headers: OptionalHeaders?,
7979
): HttpResponse {
8080
// If privacy consent is required but not yet given, any non-GET request should be blocked.
8181
if (method != null && _configModelStore.model.consentRequired == true && _configModelStore.model.consentGiven != true) {
@@ -90,7 +90,7 @@ internal class HttpClient(
9090

9191
try {
9292
return withTimeout(getThreadTimeout(timeout).toLong()) {
93-
return@withTimeout makeRequestIODispatcher(url, method, jsonBody, timeout, headerValues)
93+
return@withTimeout makeRequestIODispatcher(url, method, jsonBody, timeout, headers)
9494
}
9595
} catch (e: TimeoutCancellationException) {
9696
Logging.error("HttpClient: Request timed out: $url", e)
@@ -106,7 +106,7 @@ internal class HttpClient(
106106
method: String?,
107107
jsonBody: JSONObject?,
108108
timeout: Int,
109-
headerValues: OptionalHeaderValues?,
109+
headers: OptionalHeaders?,
110110
): HttpResponse {
111111
var retVal: HttpResponse? = null
112112

@@ -172,11 +172,11 @@ internal class HttpClient(
172172

173173
// H E A D E R S
174174

175-
if (headerValues?.cacheKey != null) {
175+
if (headers?.cacheKey != null) {
176176
val eTag =
177177
_prefs.getString(
178178
PreferenceStores.ONESIGNAL,
179-
PreferenceOneSignalKeys.PREFS_OS_ETAG_PREFIX + headerValues.cacheKey,
179+
PreferenceOneSignalKeys.PREFS_OS_ETAG_PREFIX + headers.cacheKey,
180180
)
181181
if (eTag != null) {
182182
con.setRequestProperty("If-None-Match", eTag)
@@ -197,7 +197,7 @@ internal class HttpClient(
197197
val cachedResponse =
198198
_prefs.getString(
199199
PreferenceStores.ONESIGNAL,
200-
PreferenceOneSignalKeys.PREFS_OS_HTTP_CACHE_PREFIX + headerValues?.cacheKey,
200+
PreferenceOneSignalKeys.PREFS_OS_HTTP_CACHE_PREFIX + headers?.cacheKey,
201201
)
202202
Logging.debug(
203203
"HttpClient: Got Response = ${method ?: "GET"} ${con.url} - Using Cached response due to 304: " +
@@ -216,19 +216,19 @@ internal class HttpClient(
216216
"HttpClient: Got Response = ${method ?: "GET"} ${con.url} - STATUS: $httpResponse - Body: " + json,
217217
)
218218

219-
if (headerValues?.cacheKey != null) {
219+
if (headers?.cacheKey != null) {
220220
val eTag = con.getHeaderField("etag")
221221
if (eTag != null) {
222222
Logging.debug("HttpClient: Got Response = Response has etag of $eTag so caching the response.")
223223

224224
_prefs.saveString(
225225
PreferenceStores.ONESIGNAL,
226-
PreferenceOneSignalKeys.PREFS_OS_ETAG_PREFIX + headerValues.cacheKey,
226+
PreferenceOneSignalKeys.PREFS_OS_ETAG_PREFIX + headers.cacheKey,
227227
eTag,
228228
)
229229
_prefs.saveString(
230230
PreferenceStores.ONESIGNAL,
231-
PreferenceOneSignalKeys.PREFS_OS_HTTP_CACHE_PREFIX + headerValues.cacheKey,
231+
PreferenceOneSignalKeys.PREFS_OS_HTTP_CACHE_PREFIX + headers.cacheKey,
232232
json,
233233
)
234234
}

0 commit comments

Comments
 (0)