Dev (#21) - fix search and file chooser

* Fix up search and add file chooser

* Fix repeating file chooser

2 files changed, 64 insertions, 0 deletions

diff --git a/app/src/main/kotlin/com/pitchedapps/frost/contracts/FileChooser.kt b/app/src/main/kotlin/com/pitchedapps/frost/contracts/FileChooser.kt
new file mode 100644
index 00000000..5b2cfa49
--- /dev/null
+++ b/app/src/main/kotlin/com/pitchedapps/frost/contracts/FileChooser.kt
@@ -0,0 +1,56 @@
+package com.pitchedapps.frost.contracts
+
+import android.app.Activity
+import android.content.Intent
+import android.net.Uri
+import android.webkit.ValueCallback
+import android.webkit.WebChromeClient
+import ca.allanwang.kau.permissions.PERMISSION_READ_EXTERNAL_STORAGE
+import ca.allanwang.kau.permissions.kauRequestPermissions
+import com.pitchedapps.frost.utils.L
+
+/**
+ * Created by Allan Wang on 2017-07-04.
+ */
+const val FILE_CHOOSER_REQUEST = 67
+
+interface FileChooserActivityContract {
+    fun openFileChooser(filePathCallback: ValueCallback<Array<Uri>>, fileChooserParams: WebChromeClient.FileChooserParams)
+}
+
+interface FileChooserContract {
+    var filePathCallback: ValueCallback<Array<Uri>>?
+    fun openFileChooser(activity: Activity, filePathCallback: ValueCallback<Array<Uri>>, fileChooserParams: WebChromeClient.FileChooserParams)
+    fun onActivityResultWeb(requestCode: Int, resultCode: Int, intent: Intent?): Boolean
+}
+
+class FileChooserDelegate : FileChooserContract {
+
+    override var filePathCallback: ValueCallback<Array<Uri>>? = null
+
+    override fun openFileChooser(activity: Activity, filePathCallback: ValueCallback<Array<Uri>>, fileChooserParams: WebChromeClient.FileChooserParams) {
+        activity.kauRequestPermissions(PERMISSION_READ_EXTERNAL_STORAGE) {
+            granted, _ ->
+            if (!granted) return@kauRequestPermissions
+            val contentSelectionIntent = Intent(Intent.ACTION_GET_CONTENT)
+            contentSelectionIntent.addCategory(Intent.CATEGORY_OPENABLE)
+            contentSelectionIntent.type = fileChooserParams.acceptTypes?.joinToString(separator = "|") ?: "*/*"
+            activity.startActivityForResult(contentSelectionIntent, FILE_CHOOSER_REQUEST)
+            this.filePathCallback?.onReceiveValue(null)
+            this.filePathCallback = filePathCallback
+        }
+    }
+
+    override fun onActivityResultWeb(requestCode: Int, resultCode: Int, intent: Intent?): Boolean {
+        L.d("On activity results web $requestCode")
+        if (requestCode != FILE_CHOOSER_REQUEST) return false
+        var results: Uri? = null
+
+        if (resultCode == Activity.RESULT_OK && intent != null) results = Uri.parse(intent.dataString)
+        L.d("Callback received; ${filePathCallback != null}")
+        filePathCallback?.onReceiveValue(if (results == null) null else arrayOf(results))
+        filePathCallback = null
+        return true
+    }
+
+}
\ No newline at end of file
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/contracts/WebContract.kt b/app/src/main/kotlin/com/pitchedapps/frost/contracts/WebContract.kt
new file mode 100644
index 00000000..2485a468
--- /dev/null
+++ b/app/src/main/kotlin/com/pitchedapps/frost/contracts/WebContract.kt
@@ -0,0 +1,8 @@
+package com.pitchedapps.frost.contracts
+
+/**
+ * Created by Allan Wang on 2017-07-04.
+ *
+ * Combination of all the core functions implemented by the Activity
+ */
+interface ActivityWebContract : FileChooserActivityContract
\ No newline at end of file