diff options
| -rw-r--r-- | .idea/misc.xml | 2 | ||||
| -rw-r--r-- | .travis.yml | 1 | ||||
| -rw-r--r-- | app/src/main/kotlin/com/pitchedapps/frost/LoginActivity.kt | 6 | ||||
| -rw-r--r-- | app/src/main/kotlin/com/pitchedapps/frost/web/FrostChromeClient.kt | 5 |
4 files changed, 9 insertions, 5 deletions
diff --git a/.idea/misc.xml b/.idea/misc.xml index 7319f021..085136f8 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_8" 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_7" 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 edff3fff..e3e269ff 100644 --- a/.travis.yml +++ b/.travis.yml @@ -20,7 +20,6 @@ before_install: after_success: - chmod +x ./generate-apk-release.sh - "./generate-apk-release.sh" -- "./gradlew app:publishApkRelease" deploy: provider: script script: "./gradlew app:publishApkRelease" diff --git a/app/src/main/kotlin/com/pitchedapps/frost/LoginActivity.kt b/app/src/main/kotlin/com/pitchedapps/frost/LoginActivity.kt index cd6c2255..da70714d 100644 --- a/app/src/main/kotlin/com/pitchedapps/frost/LoginActivity.kt +++ b/app/src/main/kotlin/com/pitchedapps/frost/LoginActivity.kt @@ -46,10 +46,10 @@ class LoginActivity : BaseActivity() { val textview: AppCompatTextView by bindView(R.id.textview) val profile: ImageView by bindView(R.id.profile) - val loginObservable = SingleSubject.create<CookieModel>()!! + val loginObservable = SingleSubject.create<CookieModel>() val progressObservable = BehaviorSubject.create<Int>()!! - val profileObservable = SingleSubject.create<Boolean>()!! - val usernameObservable = SingleSubject.create<String>()!! + val profileObservable = SingleSubject.create<Boolean>() + val usernameObservable = SingleSubject.create<String>() // Helper to set and enable swipeRefresh var refresh: Boolean 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 74dafd41..3def6d25 100644 --- a/app/src/main/kotlin/com/pitchedapps/frost/web/FrostChromeClient.kt +++ b/app/src/main/kotlin/com/pitchedapps/frost/web/FrostChromeClient.kt @@ -1,6 +1,8 @@ package com.pitchedapps.frost.web +import android.net.Uri import android.webkit.ConsoleMessage +import android.webkit.ValueCallback import android.webkit.WebChromeClient import android.webkit.WebView import com.pitchedapps.frost.utils.L @@ -31,4 +33,7 @@ class FrostChromeClient(webCore: FrostWebViewCore) : WebChromeClient() { progressObservable.onNext(newProgress) } + override fun onShowFileChooser(webView: WebView, filePathCallback: ValueCallback<Array<Uri>>?, fileChooserParams: FileChooserParams?): Boolean { + return super.onShowFileChooser(webView, filePathCallback, fileChooserParams) + } }
\ No newline at end of file |