Skip to content

MBX-3062: Changed StringRequest to MindboxRequest #424

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jan 17, 2024
Merged

MBX-3062: Changed StringRequest to MindboxRequest #424

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4391664
MBX-3062: Changed StringRequest to MindboxRequest
ssozinov Jan 15, 2024
4c041b3
MBX-3062: delete new Error type
ssozinov Jan 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion sdk/src/main/java/cloud/mindbox/mobile_sdk/inapp/domain/models/InAppDataError.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,4 @@ internal class GeoError(volleyError: VolleyError) : Exception(volleyError)
internal class ProductSegmentationError(volleyError: VolleyError) :
Exception(volleyError)

internal class InAppContentFetchingError(error: GlideException?) : Exception(error)
internal class InAppContentFetchingError(error: GlideException?) : Exception(error)
16 changes: 8 additions & 8 deletions sdk/src/main/java/cloud/mindbox/mobile_sdk/managers/GatewayManager.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ import com.android.volley.DefaultRetryPolicy
import com.android.volley.DefaultRetryPolicy.DEFAULT_BACKOFF_MULT
import com.android.volley.Request
import com.android.volley.VolleyError
import com.android.volley.toolbox.StringRequest
import com.google.gson.Gson
import kotlinx.coroutines.*
import org.json.JSONException
Expand Down Expand Up @@ -409,17 +408,18 @@ internal class GatewayManager(private val mindboxServiceGenerator: MindboxServic
}
}


suspend fun fetchMobileConfig(configuration: Configuration): String {
return suspendCoroutine { continuation ->
mindboxServiceGenerator.addToRequestQueue(
StringRequest(
Request.Method.GET,
getConfigUrl(configuration),
{ response ->
continuation.resume(response)
MindboxRequest(
methodType = Request.Method.GET,
fullUrl = getConfigUrl(configuration),
configuration = configuration,
jsonRequest = null,
listener = { response ->
continuation.resume(response.toString())
},
{ error ->
errorsListener = { error ->
continuation.resumeWithException(error)
Copy link
Collaborator Author

@sergeysozinov sergeysozinov Jan 16, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

image
Если тут указать обертку над volleyError, то не будет работать получение конфига из кэша при отсутствии интернета

},
)
Expand Down
6 changes: 0 additions & 6 deletions sdk/src/main/java/cloud/mindbox/mobile_sdk/network/MindboxServiceGenerator.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ import cloud.mindbox.mobile_sdk.models.MindboxRequest
import cloud.mindbox.mobile_sdk.utils.LoggingExceptionHandler
import com.android.volley.RequestQueue
import com.android.volley.VolleyLog
import com.android.volley.toolbox.StringRequest
import kotlinx.coroutines.launch
import kotlinx.coroutines.suspendCancellableCoroutine

Expand All @@ -29,11 +28,6 @@ internal class MindboxServiceGenerator(private val requestQueue: RequestQueue) {
}
}

internal fun addToRequestQueue(request: StringRequest) {
requestQueue.add(request)
// TODO change StringRequest to MindboxRequest or log here
}

internal fun addToRequestQueue(request: MindboxRequest) = LoggingExceptionHandler.runCatching {
requestQueue.let { requestQueue ->
requestQueue.add(request)
Expand Down