mirror
/
Buran
mirror of https://github.com/Corewala/Buran
1
0
Fork 0
Code Issues Releases Wiki Activity

Fixed bug where current uri would be changed by resolving long-taps and image dialogs

This commit is contained in:
Corewala 2023-02-20 16:46:04 -05:00
parent bedbc9fb98
commit 867688a075
3 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/corewala/buran/OmniTerm.kt
View File

@ -73,7 +73,7 @@ class OmniTerm(private val listener: Listener) {
return when { return when {
reference.contains(":") -> reference reference.contains(":") -> reference
reference.startsWith("//") -> "gemini:$reference" reference.startsWith("//") -> "gemini:$reference"
else -> uri.resolve(reference) else -> uri.resolve(reference, false)
} }
} }

22
app/src/main/java/corewala/buran/OppenURI.kt
View File

@ -35,25 +35,26 @@ class OppenURI constructor(private var ouri: String) {
} }
} }
fun resolve(reference: String): String{ fun resolve(reference: String, persistent: Boolean): String{
if(ouri == "$GEMSCHEME$host") ouri = "$ouri/" if(ouri == "$GEMSCHEME$host") ouri = "$ouri/"
var resolvedUri = ""
when { when {
reference.startsWith(GEMSCHEME) -> set(reference) reference.startsWith(GEMSCHEME) -> set(reference)
reference.startsWith(SOLIDUS) -> ouri = "$scheme://$host$reference" reference.startsWith(SOLIDUS) -> resolvedUri = "$scheme://$host$reference"
reference.startsWith(TRAVERSE) -> { reference.startsWith(TRAVERSE) -> {
if(!ouri.endsWith(DIREND)) ouri = ouri.removeFile() if(!ouri.endsWith(DIREND)) resolvedUri = ouri.removeFile()
val traversalCount = reference.split(TRAVERSE).size - 1 val traversalCount = reference.split(TRAVERSE).size - 1
ouri = traverse(traversalCount) + reference.replace(TRAVERSE, "") resolvedUri = traverse(traversalCount) + reference.replace(TRAVERSE, "")
} }
reference.startsWith(QUERY) -> { reference.startsWith(QUERY) -> {
ouri = if(reference.contains(QUERY)){ resolvedUri = if(reference.contains(QUERY)){
ouri.substringBefore(QUERY) + reference ouri.substringBefore(QUERY) + reference
}else{ }else{
ouri + reference ouri + reference
} }
} }
else -> { else -> {
ouri = when { resolvedUri = when {
ouri.endsWith(DIREND) -> { ouri.endsWith(DIREND) -> {
"${ouri}$reference" "${ouri}$reference"
} }
@ -61,7 +62,14 @@ class OppenURI constructor(private var ouri: String) {
} }
} }
} }
return ouri if(persistent){
ouri = resolvedUri
}
return resolvedUri
}
fun resolve(reference: String): String{
return resolve(reference, true)
} }
private fun traverse(count: Int): String{ private fun traverse(count: Int): String{

1
app/src/main/java/corewala/buran/ui/GemActivity.kt
View File

@ -747,6 +747,7 @@ class GemActivity : AppCompatActivity() {
intent.putExtra(Intent.EXTRA_TITLE, File(state.uri.path).name) intent.putExtra(Intent.EXTRA_TITLE, File(state.uri.path).name)
startActivityForResult(intent, CREATE_IMAGE_FILE_REQ) startActivityForResult(intent, CREATE_IMAGE_FILE_REQ)
} }
omniTerm.set(omniTerm.goBack())
} }
private fun renderBinary(state: GemState.ResponseBinary) = runOnUiThread{ private fun renderBinary(state: GemState.ResponseBinary) = runOnUiThread{