diff options
author | Allan Wang <me@allanwang.ca> | 2021-09-25 15:57:15 -0700 |
---|---|---|
committer | Allan Wang <me@allanwang.ca> | 2021-09-25 15:57:15 -0700 |
commit | 8be8b88247973592b2afe134f99c8102929e0b2d (patch) | |
tree | a8f05daae5726a217fd612b5df7b3553c64fa429 /app/src/main/kotlin/com/pitchedapps | |
parent | 8db1930d7623ba071123f5978153679da7161278 (diff) | |
download | frost-8be8b88247973592b2afe134f99c8102929e0b2d.tar.gz frost-8be8b88247973592b2afe134f99c8102929e0b2d.tar.bz2 frost-8be8b88247973592b2afe134f99c8102929e0b2d.zip |
Delete old file chooser code
Diffstat (limited to 'app/src/main/kotlin/com/pitchedapps')
-rw-r--r-- | app/src/main/kotlin/com/pitchedapps/frost/contracts/FileChooser.kt | 67 |
1 files changed, 8 insertions, 59 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 index 21cb4948..521d0f97 100644 --- a/app/src/main/kotlin/com/pitchedapps/frost/contracts/FileChooser.kt +++ b/app/src/main/kotlin/com/pitchedapps/frost/contracts/FileChooser.kt @@ -25,7 +25,9 @@ import ca.allanwang.kau.permissions.PERMISSION_WRITE_EXTERNAL_STORAGE import ca.allanwang.kau.permissions.kauRequestPermissions import ca.allanwang.kau.utils.string import com.pitchedapps.frost.R +import com.pitchedapps.frost.injectors.ThemeProvider import com.pitchedapps.frost.utils.L +import com.pitchedapps.frost.utils.frostSnackbar import dagger.Binds import dagger.Module import dagger.hilt.InstallIn @@ -36,7 +38,7 @@ import javax.inject.Inject /** * Created by Allan Wang on 2017-07-04. */ -const val MEDIA_CHOOSER_RESULT = 67 +private const val MEDIA_CHOOSER_RESULT = 67 interface WebFileChooser { fun openMediaPicker( @@ -51,8 +53,10 @@ interface WebFileChooser { ): Boolean } -class WebFileChooserImpl @Inject internal constructor(private val activity: Activity) : - WebFileChooser { +class WebFileChooserImpl @Inject internal constructor( + private val activity: Activity, + private val themeProvider: ThemeProvider +) : WebFileChooser { private var filePathCallback: ValueCallback<Array<Uri>?>? = null override fun openMediaPicker( @@ -62,6 +66,7 @@ class WebFileChooserImpl @Inject internal constructor(private val activity: Acti activity.kauRequestPermissions(PERMISSION_WRITE_EXTERNAL_STORAGE) { granted, _ -> if (!granted) { L.d { "Failed to get write permissions" } + activity.frostSnackbar(R.string.file_chooser_not_found, themeProvider) filePathCallback.onReceiveValue(null) return@kauRequestPermissions } @@ -97,59 +102,3 @@ interface WebFileChooserModule { @ActivityScoped fun webFileChooser(to: WebFileChooserImpl): WebFileChooser } - -interface FileChooserActivityContract { - fun openFileChooser( - filePathCallback: ValueCallback<Array<Uri>?>, - fileChooserParams: WebChromeClient.FileChooserParams - ) -} - -interface FileChooserContract { - var filePathCallback: ValueCallback<Array<Uri>?>? - fun Activity.openMediaPicker( - filePathCallback: ValueCallback<Array<Uri>?>, - fileChooserParams: WebChromeClient.FileChooserParams - ) - - fun Activity.onActivityResultWeb(requestCode: Int, resultCode: Int, intent: Intent?): Boolean -} - -class FileChooserDelegate : FileChooserContract { - - override var filePathCallback: ValueCallback<Array<Uri>?>? = null - - override fun Activity.openMediaPicker( - filePathCallback: ValueCallback<Array<Uri>?>, - fileChooserParams: WebChromeClient.FileChooserParams - ) { - kauRequestPermissions(PERMISSION_WRITE_EXTERNAL_STORAGE) { granted, _ -> - if (!granted) { - L.d { "Failed to get write permissions" } - filePathCallback.onReceiveValue(null) - return@kauRequestPermissions - } - this@FileChooserDelegate.filePathCallback = filePathCallback - val intent = Intent() - intent.type = fileChooserParams.acceptTypes.firstOrNull() - intent.action = Intent.ACTION_GET_CONTENT - startActivityForResult( - Intent.createChooser(intent, string(R.string.pick_image)), - MEDIA_CHOOSER_RESULT - ) - } - } - - override fun Activity.onActivityResultWeb( - requestCode: Int, - resultCode: Int, - intent: Intent? - ): Boolean { - L.d { "FileChooser On activity results web $requestCode" } - if (requestCode != MEDIA_CHOOSER_RESULT) return false - val data = intent?.data - filePathCallback?.onReceiveValue(if (data != null) arrayOf(data) else null) - filePathCallback = null - return true - } -} |