Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/schaal/ocreader.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Schaal <daniel@schaal.email>2021-07-22 07:41:36 +0300
committerDaniel Schaal <daniel@schaal.email>2021-07-25 10:10:47 +0300
commitb4fa3bf9873aa1024d093f7491674c13fd0b5eda (patch)
treea6ac3602e4773d671e36d8e8364dfe718d97a06d
parent7e534788ac98eeebb55bc5cb5f2362e276120734 (diff)
Add MIN_VERSION to error string
-rw-r--r--app/src/main/java/email/schaal/ocreader/util/LoginError.kt5
1 files changed, 3 insertions, 2 deletions
diff --git a/app/src/main/java/email/schaal/ocreader/util/LoginError.kt b/app/src/main/java/email/schaal/ocreader/util/LoginError.kt
index 0586670b..7b38542b 100644
--- a/app/src/main/java/email/schaal/ocreader/util/LoginError.kt
+++ b/app/src/main/java/email/schaal/ocreader/util/LoginError.kt
@@ -4,6 +4,7 @@ import android.content.Context
import com.squareup.moshi.JsonClass
import com.squareup.moshi.Moshi
import email.schaal.ocreader.R
+import email.schaal.ocreader.api.API
import retrofit2.HttpException
import java.io.IOException
import java.net.ConnectException
@@ -29,7 +30,7 @@ class LoginError private constructor(val section: Section, val message: String,
return when (code) {
401 -> LoginError(Section.USER, context.getString(R.string.error_access_forbidden))
403, 404 -> LoginError(Section.URL, context.getString(R.string.error_oc_not_found))
- 405 -> LoginError(Section.URL, context.getString(R.string.ncnews_too_old))
+ 405 -> LoginError(Section.URL, context.getString(R.string.ncnews_too_old, API.MIN_VERSION.toString()))
else -> {
val message = e.response()?.errorBody()?.source()?.let { source ->
Moshi.Builder().build().adapter(ErrorMessage::class.java).fromJson(source)?.message }
@@ -44,7 +45,7 @@ class LoginError private constructor(val section: Section, val message: String,
is UnknownHostException -> LoginError(Section.URL, context.getString(R.string.error_unknown_host))
is SSLHandshakeException -> LoginError(Section.URL, context.getString(R.string.untrusted_certificate))
is ConnectException -> LoginError(Section.URL, context.getString(R.string.could_not_connect))
- is IOException -> return LoginError(Section.NONE, context.getString(R.string.ncnews_too_old))
+ is IOException -> return LoginError(Section.NONE, context.getString(R.string.ncnews_too_old, API.MIN_VERSION.toString()))
else -> LoginError(t)
}
}