From 37d82663b22c65341ff8157828b1feadb9408735 Mon Sep 17 00:00:00 2001
From: yova <yova@freedomhost.de>
Date: Fri, 2 Feb 2024 08:46:50 +0100
Subject: [PATCH] save us from the null

---
 .../java/org/wntr/mdeditor/MainActivity.kt     | 18 ++++--------------
 app/src/main/res/raw/controller.js             |  7 -------
 2 files changed, 4 insertions(+), 21 deletions(-)

diff --git a/app/src/main/java/org/wntr/mdeditor/MainActivity.kt b/app/src/main/java/org/wntr/mdeditor/MainActivity.kt
index d628623..af6c0d8 100644
--- a/app/src/main/java/org/wntr/mdeditor/MainActivity.kt
+++ b/app/src/main/java/org/wntr/mdeditor/MainActivity.kt
@@ -164,12 +164,6 @@ class MainActivity : AppCompatActivity() {
         webView.loadUrl("file:///android_res/raw/index.html")
 
         val jsi = object {
-
-            @JavascriptInterface
-            fun triggerSaveFile() {
-                saveFile()
-            }
-
             /*@JavascriptInterface
             fun getHeight(): Int {
                 val displayMetrics = DisplayMetrics()
@@ -394,7 +388,6 @@ class MainActivity : AppCompatActivity() {
             }
 
             R.id.save_file -> {
-                saveFile()
                 selectFileForSaveAs()
             }
 
@@ -834,16 +827,13 @@ class MainActivity : AppCompatActivity() {
         try {
             this.runOnUiThread({
                 webView.evaluateJavascript("getValue();") {
-                    if (it == "") {
-                        Log.d(javaClass.simpleName,"Editor delivered empty content. Don't save.")
-                        return@evaluateJavascript
-                    } else if (it == "null") {
+                    if (it.equals("") || it.equals("\"\"") || it.equals("\"null\"") || it.equals("null")) {
+                        Log.d(javaClass.simpleName,"Editor delivered empty content. No save.")
                         Toast.makeText(
                             this,
-                            "Problem with file buffer. Please reopen manually.",
+                            "Editor delivered empty content. Didn't save. Please reopen manually.",
                             Toast.LENGTH_LONG
                         ).show()
-                        openFile()
                         return@evaluateJavascript
                     }
                     mdeValue =
@@ -1074,12 +1064,12 @@ class MainActivity : AppCompatActivity() {
         } catch (e:Exception) {
             Log.d (javaClass.simpleName, "Couldn't cancel autosaveTimer.\n$e")
         }
+        saveFile()
         try {
             webView.evaluateJavascript("easyMDE.codemirror.doc.getCursor();") {
                 metaData.cursor = it
                 Log.i(javaClass.simpleName, "Cursor: $it")
                 saveMetaToSharedPrefs(applicationContext)
-                saveFile()
             }
         } catch (e: UninitializedPropertyAccessException) {
             Log.d(javaClass.simpleName, "Webview not yet loaded.\n$e")
diff --git a/app/src/main/res/raw/controller.js b/app/src/main/res/raw/controller.js
index 4f6930c..f880f40 100644
--- a/app/src/main/res/raw/controller.js
+++ b/app/src/main/res/raw/controller.js
@@ -1,7 +1,3 @@
-function saveFile() {
-    if (!easyMDE.codemirror.doc.isClean()) Android.triggerSaveFile()
-}
-
 function dispatchCut() {
     console.log("dispatch cut")
     easyMDE.codemirror.getTextArea().dispatchEvent(new Event("cut"))
@@ -10,7 +6,6 @@ function getValue() {
     return  encodeURIComponent(easyMDE.value())
 }
 function myPreview() {
-    saveFile()
     easyMDE.togglePreview()
 }
 
@@ -19,7 +14,6 @@ function displayName() {
 	else return "NONdroid"
 }
 function shareText() {
-    saveFile()
     Android.triggerShare(easyMDE.markdown(easyMDE.codemirror.doc.getValue()))
 }
 
@@ -42,7 +36,6 @@ function pasteText() {
     event.clipboardData = data
     easyMDE.codemirror.focus()
     document.getElementsByClassName("CodeMirror-scroll")[0].dispatchEvent(event);
-    saveFile()
 }
 
 windowHeight = window.innerHeight