save us from the null

hauntED
yova 4 months ago
parent 7b54072fb5
commit 37d82663b2

@ -164,12 +164,6 @@ class MainActivity : AppCompatActivity() {
webView.loadUrl("file:///android_res/raw/index.html") webView.loadUrl("file:///android_res/raw/index.html")
val jsi = object { val jsi = object {
@JavascriptInterface
fun triggerSaveFile() {
saveFile()
}
/*@JavascriptInterface /*@JavascriptInterface
fun getHeight(): Int { fun getHeight(): Int {
val displayMetrics = DisplayMetrics() val displayMetrics = DisplayMetrics()
@ -394,7 +388,6 @@ class MainActivity : AppCompatActivity() {
} }
R.id.save_file -> { R.id.save_file -> {
saveFile()
selectFileForSaveAs() selectFileForSaveAs()
} }
@ -834,16 +827,13 @@ class MainActivity : AppCompatActivity() {
try { try {
this.runOnUiThread({ this.runOnUiThread({
webView.evaluateJavascript("getValue();") { webView.evaluateJavascript("getValue();") {
if (it == "") { if (it.equals("") || it.equals("\"\"") || it.equals("\"null\"") || it.equals("null")) {
Log.d(javaClass.simpleName,"Editor delivered empty content. Don't save.") Log.d(javaClass.simpleName,"Editor delivered empty content. No save.")
return@evaluateJavascript
} else if (it == "null") {
Toast.makeText( Toast.makeText(
this, this,
"Problem with file buffer. Please reopen manually.", "Editor delivered empty content. Didn't save. Please reopen manually.",
Toast.LENGTH_LONG Toast.LENGTH_LONG
).show() ).show()
openFile()
return@evaluateJavascript return@evaluateJavascript
} }
mdeValue = mdeValue =
@ -1074,12 +1064,12 @@ class MainActivity : AppCompatActivity() {
} catch (e:Exception) { } catch (e:Exception) {
Log.d (javaClass.simpleName, "Couldn't cancel autosaveTimer.\n$e") Log.d (javaClass.simpleName, "Couldn't cancel autosaveTimer.\n$e")
} }
saveFile()
try { try {
webView.evaluateJavascript("easyMDE.codemirror.doc.getCursor();") { webView.evaluateJavascript("easyMDE.codemirror.doc.getCursor();") {
metaData.cursor = it metaData.cursor = it
Log.i(javaClass.simpleName, "Cursor: $it") Log.i(javaClass.simpleName, "Cursor: $it")
saveMetaToSharedPrefs(applicationContext) saveMetaToSharedPrefs(applicationContext)
saveFile()
} }
} catch (e: UninitializedPropertyAccessException) { } catch (e: UninitializedPropertyAccessException) {
Log.d(javaClass.simpleName, "Webview not yet loaded.\n$e") Log.d(javaClass.simpleName, "Webview not yet loaded.\n$e")

@ -1,7 +1,3 @@
function saveFile() {
if (!easyMDE.codemirror.doc.isClean()) Android.triggerSaveFile()
}
function dispatchCut() { function dispatchCut() {
console.log("dispatch cut") console.log("dispatch cut")
easyMDE.codemirror.getTextArea().dispatchEvent(new Event("cut")) easyMDE.codemirror.getTextArea().dispatchEvent(new Event("cut"))
@ -10,7 +6,6 @@ function getValue() {
return encodeURIComponent(easyMDE.value()) return encodeURIComponent(easyMDE.value())
} }
function myPreview() { function myPreview() {
saveFile()
easyMDE.togglePreview() easyMDE.togglePreview()
} }
@ -19,7 +14,6 @@ function displayName() {
else return "NONdroid" else return "NONdroid"
} }
function shareText() { function shareText() {
saveFile()
Android.triggerShare(easyMDE.markdown(easyMDE.codemirror.doc.getValue())) Android.triggerShare(easyMDE.markdown(easyMDE.codemirror.doc.getValue()))
} }
@ -42,7 +36,6 @@ function pasteText() {
event.clipboardData = data event.clipboardData = data
easyMDE.codemirror.focus() easyMDE.codemirror.focus()
document.getElementsByClassName("CodeMirror-scroll")[0].dispatchEvent(event); document.getElementsByClassName("CodeMirror-scroll")[0].dispatchEvent(event);
saveFile()
} }
windowHeight = window.innerHeight windowHeight = window.innerHeight

Loading…
Cancel
Save