mirror of https://github.com/Corewala/Buran
Reverted changes to GemActivity and OmniTerm which broke image rendering
This commit is contained in:
parent
02e27c7868
commit
88583d1f49
|
@ -35,9 +35,6 @@ class OmniTerm(private val listener: Listener) {
|
||||||
listener.request("$searchbase$encoded")
|
listener.request("$searchbase$encoded")
|
||||||
}
|
}
|
||||||
|
|
||||||
fun resolve(link: String): String{
|
|
||||||
return uri.resolve(link)
|
|
||||||
}
|
|
||||||
|
|
||||||
fun navigation(link: String) {
|
fun navigation(link: String) {
|
||||||
navigation(link, true)
|
navigation(link, true)
|
||||||
|
@ -54,7 +51,9 @@ class OmniTerm(private val listener: Listener) {
|
||||||
private fun navigation(link: String, invokeListener: Boolean) {
|
private fun navigation(link: String, invokeListener: Boolean) {
|
||||||
when {
|
when {
|
||||||
link.startsWith(GEM_SCHEME) -> uri.set(link)
|
link.startsWith(GEM_SCHEME) -> uri.set(link)
|
||||||
else -> listener.openExternal(link)
|
link.startsWith("//") -> uri.set("gemini:$link")
|
||||||
|
link.contains(":") -> listener.openExternal(link)
|
||||||
|
else -> uri.resolve(link)
|
||||||
}
|
}
|
||||||
|
|
||||||
val address = uri.toString().replace("//", "/").replace("gemini:/", "gemini://")
|
val address = uri.toString().replace("//", "/").replace("gemini:/", "gemini://")
|
||||||
|
|
|
@ -85,9 +85,12 @@ class GemActivity : AppCompatActivity() {
|
||||||
lateinit var adapter: AbstractGemtextAdapter
|
lateinit var adapter: AbstractGemtextAdapter
|
||||||
|
|
||||||
private val onLink: (link: URI, longTap: Boolean, adapterPosition: Int) -> Unit = { uri, longTap, position: Int ->
|
private val onLink: (link: URI, longTap: Boolean, adapterPosition: Int) -> Unit = { uri, longTap, position: Int ->
|
||||||
val globalURI = omniTerm.resolve(uri.toString())
|
|
||||||
|
|
||||||
if(longTap){
|
if(longTap){
|
||||||
|
val globalURI = if(!uri.toString().contains("//") and !uri.toString().contains(":")){
|
||||||
|
(omniTerm.getCurrent() + uri.toString()).replace("//", "/").replace("gemini:/", "gemini://")
|
||||||
|
} else {
|
||||||
|
uri.toString()
|
||||||
|
}
|
||||||
Intent().apply {
|
Intent().apply {
|
||||||
action = Intent.ACTION_SEND
|
action = Intent.ACTION_SEND
|
||||||
putExtra(Intent.EXTRA_TEXT, globalURI)
|
putExtra(Intent.EXTRA_TEXT, globalURI)
|
||||||
|
@ -101,7 +104,7 @@ class GemActivity : AppCompatActivity() {
|
||||||
binding.addressEdit.hint = getString(R.string.main_input_hint)
|
binding.addressEdit.hint = getString(R.string.main_input_hint)
|
||||||
inSearch = false
|
inSearch = false
|
||||||
}
|
}
|
||||||
omniTerm.navigation(globalURI)
|
omniTerm.navigation(uri.toString())
|
||||||
}else{
|
}else{
|
||||||
Snackbar.make(binding.root, getString(R.string.no_internet), Snackbar.LENGTH_LONG).show()
|
Snackbar.make(binding.root, getString(R.string.no_internet), Snackbar.LENGTH_LONG).show()
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue