From 344da53888e0502e2fe9d3235eb03e9cb793673f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kuba=20Szczodrzy=C5=84ski?= Date: Tue, 31 Dec 2019 14:28:37 +0100 Subject: [PATCH] [Errors] Add reporting the error ID. --- .../edziennik/data/api/models/ApiError.kt | 10 ++-------- .../data/api/szkolny/request/ErrorReportRequest.kt | 1 + 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/models/ApiError.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/models/ApiError.kt index 16b7e716..bbc4fd27 100644 --- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/models/ApiError.kt +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/models/ApiError.kt @@ -12,6 +12,7 @@ import pl.szczodrzynski.edziennik.data.api.szkolny.request.ErrorReportRequest import pl.szczodrzynski.edziennik.stackTraceString class ApiError(val tag: String, val errorCode: Int) { + val id = System.currentTimeMillis() var profileId: Int? = null var throwable: Throwable? = null var apiResponse: String? = null @@ -46,14 +47,6 @@ class ApiError(val tag: String, val errorCode: Int) { return this } - fun toAppError(): AppError { - return AppError( - tag, - -1, - errorCode, response, throwable, apiResponse - ) - } - fun getStringText(context: Context): String { return context.resources.getIdentifier("error_${errorCode}", "string", context.packageName).let { if (it != 0) @@ -91,6 +84,7 @@ class ApiError(val tag: String, val errorCode: Int) { "HTTP "+it.code()+" "+it.message()+"\n" + it.headers() + "\n\n" + it.parserErrorBody } return ErrorReportRequest.Error( + id = id, tag = tag, errorCode = errorCode, errorText = getStringText(context), diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/szkolny/request/ErrorReportRequest.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/szkolny/request/ErrorReportRequest.kt index 6c049da1..aa08ff1d 100644 --- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/szkolny/request/ErrorReportRequest.kt +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/szkolny/request/ErrorReportRequest.kt @@ -9,6 +9,7 @@ data class ErrorReportRequest( val errors: List ) { data class Error( + val id: Long, val tag: String, val errorCode: Int, val errorText: String?,