refactor thisFileUri & metadata

app/src/main/java/org/wntr/mdeditor/MainActivity.kt

@@ -3,7 +3,6 @@ package org.wntr.mdeditor
 import android.app.Activity
 import android.app.AlertDialog
 import android.content.ActivityNotFoundException
-import android.content.Context
 import android.content.Intent
 import android.net.Uri
 import android.net.Uri.parse
@@ -37,7 +36,6 @@ import okhttp3.RequestBody.Companion.asRequestBody
 import okhttp3.ResponseBody
 import okhttp3.ResponseBody.Companion.toResponseBody
 import org.json.JSONObject
-import org.wntr.mdeditor.databinding.ActivityMainBinding
 import retrofit2.Response
 import java.io.BufferedReader
 import java.io.File
@@ -52,7 +50,6 @@ import kotlin.concurrent.fixedRateTimer
 
 
 class MainActivity : AppCompatActivity() {
-    private lateinit var binding: ActivityMainBinding
     private val easyMDEscript = """
         const easyMDE = new EasyMDE({
             spellChecker: false,
@@ -112,17 +109,13 @@ class MainActivity : AppCompatActivity() {
             ]
         });
 """
-
+    
-
     companion object {
         const val CREATE_FILE = 1
         const val OPEN_FILE = 2
-        const val DELETE_GHOST = 4
         var deleteVisible = false
         var mdeValue: String = ""
-        var metaData = mdMeta()
         var mdToAppend: String = ""
-        var thisFileUri: Uri? = null
         var truncate = false
         lateinit var pickMultipleVisualMedia: ActivityResultLauncher<PickVisualMediaRequest>
         lateinit var ghostSettings: ActivityResultLauncher<Intent>
@@ -138,7 +131,6 @@ class MainActivity : AppCompatActivity() {
     }
 
     override fun onCreate(savedInstanceState: Bundle?) {
-
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_main)
 
@@ -149,7 +141,7 @@ class MainActivity : AppCompatActivity() {
         Log.i(javaClass.simpleName, "intent data on start: ${intent.data.toString()}\nIntent action: ${intent.action}")
 
         credManager = CredentialManager(applicationContext)
-        webView = findViewById<WebView>(R.id.mde_webview)
+        val webView = findViewById<WebView>(R.id.mde_webview)
         webView.settings.javaScriptEnabled = true
         webView.setLongClickable(true);
 

app/src/main/java/org/wntr/mdeditor/helpers.kt

@@ -11,6 +11,9 @@ import java.io.FileOutputStream
 import java.io.IOException
 import java.io.InputStream
 
+var thisFileUri: Uri? = null
+var metaData = mdMeta()
+
 fun checkURIResource(context: Context, uri: Uri?): Boolean {
     val cursor = context.contentResolver.query(uri!!, null, null, null, null)
     val doesExist = cursor != null && cursor.moveToFirst()
@@ -41,9 +44,8 @@ fun createHtmlFile(context: Context, htmlString: String): File? {
     try {
         val storageDir = File(context.cacheDir, "html")
         storageDir.mkdir()
-        htmlFile = File(storageDir.path + "/${getDisplayName(context,
+        htmlFile = File(storageDir.path + "/${getDisplayName(context,thisFileUri)
-            MainActivity.thisFileUri
+            .split(".")[0]}.html")
-        ).split(".")[0]}.html")
         if (htmlFile.exists()) htmlFile.delete()
         htmlFile.createNewFile()
     } catch (e: Exception) {
@@ -159,12 +161,12 @@ fun queryName(context: Context, uri: Uri): String? {
 }
 
 fun saveMetaToSharedPrefs(context: Context) {
-    if (MainActivity.thisFileUri == null) return
+    if (thisFileUri == null) return
-    Log.d("saveMetaToSharedPrefs", "saving to shared prefs cursor: ${MainActivity.metaData.cursor} in file: ${MainActivity.thisFileUri}")
+    Log.d("saveMetaToSharedPrefs", "saving to shared prefs cursor: ${metaData.cursor} in file: ${thisFileUri}")
     context.getSharedPreferences("prefs", Context.MODE_PRIVATE)
         .edit().apply {
-            putString("lastFile", MainActivity.thisFileUri.toString())
+            putString("lastFile", thisFileUri.toString())
-            putString("cursor", MainActivity.metaData.cursor)
+            putString("cursor", metaData.cursor)
             apply()
         }
 }
@@ -177,9 +179,9 @@ fun loadMetaFromSharedPrefs(context: Context): Boolean{
         Log.i("loadMetaFromSharedPrefs","No lastfile saved")
         return false
     } else {
-        MainActivity.thisFileUri = Uri.parse(uriString)
+        thisFileUri = Uri.parse(uriString)
-        MainActivity.metaData.cursor = prefs.getString("cursor", "nocursor") ?: "{ line: 0, ch: 0, sticky: null }"
+        metaData.cursor = prefs.getString("cursor", "nocursor") ?: "{ line: 0, ch: 0, sticky: null }"
-        Log.i("loadMetaFromSharedPrefs","Loaded cursor: ${MainActivity.metaData.cursor}")
+        Log.i("loadMetaFromSharedPrefs","Loaded cursor: ${metaData.cursor}")
         return true
     }
 }