diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/DataVulcan.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/DataVulcan.kt index a59f4d95..d326ebd4 100644 --- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/DataVulcan.kt +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/DataVulcan.kt @@ -210,11 +210,11 @@ class DataVulcan(app: App, profile: Profile?, loginStore: LoginStore) : Data(app "SZ9" -> "http://hack.szkolny.eu" 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? get() { - return "$apiUrl/$schoolSymbol" + return "$apiUrl$schoolSymbol/" } } diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/data/VulcanApi.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/data/VulcanApi.kt index bf19db15..172be3c0 100644 --- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/data/VulcanApi.kt +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/data/VulcanApi.kt @@ -36,7 +36,7 @@ open class VulcanApi(open val data: DataVulcan, open val lastSync: Long?) { baseUrl: Boolean = false, 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") diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/login/VulcanLoginApi.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/login/VulcanLoginApi.kt index 231afaed..4385b18a 100644 --- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/login/VulcanLoginApi.kt +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/login/VulcanLoginApi.kt @@ -137,7 +137,7 @@ class VulcanLoginApi(val data: DataVulcan, val onSuccess: () -> Unit) { } Request.builder() - .url("${data.apiUrl}/$VULCAN_API_ENDPOINT_CERTIFICATE") + .url("${data.apiUrl}$VULCAN_API_ENDPOINT_CERTIFICATE") .userAgent(VULCAN_API_USER_AGENT) .addHeader("RequestMobileType", "RegisterDevice") .addParameter("PIN", data.apiPin)