From c03c7d2c6e1a631a27aedc88b620f557a99fde38 Mon Sep 17 00:00:00 2001
From: Allan Wang <me@allanwang.ca>
Date: Sun, 2 Jul 2017 23:16:22 -0700
Subject: Clean up unnecessary nonnulls

---
 app/src/main/kotlin/com/pitchedapps/frost/LoginActivity.kt         | 6 +++---
 app/src/main/kotlin/com/pitchedapps/frost/web/FrostChromeClient.kt | 5 +++++
 2 files changed, 8 insertions(+), 3 deletions(-)

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

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
-- 
cgit v1.2.3