github/szkolny
1
0
Fork 1
mirror of https://github.com/szkolny-eu/szkolny-android.git synced 2024-11-24 19:04:38 -06:00
Code Issues Actions Packages Projects Releases Wiki Activity

[API/Usos] Implement basic error handling.

Browse Source
This commit is contained in:
kuba2k2 2022-10-17 12:56:07 +02:00
parent cf25507850
commit dc19043f73
No known key found for this signature in database
GPG Key ID: 7919598F25F38819
2 changed files with 27 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/src/main/java/pl/szczodrzynski/edziennik/data/api/Errors.kt
View File

@ -204,6 +204,7 @@ const val ERROR_USOS_OAUTH_GOT_DIFFERENT_TOKEN = 702
const val ERROR_USOS_OAUTH_INCOMPLETE_RESPONSE = 703 const val ERROR_USOS_OAUTH_INCOMPLETE_RESPONSE = 703
const val ERROR_USOS_NO_STUDENT_PROGRAMMES = 704 const val ERROR_USOS_NO_STUDENT_PROGRAMMES = 704
const val ERROR_USOS_API_INCOMPLETE_RESPONSE = 705 const val ERROR_USOS_API_INCOMPLETE_RESPONSE = 705
const val ERROR_USOS_API_MISSING_RESPONSE = 706
const val ERROR_TEMPLATE_WEB_OTHER = 801 const val ERROR_TEMPLATE_WEB_OTHER = 801

31
app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/usos/data/UsosApi.kt
View File

@ -13,8 +13,10 @@ import im.wangchao.mhttp.callback.JsonArrayCallbackHandler
import im.wangchao.mhttp.callback.JsonCallbackHandler import im.wangchao.mhttp.callback.JsonCallbackHandler
import im.wangchao.mhttp.callback.TextCallbackHandler import im.wangchao.mhttp.callback.TextCallbackHandler
import pl.szczodrzynski.edziennik.data.api.ERROR_REQUEST_FAILURE import pl.szczodrzynski.edziennik.data.api.ERROR_REQUEST_FAILURE
import pl.szczodrzynski.edziennik.data.api.ERROR_USOS_API_MISSING_RESPONSE
import pl.szczodrzynski.edziennik.data.api.SERVER_USER_AGENT import pl.szczodrzynski.edziennik.data.api.SERVER_USER_AGENT
import pl.szczodrzynski.edziennik.data.api.edziennik.usos.DataUsos import pl.szczodrzynski.edziennik.data.api.edziennik.usos.DataUsos
import pl.szczodrzynski.edziennik.data.api.edziennik.usos.login.UsosLoginApi
import pl.szczodrzynski.edziennik.data.api.models.ApiError import pl.szczodrzynski.edziennik.data.api.models.ApiError
import pl.szczodrzynski.edziennik.ext.* import pl.szczodrzynski.edziennik.ext.*
import pl.szczodrzynski.edziennik.utils.Utils.d import pl.szczodrzynski.edziennik.utils.Utils.d
@ -141,7 +143,7 @@ open class UsosApi(open val data: DataUsos, open val lastSync: Long?) {
) = when (responseType) { ) = when (responseType) {
ResponseType.OBJECT -> object : JsonCallbackHandler() { ResponseType.OBJECT -> object : JsonCallbackHandler() {
override fun onSuccess(data: JsonObject?, response: Response) { override fun onSuccess(data: JsonObject?, response: Response) {
processResponse(response, data as T, onSuccess) processResponse(tag, response, data as T?, onSuccess)
} }
override fun onFailure(response: Response?, throwable: Throwable?) { override fun onFailure(response: Response?, throwable: Throwable?) {
@ -150,7 +152,7 @@ open class UsosApi(open val data: DataUsos, open val lastSync: Long?) {
} }
ResponseType.ARRAY -> object : JsonArrayCallbackHandler() { ResponseType.ARRAY -> object : JsonArrayCallbackHandler() {
override fun onSuccess(data: JsonArray?, response: Response) { override fun onSuccess(data: JsonArray?, response: Response) {
processResponse(response, data as T, onSuccess) processResponse(tag, response, data as T?, onSuccess)
} }
override fun onFailure(response: Response?, throwable: Throwable?) { override fun onFailure(response: Response?, throwable: Throwable?) {
@ -159,7 +161,7 @@ open class UsosApi(open val data: DataUsos, open val lastSync: Long?) {
} }
ResponseType.PLAIN -> object : TextCallbackHandler() { ResponseType.PLAIN -> object : TextCallbackHandler() {
override fun onSuccess(data: String?, response: Response) { override fun onSuccess(data: String?, response: Response) {
processResponse(response, data as T, onSuccess) processResponse(tag, response, data as T?, onSuccess)
} }
override fun onFailure(response: Response?, throwable: Throwable?) { override fun onFailure(response: Response?, throwable: Throwable?) {
@ -169,11 +171,30 @@ open class UsosApi(open val data: DataUsos, open val lastSync: Long?) {
} }
private fun <T> processResponse( private fun <T> processResponse(
tag: String,
response: Response, response: Response,
data: T, value: T?,
onSuccess: (data: T, response: Response?) -> Unit, onSuccess: (data: T, response: Response?) -> Unit,
) { ) {
onSuccess(data, response) val errorCode = when {
response.code() == HTTP_UNAUTHORIZED -> {
data.oauthTokenKey = null
data.oauthTokenSecret = null
data.oauthTokenIsUser = false
data.oauthLoginResponse = null
UsosLoginApi(data) { }
return
}
value == null -> ERROR_USOS_API_MISSING_RESPONSE
response.code() == HTTP_OK -> {
onSuccess(value, response)
null
}
else -> response.toErrorCode()
}
if (errorCode != null) {
data.error(tag, errorCode, response, value.toString())
}
} }
private fun processError( private fun processError(