kadu/gotify-android-client
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Replace deprecated OkHttp methods

Browse Source
This commit is contained in:
Niko Diamadis
2024-03-14 06:44:03 +01:00
parent 12390f5b8a
commit ddbbca7e62
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/main/kotlin/com/github/gotify/login/LoginActivity.kt
View File

@@ -32,7 +32,7 @@ import com.github.gotify.log.UncaughtExceptionHandler
import com.google.android.material.dialog.MaterialAlertDialogBuilder import com.google.android.material.dialog.MaterialAlertDialogBuilder
import com.google.android.material.textfield.TextInputEditText import com.google.android.material.textfield.TextInputEditText
import java.security.cert.X509Certificate import java.security.cert.X509Certificate
import okhttp3.HttpUrl import okhttp3.HttpUrl.Companion.toHttpUrlOrNull
import org.tinylog.kotlin.Logger import org.tinylog.kotlin.Logger
internal class LoginActivity : AppCompatActivity() { internal class LoginActivity : AppCompatActivity() {
@@ -101,13 +101,13 @@ internal class LoginActivity : AppCompatActivity() {
private fun doCheckUrl() { private fun doCheckUrl() {
val url = binding.gotifyUrlEditext.text.toString().trim().trimEnd('/') val url = binding.gotifyUrlEditext.text.toString().trim().trimEnd('/')
val parsedUrl = HttpUrl.parse(url) val parsedUrl = url.toHttpUrlOrNull()
if (parsedUrl == null) { if (parsedUrl == null) {
Utils.showSnackBar(this, "Invalid URL (include http:// or https://)") Utils.showSnackBar(this, "Invalid URL (include http:// or https://)")
return return
} }
if ("http" == parsedUrl.scheme()) { if ("http" == parsedUrl.scheme) {
showHttpWarning() showHttpWarning()
} }

10
app/src/main/kotlin/com/github/gotify/service/WebSocketConnection.kt
View File

@@ -11,7 +11,7 @@ import com.github.gotify.client.model.Message
import java.util.Calendar import java.util.Calendar
import java.util.concurrent.TimeUnit import java.util.concurrent.TimeUnit
import java.util.concurrent.atomic.AtomicLong import java.util.concurrent.atomic.AtomicLong
import okhttp3.HttpUrl import okhttp3.HttpUrl.Companion.toHttpUrlOrNull
import okhttp3.OkHttpClient import okhttp3.OkHttpClient
import okhttp3.Request import okhttp3.Request
import okhttp3.Response import okhttp3.Response
@@ -89,7 +89,7 @@ internal class WebSocketConnection(
} }
private fun request(): Request { private fun request(): Request {
val url = HttpUrl.parse(baseUrl)!! val url = baseUrl.toHttpUrlOrNull()!!
.newBuilder() .newBuilder()
.addPathSegment("stream") .addPathSegment("stream")
.addQueryParameter("token", token) .addQueryParameter("token", token)
@@ -187,12 +187,12 @@ internal class WebSocketConnection(
} }
override fun onFailure(webSocket: WebSocket, t: Throwable, response: Response?) { override fun onFailure(webSocket: WebSocket, t: Throwable, response: Response?) {
val code = if (response != null) "StatusCode: ${response.code()}" else "" val code = if (response != null) "StatusCode: ${response.code}" else ""
val message = if (response != null) response.message() else "" val message = response?.message ?: ""
Logger.error(t) { "WebSocket($id): failure $code Message: $message" } Logger.error(t) { "WebSocket($id): failure $code Message: $message" }
syncExec(id) { syncExec(id) {
closed() closed()
if (response != null && response.code() >= 400 && response.code() <= 499) { if (response != null && response.code >= 400 && response.code <= 499) {
onBadRequest.execute(message) onBadRequest.execute(message)
return@syncExec return@syncExec
} }