From ad2506333b96488972d438e6b8a61212111eba8b Mon Sep 17 00:00:00 2001 From: Sebastian Seedorf Date: Mon, 8 Nov 2021 20:29:06 +0100 Subject: [PATCH] Fix some warnings --- .../java/de/sebse/fuplanner2/auth/FUAuthModule.kt | 4 ++-- .../de/sebse/fuplanner2/blackboard/Blackboard.kt | 2 +- .../de/sebse/fuplanner2/network/CustomRequest.kt | 7 +------ .../java/de/sebse/fuplanner2/network/NetData.kt | 2 +- .../java/de/sebse/fuplanner2/network/Requester.kt | 15 +++++++++++---- .../fuplanner2/network/{tools.kt => Tools.kt} | 2 +- .../de/sebse/fuplanner2/whiteboard/Whiteboard.kt | 3 +-- 7 files changed, 18 insertions(+), 17 deletions(-) rename app/src/main/java/de/sebse/fuplanner2/network/{tools.kt => Tools.kt} (97%) diff --git a/app/src/main/java/de/sebse/fuplanner2/auth/FUAuthModule.kt b/app/src/main/java/de/sebse/fuplanner2/auth/FUAuthModule.kt index c45fa51..41aff1b 100644 --- a/app/src/main/java/de/sebse/fuplanner2/auth/FUAuthModule.kt +++ b/app/src/main/java/de/sebse/fuplanner2/auth/FUAuthModule.kt @@ -5,8 +5,8 @@ import com.android.volley.Header import de.sebse.fuplanner2.database.User import de.sebse.fuplanner2.network.NetData import de.sebse.fuplanner2.network.Requester -import de.sebse.fuplanner2.network.tools.invalidPassword -import de.sebse.fuplanner2.network.tools.invalidResponse +import de.sebse.fuplanner2.network.Tools.invalidPassword +import de.sebse.fuplanner2.network.Tools.invalidResponse import de.sebse.fuplanner2.utils.xml import java.net.URI import java.util.concurrent.TimeUnit diff --git a/app/src/main/java/de/sebse/fuplanner2/blackboard/Blackboard.kt b/app/src/main/java/de/sebse/fuplanner2/blackboard/Blackboard.kt index f8f4c49..62eca89 100644 --- a/app/src/main/java/de/sebse/fuplanner2/blackboard/Blackboard.kt +++ b/app/src/main/java/de/sebse/fuplanner2/blackboard/Blackboard.kt @@ -10,7 +10,7 @@ import de.sebse.fuplanner2.auth.SamlReponse import de.sebse.fuplanner2.database.User import de.sebse.fuplanner2.network.NetData import de.sebse.fuplanner2.network.Requester -import de.sebse.fuplanner2.network.tools.invalidResponse +import de.sebse.fuplanner2.network.Tools.invalidResponse import java.net.URI import java.util.concurrent.TimeUnit import kotlin.random.Random diff --git a/app/src/main/java/de/sebse/fuplanner2/network/CustomRequest.kt b/app/src/main/java/de/sebse/fuplanner2/network/CustomRequest.kt index 73acef1..a3df880 100644 --- a/app/src/main/java/de/sebse/fuplanner2/network/CustomRequest.kt +++ b/app/src/main/java/de/sebse/fuplanner2/network/CustomRequest.kt @@ -1,6 +1,5 @@ package de.sebse.fuplanner2.network -import android.os.Build import androidx.annotation.GuardedBy import com.android.volley.* import com.android.volley.toolbox.HttpHeaderParser @@ -107,11 +106,7 @@ class CustomRequest: Request { } } val requestBody = sb.toString() - return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) { - requestBody.toByteArray(StandardCharsets.UTF_8) - } else { - requestBody.toByteArray() - } + return requestBody.toByteArray(StandardCharsets.UTF_8) } return null } diff --git a/app/src/main/java/de/sebse/fuplanner2/network/NetData.kt b/app/src/main/java/de/sebse/fuplanner2/network/NetData.kt index 9201f5d..938e8a9 100644 --- a/app/src/main/java/de/sebse/fuplanner2/network/NetData.kt +++ b/app/src/main/java/de/sebse/fuplanner2/network/NetData.kt @@ -2,5 +2,5 @@ package de.sebse.fuplanner2.network import com.android.volley.NetworkResponse data class NetData(val body: String, val networkResponse: NetworkResponse) { - val headers = networkResponse.headers + val headers: Map? = networkResponse.headers } diff --git a/app/src/main/java/de/sebse/fuplanner2/network/Requester.kt b/app/src/main/java/de/sebse/fuplanner2/network/Requester.kt index 571d260..6102e42 100644 --- a/app/src/main/java/de/sebse/fuplanner2/network/Requester.kt +++ b/app/src/main/java/de/sebse/fuplanner2/network/Requester.kt @@ -5,6 +5,7 @@ import android.os.Build import com.android.volley.Request import com.android.volley.RequestQueue import com.android.volley.Response +import com.android.volley.toolbox.HttpResponse import com.android.volley.toolbox.HttpStack import com.android.volley.toolbox.HurlStack import com.android.volley.toolbox.Volley @@ -22,7 +23,7 @@ import kotlin.coroutines.resume class Requester(ctx: Context) { private var requestQueue: RequestQueue = Volley.newRequestQueue(ctx, object : HurlStack() { @Throws(IOException::class) - override fun createConnection(url: URL?): HttpURLConnection? { + override fun createConnection(url: URL?): HttpURLConnection { val connection: HttpURLConnection = super.createConnection(url) connection.instanceFollowRedirects = false return connection @@ -31,21 +32,27 @@ class Requester(ctx: Context) { suspend fun get(url: String, cookies: Map?): NetData { return suspendCancellableCoroutine { cont -> - val request = CustomRequest(Request.Method.GET, url, cookies, Response.Listener { response -> cont.resume(response) }, Response.ErrorListener { error -> cont.cancel(error) }) + val request = CustomRequest(Request.Method.GET, url, cookies, + { response -> cont.resume(response) }, + { error -> cont.cancel(error) }) requestQueue.add(request) } } suspend fun head(url: String, cookies: Map?): NetData { return suspendCancellableCoroutine { cont -> - val request = CustomRequest(Request.Method.HEAD, url, cookies, Response.Listener { response -> cont.resume(response) }, Response.ErrorListener { error -> cont.cancel(error) }) + val request = CustomRequest(Request.Method.HEAD, url, cookies, + { response -> cont.resume(response) }, + { error -> cont.cancel(error) }) requestQueue.add(request) } } suspend fun post(url: String, cookies: Map?, data: Map?): NetData { return suspendCancellableCoroutine { cont -> - val request = CustomRequest(Request.Method.POST, url, cookies, data, Response.Listener { response -> cont.resume(response) }, Response.ErrorListener { error -> cont.cancel(error) }) + val request = CustomRequest(Request.Method.POST, url, cookies, data, + { response -> cont.resume(response) }, + { error -> cont.cancel(error) }) requestQueue.add(request) } } diff --git a/app/src/main/java/de/sebse/fuplanner2/network/tools.kt b/app/src/main/java/de/sebse/fuplanner2/network/Tools.kt similarity index 97% rename from app/src/main/java/de/sebse/fuplanner2/network/tools.kt rename to app/src/main/java/de/sebse/fuplanner2/network/Tools.kt index ec2a667..a3e0cb2 100644 --- a/app/src/main/java/de/sebse/fuplanner2/network/tools.kt +++ b/app/src/main/java/de/sebse/fuplanner2/network/Tools.kt @@ -4,7 +4,7 @@ import com.android.volley.NetworkResponse import com.android.volley.VolleyError import de.sebse.fuplanner2.utils.console -object tools { +object Tools { fun invalidResponse(uid: Int, status: String): VolleyError { console.warn("InvalidResponse", "$uid - $status") return VolleyError(NetworkResponse(422, null, true, 0, null)) diff --git a/app/src/main/java/de/sebse/fuplanner2/whiteboard/Whiteboard.kt b/app/src/main/java/de/sebse/fuplanner2/whiteboard/Whiteboard.kt index 5673c5c..551b468 100644 --- a/app/src/main/java/de/sebse/fuplanner2/whiteboard/Whiteboard.kt +++ b/app/src/main/java/de/sebse/fuplanner2/whiteboard/Whiteboard.kt @@ -10,8 +10,7 @@ import de.sebse.fuplanner2.auth.SamlReponse import de.sebse.fuplanner2.database.User import de.sebse.fuplanner2.network.NetData import de.sebse.fuplanner2.network.Requester -import de.sebse.fuplanner2.network.tools.invalidResponse -import de.sebse.fuplanner2.utils.console +import de.sebse.fuplanner2.network.Tools.invalidResponse object Whiteboard: FUAuthModule() { private const val LOGIN_URL = "https://mycampus.imp.fu-berlin.de/sakai-login-tool/container"