show delete icon again after push

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

@@ -13,16 +13,14 @@ import android.os.Bundle
 import android.os.ParcelFileDescriptor
 import android.provider.DocumentsContract
 import android.provider.OpenableColumns
-import android.util.DisplayMetrics
 import android.util.Log
 import android.view.Menu
-import android.view.Menu.NONE
 import android.view.MenuItem
+import android.view.Window
 import android.view.WindowInsets
 import android.view.WindowManager
 import android.webkit.ConsoleMessage
 import android.webkit.JavascriptInterface
-import android.webkit.ValueCallback
 import android.webkit.WebChromeClient
 import android.webkit.WebView
 import android.widget.Toast
@@ -145,8 +143,7 @@ class MainActivity : AppCompatActivity() {
 
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_main)
-
+        
-        setSupportActionBar(findViewById(R.id.toolbar)) // deprecated source
         supportActionBar!!.setDisplayShowTitleEnabled(false)
 
         deleteCache()
@@ -323,15 +320,6 @@ class MainActivity : AppCompatActivity() {
             readFile(thisFileUri!!)
             Log.d(javaClass.simpleName,"Loading on resume from thisFileUri: ${thisFileUri}")
         }
-
-        if (metaData.metaData.get("url") !== null) {
-            val url = parse(metaData.metaData.get("url"))
-            deleteVisible = true
-            invalidateOptionsMenu()
-            val apiHost = url.scheme + "://" + url.host
-            Log.i(javaClass.simpleName, "Starting api controller for: $apiHost")
-            api = ghostAPI(applicationContext, apiHost)
-        }
     }
     override fun onNewIntent(intent:Intent) {
         super.onNewIntent(intent)
@@ -390,14 +378,16 @@ class MainActivity : AppCompatActivity() {
             }
         }
     }
-    override fun onCreateOptionsMenu(menu: Menu?): Boolean {
+
+    override fun onCreateOptionsMenu(menu: Menu): Boolean {
+        super.onCreateOptionsMenu(menu)
+        Log.d(javaClass.simpleName,"create options menu")
         menuInflater.inflate(R.menu.ghost_menu, menu)
         return true
     }
 
     override fun onPrepareOptionsMenu(menu: Menu): Boolean {
-        if (deleteVisible) {if (menu.findItem(DELETE_GHOST) == null) menu.add(NONE,DELETE_GHOST, NONE,"Delete" )}
+        menu.findItem(R.id.delete_ghost).setVisible(deleteVisible)
-        else menu.removeItem(DELETE_GHOST)
         return true
     }
 
@@ -457,7 +447,7 @@ class MainActivity : AppCompatActivity() {
             R.id.metadata -> {
                 ghostMetaData.launch(Intent(this, MetadataActivity::class.java))
             }
-            DELETE_GHOST -> {
+            R.id.delete_ghost -> {
                 checkGhostConnection()
                 var response: retrofit2.Response<ResponseBody> = retrofit2.Response.error(
                     444,
@@ -1082,6 +1072,14 @@ class MainActivity : AppCompatActivity() {
                                 }
                             }
                             mdeValue = metaData.extractMetadataFromMarkdown(i)
+                            if (metaData.metaData.get("url") !== null) {
+                                val url = parse(metaData.metaData.get("url"))
+                                deleteVisible = true
+                                invalidateOptionsMenu()
+                                val apiHost = url.scheme + "://" + url.host
+                                Log.i(javaClass.simpleName, "Starting api controller for: $apiHost")
+                                api = ghostAPI(applicationContext, apiHost)
+                            }
                         }
                     }
                 }
@@ -1094,6 +1092,7 @@ class MainActivity : AppCompatActivity() {
                             Toast.LENGTH_LONG
                         ).show()
                     })
+                    thisFileUri = null
                     return@withContext
                 }
                 catch (e: java.lang.NullPointerException) {
@@ -1105,6 +1104,7 @@ class MainActivity : AppCompatActivity() {
                             Toast.LENGTH_LONG
                         ).show()
                     })
+                    thisFileUri = null
                     return@withContext
                 }
                 catch (e: Exception) {
@@ -1116,6 +1116,7 @@ class MainActivity : AppCompatActivity() {
                             Toast.LENGTH_LONG
                         ).show()
                     })
+                    thisFileUri = null
                     return@withContext
                 }
                 while (!easyMDELoaded) {

app/src/main/res/layout/activity_main.xml

@@ -14,15 +14,8 @@
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/toolbar"
+        app:layout_constraintTop_toTopOf="parent"
         app:layout_constrainedHeight="true"
         tools:context=".MainActivity"/>
-    <androidx.appcompat.widget.Toolbar
+
-        android:id="@+id/toolbar"
-        android:layout_width="match_parent"
-        android:layout_height="?attr/actionBarSize"
-        android:elevation="4dp"
-        android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
-        app:popupTheme="@style/ThemeOverlay.AppCompat.Light"
-        app:layout_constraintTop_toTopOf="parent"/>
 </androidx.constraintlayout.widget.ConstraintLayout>

app/src/main/res/menu/ghost_menu.xml

@@ -16,10 +16,14 @@
         android:title="Push to ghost"
         android:icon="@android:drawable/ic_menu_upload"
         app:showAsAction="always" />
+    <item android:id="@+id/delete_ghost"
+        android:title="delete on  ghost"
+        android:icon="@android:drawable/ic_menu_delete"
+        app:showAsAction="ifRoom" />
     <item android:id="@+id/settings"
         android:title="Settings"
         android:icon="@android:drawable/ic_menu_preferences"
-        app:showAsAction="always" />
+        app:showAsAction="ifRoom" />
     <item android:id="@+id/image"
         android:title="Image"
         android:icon="@android:drawable/ic_menu_gallery"

app/src/main/res/values/themes.xml

@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <style name="Theme.MDEditor" parent="Theme.MaterialComponents.DayNight.NoActionBar" />
+    <style name="Theme.MDEditor" parent="Theme.MaterialComponents.DayNight" />
 </resources>