Handle empty URL
Этот коммит содержится в:
@@ -8,8 +8,8 @@ android {
|
|||||||
applicationId 'org.traccar.manager'
|
applicationId 'org.traccar.manager'
|
||||||
minSdkVersion 19
|
minSdkVersion 19
|
||||||
targetSdkVersion 30
|
targetSdkVersion 30
|
||||||
versionCode 26
|
versionCode 27
|
||||||
versionName '2.15'
|
versionName '2.16'
|
||||||
}
|
}
|
||||||
|
|
||||||
compileOptions {
|
compileOptions {
|
||||||
|
|||||||
@@ -77,7 +77,13 @@ class MainFragment : WebViewFragment() {
|
|||||||
webSettings.mediaPlaybackRequiresUserGesture = false
|
webSettings.mediaPlaybackRequiresUserGesture = false
|
||||||
val url = PreferenceManager.getDefaultSharedPreferences(activity)
|
val url = PreferenceManager.getDefaultSharedPreferences(activity)
|
||||||
.getString(MainActivity.PREFERENCE_URL, null)
|
.getString(MainActivity.PREFERENCE_URL, null)
|
||||||
url?.let { webView.loadUrl(it) }
|
if (url != null) {
|
||||||
|
webView.loadUrl(url)
|
||||||
|
} else {
|
||||||
|
activity.fragmentManager
|
||||||
|
.beginTransaction().replace(android.R.id.content, StartFragment())
|
||||||
|
.commitAllowingStateLoss()
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private val broadcastReceiver: BroadcastReceiver = object : BroadcastReceiver() {
|
private val broadcastReceiver: BroadcastReceiver = object : BroadcastReceiver() {
|
||||||
|
|||||||
@@ -31,7 +31,6 @@ import android.widget.EditText
|
|||||||
import androidx.preference.PreferenceManager
|
import androidx.preference.PreferenceManager
|
||||||
import org.json.JSONException
|
import org.json.JSONException
|
||||||
import org.json.JSONObject
|
import org.json.JSONObject
|
||||||
import org.traccar.manager.StartFragment
|
|
||||||
import java.io.BufferedReader
|
import java.io.BufferedReader
|
||||||
import java.io.IOException
|
import java.io.IOException
|
||||||
import java.io.InputStreamReader
|
import java.io.InputStreamReader
|
||||||
|
|||||||
Ссылка в новой задаче
Block a user