sebse/android-fuplanner2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix some warnings

Browse Source
This commit is contained in:
Sebastian Seedorf
2021-11-08 20:29:06 +01:00
parent 43220bd076
commit ad2506333b
7 changed files with 18 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/de/sebse/fuplanner2/auth/FUAuthModule.kt
View File

@@ -5,8 +5,8 @@ import com.android.volley.Header
import de.sebse.fuplanner2.database.User import de.sebse.fuplanner2.database.User
import de.sebse.fuplanner2.network.NetData import de.sebse.fuplanner2.network.NetData
import de.sebse.fuplanner2.network.Requester import de.sebse.fuplanner2.network.Requester
import de.sebse.fuplanner2.network.tools.invalidPassword import de.sebse.fuplanner2.network.Tools.invalidPassword
import de.sebse.fuplanner2.network.tools.invalidResponse import de.sebse.fuplanner2.network.Tools.invalidResponse
import de.sebse.fuplanner2.utils.xml import de.sebse.fuplanner2.utils.xml
import java.net.URI import java.net.URI
import java.util.concurrent.TimeUnit import java.util.concurrent.TimeUnit

2
app/src/main/java/de/sebse/fuplanner2/blackboard/Blackboard.kt
View File

@@ -10,7 +10,7 @@ import de.sebse.fuplanner2.auth.SamlReponse
import de.sebse.fuplanner2.database.User import de.sebse.fuplanner2.database.User
import de.sebse.fuplanner2.network.NetData import de.sebse.fuplanner2.network.NetData
import de.sebse.fuplanner2.network.Requester 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.net.URI
import java.util.concurrent.TimeUnit import java.util.concurrent.TimeUnit
import kotlin.random.Random import kotlin.random.Random

7
app/src/main/java/de/sebse/fuplanner2/network/CustomRequest.kt
View File

@@ -1,6 +1,5 @@
package de.sebse.fuplanner2.network package de.sebse.fuplanner2.network
import android.os.Build
import androidx.annotation.GuardedBy import androidx.annotation.GuardedBy
import com.android.volley.* import com.android.volley.*
import com.android.volley.toolbox.HttpHeaderParser import com.android.volley.toolbox.HttpHeaderParser
@@ -107,11 +106,7 @@ class CustomRequest: Request<NetData> {
} }
} }
val requestBody = sb.toString() val requestBody = sb.toString()
return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) { return requestBody.toByteArray(StandardCharsets.UTF_8)
requestBody.toByteArray(StandardCharsets.UTF_8)
} else {
requestBody.toByteArray()
}
} }
return null return null
} }

2
app/src/main/java/de/sebse/fuplanner2/network/NetData.kt
View File

@@ -2,5 +2,5 @@ package de.sebse.fuplanner2.network
import com.android.volley.NetworkResponse import com.android.volley.NetworkResponse
data class NetData(val body: String, val networkResponse: NetworkResponse) { data class NetData(val body: String, val networkResponse: NetworkResponse) {
val headers = networkResponse.headers val headers: Map<String, String>? = networkResponse.headers
} }

15
app/src/main/java/de/sebse/fuplanner2/network/Requester.kt
View File

@@ -5,6 +5,7 @@ import android.os.Build
import com.android.volley.Request import com.android.volley.Request
import com.android.volley.RequestQueue import com.android.volley.RequestQueue
import com.android.volley.Response import com.android.volley.Response
import com.android.volley.toolbox.HttpResponse
import com.android.volley.toolbox.HttpStack import com.android.volley.toolbox.HttpStack
import com.android.volley.toolbox.HurlStack import com.android.volley.toolbox.HurlStack
import com.android.volley.toolbox.Volley import com.android.volley.toolbox.Volley
@@ -22,7 +23,7 @@ import kotlin.coroutines.resume
class Requester(ctx: Context) { class Requester(ctx: Context) {
private var requestQueue: RequestQueue = Volley.newRequestQueue(ctx, object : HurlStack() { private var requestQueue: RequestQueue = Volley.newRequestQueue(ctx, object : HurlStack() {
@Throws(IOException::class) @Throws(IOException::class)
override fun createConnection(url: URL?): HttpURLConnection? { override fun createConnection(url: URL?): HttpURLConnection {
val connection: HttpURLConnection = super.createConnection(url) val connection: HttpURLConnection = super.createConnection(url)
connection.instanceFollowRedirects = false connection.instanceFollowRedirects = false
return connection return connection
@@ -31,21 +32,27 @@ class Requester(ctx: Context) {
suspend fun get(url: String, cookies: Map<String, String>?): NetData { suspend fun get(url: String, cookies: Map<String, String>?): NetData {
return suspendCancellableCoroutine { cont -> 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) requestQueue.add(request)
} }
} }
suspend fun head(url: String, cookies: Map<String, String>?): NetData { suspend fun head(url: String, cookies: Map<String, String>?): NetData {
return suspendCancellableCoroutine { cont -> 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) requestQueue.add(request)
} }
} }
suspend fun post(url: String, cookies: Map<String, String>?, data: Map<String, String>?): NetData { suspend fun post(url: String, cookies: Map<String, String>?, data: Map<String, String>?): NetData {
return suspendCancellableCoroutine { cont -> 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) requestQueue.add(request)
} }
} }

2
app/src/main/java/de/sebse/fuplanner2/network/tools.kt → app/src/main/java/de/sebse/fuplanner2/network/Tools.kt
View File

@@ -4,7 +4,7 @@ import com.android.volley.NetworkResponse
import com.android.volley.VolleyError import com.android.volley.VolleyError
import de.sebse.fuplanner2.utils.console import de.sebse.fuplanner2.utils.console
object tools { object Tools {
fun invalidResponse(uid: Int, status: String): VolleyError { fun invalidResponse(uid: Int, status: String): VolleyError {
console.warn("InvalidResponse", "$uid - $status") console.warn("InvalidResponse", "$uid - $status")
return VolleyError(NetworkResponse(422, null, true, 0, null)) return VolleyError(NetworkResponse(422, null, true, 0, null))

3
app/src/main/java/de/sebse/fuplanner2/whiteboard/Whiteboard.kt
View File

@@ -10,8 +10,7 @@ import de.sebse.fuplanner2.auth.SamlReponse
import de.sebse.fuplanner2.database.User import de.sebse.fuplanner2.database.User
import de.sebse.fuplanner2.network.NetData import de.sebse.fuplanner2.network.NetData
import de.sebse.fuplanner2.network.Requester import de.sebse.fuplanner2.network.Requester
import de.sebse.fuplanner2.network.tools.invalidResponse import de.sebse.fuplanner2.network.Tools.invalidResponse
import de.sebse.fuplanner2.utils.console
object Whiteboard: FUAuthModule() { object Whiteboard: FUAuthModule() {
private const val LOGIN_URL = "https://mycampus.imp.fu-berlin.de/sakai-login-tool/container" private const val LOGIN_URL = "https://mycampus.imp.fu-berlin.de/sakai-login-tool/container"