aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.idea/misc.xml2
-rw-r--r--.travis.yml6
-rw-r--r--app/src/main/kotlin/com/pitchedapps/frost/web/FrostChromeClient.kt9
3 files changed, 11 insertions, 6 deletions
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 085136f8..7319f021 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -53,7 +53,7 @@
<ConfirmationsSetting value="0" id="Add" />
<ConfirmationsSetting value="0" id="Remove" />
</component>
- <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+ <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/build/classes" />
</component>
<component name="ProjectType">
diff --git a/.travis.yml b/.travis.yml
index e3e269ff..7db65ac9 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -20,11 +20,7 @@ before_install:
after_success:
- chmod +x ./generate-apk-release.sh
- "./generate-apk-release.sh"
-deploy:
- provider: script
- script: "./gradlew app:publishApkRelease"
- on:
- branch: master
+- "./gradlew app:publishApkRelease"
script:
- cd $TRAVIS_BUILD_DIR/
- "./gradlew assembleReleaseTest"
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/web/FrostChromeClient.kt b/app/src/main/kotlin/com/pitchedapps/frost/web/FrostChromeClient.kt
index 3def6d25..4d03afe4 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/web/FrostChromeClient.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/web/FrostChromeClient.kt
@@ -34,6 +34,15 @@ class FrostChromeClient(webCore: FrostWebViewCore) : WebChromeClient() {
}
override fun onShowFileChooser(webView: WebView, filePathCallback: ValueCallback<Array<Uri>>?, fileChooserParams: FileChooserParams?): Boolean {
+ L.d("On show file chooser")
+ fileChooserParams?.apply {
+ L.d(filenameHint)
+ L.d("$mode")
+ L.d(acceptTypes.contentToString())
+ }
+
return super.onShowFileChooser(webView, filePathCallback, fileChooserParams)
}
+
+
} \ No newline at end of file