diff --git a/app/src/main/java/org/wntr/mdeditor/MainActivity.kt b/app/src/main/java/org/wntr/mdeditor/MainActivity.kt index db1f4ff..c759be5 100644 --- a/app/src/main/java/org/wntr/mdeditor/MainActivity.kt +++ b/app/src/main/java/org/wntr/mdeditor/MainActivity.kt @@ -213,7 +213,6 @@ class MainActivity : AppCompatActivity() { if (intent.extras!!.get(Intent.EXTRA_STREAM) != null){ uri = intent.extras!!.get(Intent.EXTRA_STREAM) as Uri mimeType = "image" - Log.i(javaClass.simpleName,"Uri: $uri") } else { uri = parse(intent.extras!!.getCharSequence(Intent.EXTRA_TEXT).toString()) } @@ -231,7 +230,8 @@ class MainActivity : AppCompatActivity() { } } } - if (uri != null ) { + Log.i(javaClass.simpleName,"Uri: $uri") + if (uri != null && uri.toString()!="null") { intentScheme = uri.scheme!! if (intentScheme == "content") { Log.i(javaClass.simpleName, "content intent") @@ -244,7 +244,6 @@ class MainActivity : AppCompatActivity() { } } CoroutineScope(Dispatchers.Main).launch { - // wait fo withContext(Dispatchers.IO) { if (mimeType == "text" && intentScheme == "content") { readFile(intent.data!!) @@ -263,14 +262,14 @@ class MainActivity : AppCompatActivity() { Log.i(javaClass.simpleName, "Starting api controller for: $apiHost") api = ghostAPI(applicationContext, apiHost) } - if (intentScheme == "link") { - withContext(Dispatchers.IO) { - mdToAppend += "[](${uri})\n" - } + if (intentScheme == "link" && uri.toString() !="null") { + mdToAppend += "[](${uri})\n" webView.evaluateJavascript("onRead();"){} + intent.putExtra(Intent.EXTRA_TEXT, null as CharSequence?) } if (intentScheme == "content" && mimeType == "image" && uri != null) { pushImage(uri) + intent.putExtra(Intent.EXTRA_STREAM, null as Uri?) } } } @@ -451,7 +450,7 @@ class MainActivity : AppCompatActivity() { "\"${file.name}\" uploaded to \"$imgUrl\"", Toast.LENGTH_SHORT ).show() - webView.evaluateJavascript("pasteText();saveFile();") {} + webView.evaluateJavascript("pasteText()") {} }) return response as retrofit2.Response } else return response as retrofit2.Response