From 4ad2d23ceccc23f8b11b0a5e712a1f08722611df Mon Sep 17 00:00:00 2001
From: Allan Wang <me@allanwang.ca>
Date: Fri, 13 Oct 2017 20:32:00 -0400
Subject: Revert/mediapicker (#407)

* Remove kau mediapicker

* Allow cancellation and clean up

* Fix up downloader
---
 .../pitchedapps/frost/activities/MainActivity.kt   |  2 +-
 .../frost/activities/MediaPickerActivity.kt        | 30 ----------------------
 .../frost/activities/WebOverlayActivity.kt         |  2 +-
 3 files changed, 2 insertions(+), 32 deletions(-)
 delete mode 100644 app/src/main/kotlin/com/pitchedapps/frost/activities/MediaPickerActivity.kt

(limited to 'app/src/main/kotlin/com/pitchedapps/frost/activities')

diff --git a/app/src/main/kotlin/com/pitchedapps/frost/activities/MainActivity.kt b/app/src/main/kotlin/com/pitchedapps/frost/activities/MainActivity.kt
index 4e1c31d9..27f959cf 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/activities/MainActivity.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/activities/MainActivity.kt
@@ -372,7 +372,7 @@ class MainActivity : BaseActivity(),
         return true
     }
 
-    override fun openFileChooser(filePathCallback: ValueCallback<Array<Uri>>, fileChooserParams: WebChromeClient.FileChooserParams) {
+    override fun openFileChooser(filePathCallback: ValueCallback<Array<Uri>?>, fileChooserParams: WebChromeClient.FileChooserParams) {
         openMediaPicker(filePathCallback, fileChooserParams)
     }
 
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/activities/MediaPickerActivity.kt b/app/src/main/kotlin/com/pitchedapps/frost/activities/MediaPickerActivity.kt
deleted file mode 100644
index 162baf20..00000000
--- a/app/src/main/kotlin/com/pitchedapps/frost/activities/MediaPickerActivity.kt
+++ /dev/null
@@ -1,30 +0,0 @@
-package com.pitchedapps.frost.activities
-
-import android.content.Context
-import android.net.Uri
-import android.support.v4.content.FileProvider
-import ca.allanwang.kau.mediapicker.*
-import ca.allanwang.kau.utils.colorToBackground
-import com.pitchedapps.frost.BuildConfig
-import com.pitchedapps.frost.utils.Prefs
-import java.io.File
-
-/**
- * Created by Allan Wang on 2017-07-23.
- */
-private fun actions(): List<MediaAction> {
-    val color = Prefs.accentColorForWhite
-    return listOf(object : MediaActionCamera(color) {
-
-        override fun createFile(context: Context): File
-                = createMediaFile("Frost", ".jpg")
-
-        override fun createUri(context: Context, file: File): Uri
-                = FileProvider.getUriForFile(context, BuildConfig.APPLICATION_ID + ".provider", file)
-
-    }, MediaActionGallery(color = color.colorToBackground(0.1f)))
-}
-
-class ImagePickerActivity : MediaPickerActivityOverlayBase(MediaType.IMAGE, actions())
-
-class VideoPickerActivity : MediaPickerActivityOverlayBase(MediaType.VIDEO, actions())
\ No newline at end of file
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/activities/WebOverlayActivity.kt b/app/src/main/kotlin/com/pitchedapps/frost/activities/WebOverlayActivity.kt
index a237e3f5..bca10606 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/activities/WebOverlayActivity.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/activities/WebOverlayActivity.kt
@@ -192,7 +192,7 @@ open class WebOverlayActivityBase(private val forceBasicAgent: Boolean) : KauBas
         }
     }
 
-    override fun openFileChooser(filePathCallback: ValueCallback<Array<Uri>>, fileChooserParams: WebChromeClient.FileChooserParams) {
+    override fun openFileChooser(filePathCallback: ValueCallback<Array<Uri>?>, fileChooserParams: WebChromeClient.FileChooserParams) {
         openMediaPicker(filePathCallback, fileChooserParams)
     }
 
-- 
cgit v1.2.3