fix: url can be empty ?
This commit is contained in:
+6
-6
@@ -75,7 +75,7 @@ class ArticleFragment :
|
||||
private var colorSurface: Int = 0
|
||||
private var fontSize: Int = DEFAULT_FONT_SIZE
|
||||
private lateinit var item: SelfossModel.Item
|
||||
private lateinit var url: String
|
||||
private var url: String? = null
|
||||
private lateinit var contentText: String
|
||||
private lateinit var contentSource: String
|
||||
private lateinit var contentImage: String
|
||||
@@ -168,8 +168,8 @@ class ArticleFragment :
|
||||
|
||||
private fun handleContent() {
|
||||
if (contentText.isEmptyOrNullOrNullString()) {
|
||||
if (repository.isNetworkAvailable()) {
|
||||
getContentFromMercury()
|
||||
if (repository.isNetworkAvailable() && url.isUrlValid()) {
|
||||
getContentFromMercury(url!!)
|
||||
}
|
||||
} else {
|
||||
binding.titleView.text = contentTitle
|
||||
@@ -271,7 +271,7 @@ class ArticleFragment :
|
||||
}
|
||||
|
||||
@Suppress("detekt:SwallowedException")
|
||||
private fun getContentFromMercury() {
|
||||
private fun getContentFromMercury(url: String) {
|
||||
binding.progressBar.visibility = View.VISIBLE
|
||||
|
||||
CoroutineScope(Dispatchers.Main).launch {
|
||||
@@ -424,10 +424,10 @@ class ArticleFragment :
|
||||
|
||||
var baseUrl: String? = null
|
||||
try {
|
||||
val itemUrl = URL(url)
|
||||
val itemUrl = URL(url.orEmpty())
|
||||
baseUrl = itemUrl.protocol + "://" + itemUrl.host
|
||||
} catch (e: MalformedURLException) {
|
||||
e.sendSilentlyWithAcraWithName("htmlToWebview > $url")
|
||||
e.sendSilentlyWithAcraWithName("htmlToWebview > ${url.orEmpty()}")
|
||||
}
|
||||
|
||||
val fontName: String =
|
||||
|
500 Internal Server Error
Gitea Version: 1.28.0+dev-211-ga30d865b78 | ||||