Mastodon
/
nextpush-android
mirror of https://codeberg.org/NextPush/nextpush-android.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix crash with wrong URL in direct login

This commit is contained in:
sim 2023-03-19 17:33:40 +01:00
parent fd8bc838ff
commit a5b6275e56
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/src/main/java/org/unifiedpush/distributor/nextpush/account/DirectAccountFactory.kt
View File

@ -4,6 +4,7 @@ import android.app.Activity
import android.content.Context import android.content.Context
import android.content.Intent import android.content.Intent
import android.util.Log import android.util.Log
import android.widget.Toast
import okhttp3.* // ktlint-disable no-wildcard-imports import okhttp3.* // ktlint-disable no-wildcard-imports
import org.unifiedpush.distributor.nextpush.activities.StartActivity import org.unifiedpush.distributor.nextpush.activities.StartActivity
import org.unifiedpush.distributor.nextpush.api.provider.ApiProvider.Companion.mApiEndpoint import org.unifiedpush.distributor.nextpush.api.provider.ApiProvider.Companion.mApiEndpoint
@ -38,9 +39,14 @@ class DirectAccountFactory : AccountFactory {
val client = getAccount(activity) as OkHttpClient? ?: return retActivity(activity) val client = getAccount(activity) as OkHttpClient? ?: return retActivity(activity)
val url = activity.url ?: return retActivity(activity) val url = activity.url ?: return retActivity(activity)
val request = Request.Builder() val request = try {
Request.Builder()
.url("$url/$mApiEndpoint/") .url("$url/$mApiEndpoint/")
.build() .build()
} catch (e: IllegalArgumentException) {
Toast.makeText(activity, "Expected URL scheme 'http' or 'https'", Toast.LENGTH_SHORT).show()
return retActivity(activity)
}
val call = client.newCall(request) val call = client.newCall(request)
call.enqueue(object : Callback { call.enqueue(object : Callback {