For #2693: Launching Fenix via adb with URL crashes (#3099)

nightly-build-test
Colin Lee 5 years ago committed by GitHub
parent 439d579c66
commit 04a759f0b0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -92,6 +92,8 @@ import org.mozilla.fenix.quickactionsheet.QuickActionState
import org.mozilla.fenix.quickactionsheet.QuickActionViewModel
import org.mozilla.fenix.utils.ItsNotBrokenSnack
import org.mozilla.fenix.utils.Settings
import java.net.MalformedURLException
import java.net.URL
import kotlin.coroutines.CoroutineContext
@SuppressWarnings("TooManyFunctions", "LargeClass")
@ -839,8 +841,13 @@ class BrowserFragment : Fragment(), BackHandler, CoroutineScope {
private fun findBookmarkedURL(session: Session?): Boolean {
session?.let {
return runBlocking {
val list = requireComponents.core.bookmarksStorage.getBookmarksWithUrl(it.url)
list.isNotEmpty() && list[0].url == it.url
try {
val url = URL(it.url).toString()
val list = requireComponents.core.bookmarksStorage.getBookmarksWithUrl(url)
list.isNotEmpty() && list[0].url == url
} catch (e: MalformedURLException) {
false
}
}
}
return false

Loading…
Cancel
Save