1 files changed, 46 insertions, 25 deletions

diff --git a/app/src/main/kotlin/com/pitchedapps/frost/web/FrostWebViewClient.kt b/app/src/main/kotlin/com/pitchedapps/frost/web/FrostWebViewClient.kt
index 28048a1d..2f24d055 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/web/FrostWebViewClient.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/web/FrostWebViewClient.kt
@@ -4,6 +4,7 @@ import android.content.Context
 import android.graphics.Bitmap
 import android.view.KeyEvent
 import android.webkit.*
+import ca.allanwang.kau.utils.isVisible
 import com.pitchedapps.frost.LoginActivity
 import com.pitchedapps.frost.MainActivity
 import com.pitchedapps.frost.SelectorActivity
@@ -11,23 +12,25 @@ import com.pitchedapps.frost.facebook.FACEBOOK_COM
 import com.pitchedapps.frost.facebook.FbCookie
 import com.pitchedapps.frost.injectors.CssAssets
 import com.pitchedapps.frost.injectors.JsActions
+import com.pitchedapps.frost.injectors.JsAssets
 import com.pitchedapps.frost.utils.L
 import com.pitchedapps.frost.utils.Prefs
 import com.pitchedapps.frost.utils.cookies
 import com.pitchedapps.frost.utils.launchNewTask
 import com.pitchedapps.frost.views.circularReveal
+import com.pitchedapps.frost.views.fadeIn
 import com.pitchedapps.frost.views.fadeOut
 import io.reactivex.subjects.Subject
 
 /**
  * Created by Allan Wang on 2017-05-31.
  */
-class FrostWebViewClient(val refreshObservable: Subject<Boolean>) : WebViewClient() {
+open class FrostWebViewClient(val refreshObservable: Subject<Boolean>) : WebViewClient() {
 
     override fun onPageStarted(view: WebView, url: String, favicon: Bitmap?) {
         super.onPageStarted(view, url, favicon)
         L.i("FWV Loading $url")
-        L.i("Cookies ${CookieManager.getInstance().getCookie(url)}")
+        L.v("Cookies ${CookieManager.getInstance().getCookie(url)}")
         refreshObservable.onNext(true)
         if (!url.contains(FACEBOOK_COM)) return
         if (url.contains("logout.php")) FbCookie.logout(Prefs.userId, { launchLogin(view.context) })
@@ -44,20 +47,42 @@ class FrostWebViewClient(val refreshObservable: Subject<Boolean>) : WebViewClien
 
     override fun onPageFinished(view: WebView, url: String) {
         super.onPageFinished(view, url)
-        refreshObservable.onNext(false)
-        if (!url.contains(FACEBOOK_COM)) return
-        L.i("Page finished $url")
-        with(view as FrostWebViewCore) {
-            if (url == view.baseUrl && view.baseJavascript != null) {
-                L.i("Base inject ${view.baseJavascript!!.name}")
-                view.baseJavascript!!.inject(view, {
-                    L.i("Base injection done")
-                })
-            }
+        if (!url.contains(FACEBOOK_COM)) {
+            refreshObservable.onNext(false)
+            if (!view.isVisible()) view.fadeIn(duration = 200L)
+            return
         }
+        L.i("Page finished $url")
         JsActions.LOGIN_CHECK.inject(view)
+        onPageFinishedReveal(view as FrostWebViewCore, url)
+    }
+
+    open internal fun onPageFinishedReveal(view: FrostWebViewCore, url: String?) {
+        onPageFinishedReveal(view, true)
+    }
+
+    internal fun onPageFinishedReveal(view: FrostWebViewCore, animate: Boolean) {
+        L.d("Page finished reveal")
         CssAssets.HEADER.inject(view, {
-            view.circularReveal(offset = 150L)
+            refreshObservable.onNext(false)
+            if (animate) view.circularReveal(offset = 150L)
+            else view.fadeIn(duration = 100L)
+        })
+    }
+
+    open fun handleHtml(html: String) {
+        L.d("Handle Html")
+    }
+
+    open fun emit(flag: Int) {
+        L.d("Emit $flag")
+    }
+
+    fun inject(jsAssets: JsAssets, view: WebView, callback: (String) -> Unit = {}) {
+        L.i("Post inject ${jsAssets.name}")
+        jsAssets.inject(view, {
+            L.i("Post injection done $it")
+            callback.invoke(it)
         })
     }
 
@@ -66,13 +91,13 @@ class FrostWebViewClient(val refreshObservable: Subject<Boolean>) : WebViewClien
         return super.shouldOverrideKeyEvent(view, event)
     }
 
-    override fun shouldOverrideUrlLoading(view: WebView, request: WebResourceRequest): Boolean {
-        L.d("Url Loading ${request.url?.path}")
+    override fun shouldOverrideUrlLoading(view: WebView, request: WebResourceRequest?): Boolean {
+        L.d("Url Loading ${request?.url?.path}")
         return super.shouldOverrideUrlLoading(view, request)
     }
 
-    override fun shouldInterceptRequest(view: WebView, request: WebResourceRequest): WebResourceResponse? {
-        if (!request.url.host.contains(FACEBOOK_COM)) return super.shouldInterceptRequest(view, request)
+    override fun shouldInterceptRequest(view: WebView, request: WebResourceRequest?): WebResourceResponse? {
+        if (request == null || !(request.url.host?.contains(FACEBOOK_COM) ?: false)) return super.shouldInterceptRequest(view, request)
         L.v("Url intercept ${request.url.path}")
         return super.shouldInterceptRequest(view, request)
     }
@@ -80,15 +105,11 @@ class FrostWebViewClient(val refreshObservable: Subject<Boolean>) : WebViewClien
     override fun onLoadResource(view: WebView, url: String) {
         if (!url.contains(FACEBOOK_COM)) return super.onLoadResource(view, url)
         L.v("Resource $url")
-        FrostWebOverlay.values.forEach {
-            if (url.contains(it.match))
-                L.d("Resource Loaded $it")
-        }
+//        FrostWebOverlay.values.forEach {
+//            if (url.contains(it.match))
+//                L.d("Resource Loaded $it")
+//        }
         super.onLoadResource(view, url)
     }
 
-    fun logout() {
-
-    }
-
 }
\ No newline at end of file