github/szkolny
1
0
Fork 1
mirror of https://github.com/szkolny-eu/szkolny-android.git synced 2025-01-31 13:48:20 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

[API/Vulcan] Fix API url slash issue when migrating from 3.x.

Browse Source
This commit is contained in:
Kuba Szczodrzyński 2020-03-18 12:44:28 +01:00
parent c384736840
commit 39514b69b3
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/DataVulcan.kt
View File

@ -210,11 +210,11 @@ class DataVulcan(app: App, profile: Profile?, loginStore: LoginStore) : Data(app
"SZ9" -> "http://hack.szkolny.eu" "SZ9" -> "http://hack.szkolny.eu"
else -> null else -> null
} }
return if (url != null) "$url/$symbol" else loginStore.getLoginData("apiUrl", null) return if (url != null) "$url/$symbol/" else loginStore.getLoginData("apiUrl", null)
} }
val fullApiUrl: String? val fullApiUrl: String?
get() { get() {
return "$apiUrl/$schoolSymbol" return "$apiUrl$schoolSymbol/"
} }
} }

2
app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/data/VulcanApi.kt
View File

@ -36,7 +36,7 @@ open class VulcanApi(open val data: DataVulcan, open val lastSync: Long?) {
baseUrl: Boolean = false, baseUrl: Boolean = false,
onSuccess: (json: JsonObject, response: Response?) -> Unit onSuccess: (json: JsonObject, response: Response?) -> Unit
) { ) {
val url = "${if (baseUrl) data.apiUrl else data.fullApiUrl}/$endpoint" val url = "${if (baseUrl) data.apiUrl else data.fullApiUrl}$endpoint"
d(tag, "Request: Vulcan/Api - $url") d(tag, "Request: Vulcan/Api - $url")

2
app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/login/VulcanLoginApi.kt
View File

@ -137,7 +137,7 @@ class VulcanLoginApi(val data: DataVulcan, val onSuccess: () -> Unit) {
} }
Request.builder() Request.builder()
.url("${data.apiUrl}/$VULCAN_API_ENDPOINT_CERTIFICATE") .url("${data.apiUrl}$VULCAN_API_ENDPOINT_CERTIFICATE")
.userAgent(VULCAN_API_USER_AGENT) .userAgent(VULCAN_API_USER_AGENT)
.addHeader("RequestMobileType", "RegisterDevice") .addHeader("RequestMobileType", "RegisterDevice")
.addParameter("PIN", data.apiPin) .addParameter("PIN", data.apiPin)