Add listener logic

6 files changed, 34 insertions, 31 deletions

diff --git a/app/src/main/kotlin/com/pitchedapps/frost/injectors/JsActions.kt b/app/src/main/kotlin/com/pitchedapps/frost/injectors/JsActions.kt
index 17d7ca81..70df1bfa 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/injectors/JsActions.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/injectors/JsActions.kt
@@ -1,6 +1,7 @@
 package com.pitchedapps.frost.injectors
 
 import android.webkit.WebView
+import com.pitchedapps.frost.facebook.FB_URL_BASE
 
 /**
  * Created by Allan Wang on 2017-05-31.
@@ -11,6 +12,7 @@ enum class JsActions(body: String) : InjectorContract {
      * see [com.pitchedapps.frost.web.FrostJSI.loadLogin]
      */
     LOGIN_CHECK("document.getElementById('signup-button')&&Frost.loadLogin();"),
+    BASE_HREF("document.write(\"<base href='$FB_URL_BASE'/>\");"),
     EMPTY("");
 
     val function = "!function(){$body}();"
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/injectors/JsAssets.kt b/app/src/main/kotlin/com/pitchedapps/frost/injectors/JsAssets.kt
index d0bf9deb..864f95ea 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/injectors/JsAssets.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/injectors/JsAssets.kt
@@ -29,4 +29,4 @@ enum class JsAssets : InjectorContract {
         injector = null
     }
 
-}
\ No newline at end of file
+}
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/injectors/JsInjector.kt b/app/src/main/kotlin/com/pitchedapps/frost/injectors/JsInjector.kt
index 0000ecf1..2d8d42e1 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/injectors/JsInjector.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/injectors/JsInjector.kt
@@ -1,8 +1,7 @@
 package com.pitchedapps.frost.injectors
 
 import android.webkit.WebView
-import com.pitchedapps.frost.facebook.FbCookie
-import com.pitchedapps.frost.utils.L
+import com.pitchedapps.frost.web.FrostWebViewClient
 import io.reactivex.Observable
 import io.reactivex.android.schedulers.AndroidSchedulers
 import io.reactivex.subjects.SingleSubject
@@ -43,7 +42,7 @@ interface InjectorContract {
 /**
  * Helper method to inject multiple functions simultaneously with a single callback
  */
-fun WebView.jsInject(vararg injectors: InjectorContract, callback: ((Array<String>) -> Unit)) {
+fun WebView.jsInject(vararg injectors: InjectorContract, callback: ((Array<String>) -> Unit) = {}) {
     val observables = Array(injectors.size, { SingleSubject.create<String>() })
     Observable.zip<String, Array<String>>(observables.map { it.toObservable() }, { it.map { it.toString() }.toTypedArray() }).subscribeOn(AndroidSchedulers.mainThread()).subscribe({
         callback.invoke(it)
@@ -54,6 +53,8 @@ fun WebView.jsInject(vararg injectors: InjectorContract, callback: ((Array<Strin
     }
 }
 
+fun FrostWebViewClient.jsInject(vararg injectors: InjectorContract, callback: ((Array<String>) -> Unit) = {}) = webCore.jsInject(*injectors, callback = callback)
+
 class JsInjector(val function: String) : InjectorContract {
     override fun inject(webView: WebView, callback: ((String) -> Unit)?) {
         webView.evaluateJavascript(function, { value -> callback?.invoke(value) })
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/web/FrostJSI.kt b/app/src/main/kotlin/com/pitchedapps/frost/web/FrostJSI.kt
index bb482c3c..f81c6a15 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/web/FrostJSI.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/web/FrostJSI.kt
@@ -19,8 +19,15 @@ class FrostJSI(val context: Context, val webView: FrostWebViewCore) {
     val cookies: ArrayList<CookieModel>
         get() = (context as? MainActivity)?.cookies() ?: arrayListOf()
 
+    var lastUrl: String = ""
+
     @JavascriptInterface
-    fun loadUrl(url: String) = context.launchWebOverlay(url)
+    fun loadUrl(url: String) {
+        if (url != lastUrl) {
+            lastUrl = url
+            context.launchWebOverlay(url)
+        }
+    }
 
     @JavascriptInterface
     fun reloadBaseUrl(animate: Boolean) {
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 07b9a949..8cd36b86 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/web/FrostWebViewClient.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/web/FrostWebViewClient.kt
@@ -62,7 +62,7 @@ open class FrostWebViewClient(val webCore: FrostWebViewCore) : WebViewClient() {
         L.d("Page finished reveal")
         webCore.jsInject(CssHider.HEADER,
                 Prefs.themeInjector,
-                JsAssets.CLICK_INTERCEPTOR,
+//                JsAssets.CLICK_INTERCEPTOR,
                 callback = {
                     L.d("Finished ${it.contentToString()}")
                     refreshObservable.onNext(false)
@@ -77,14 +77,6 @@ open class FrostWebViewClient(val webCore: FrostWebViewCore) : WebViewClient() {
         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)
-        })
-    }
-
     override fun shouldOverrideKeyEvent(view: WebView, event: KeyEvent): Boolean {
         L.d("Key event ${event.keyCode}")
         return super.shouldOverrideKeyEvent(view, event)
@@ -95,6 +87,8 @@ open class FrostWebViewClient(val webCore: FrostWebViewCore) : WebViewClient() {
         return super.shouldOverrideUrlLoading(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}")
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/web/FrostWebViewClientMenu.kt b/app/src/main/kotlin/com/pitchedapps/frost/web/FrostWebViewClientMenu.kt
index 9a00c563..2a1a5b74 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/web/FrostWebViewClientMenu.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/web/FrostWebViewClientMenu.kt
@@ -2,7 +2,9 @@ package com.pitchedapps.frost.web
 
 import android.graphics.Bitmap
 import android.webkit.WebView
+import com.pitchedapps.frost.facebook.FB_URL_BASE
 import com.pitchedapps.frost.injectors.JsAssets
+import com.pitchedapps.frost.injectors.jsInject
 import com.pitchedapps.frost.utils.L
 import io.reactivex.subjects.Subject
 
@@ -13,17 +15,18 @@ class FrostWebViewClientMenu(webCore: FrostWebViewCore) : FrostWebViewClient(web
 
     var content: String? = null
     val progressObservable: Subject<Int> = webCore.progressObservable
+    private val contentBaseUrl = "https://touch.facebook.com/notifications"
 
     override fun onPageStarted(view: WebView, url: String, favicon: Bitmap?) {
         super.onPageStarted(view, url, favicon)
         if (content != null) {
-            when (url) {
-                "https://m.facebook.com/settings",
-                "https://m.facebook.com/settings#",
-                "https://m.facebook.com/settings#!/settings?soft=bookmarks" -> {
+            when (url.removePrefix(FB_URL_BASE)) {
+                "settings",
+                "settings#",
+                "settings#!/settings?soft=bookmarks" -> {
                     L.d("Load from stored $url")
                     view.stopLoading()
-                    view.loadDataWithBaseURL("https://touch.facebook.com/notifications", content, "text/html", "utf-8", "https://google.ca/test")
+                    view.loadDataWithBaseURL(contentBaseUrl, content, "text/html", "utf-8", "https://google.ca/test")
                 }
             }
         }
@@ -31,27 +34,23 @@ class FrostWebViewClientMenu(webCore: FrostWebViewCore) : FrostWebViewClient(web
 
     override fun onPageFinished(view: WebView, url: String) {
         super.onPageFinished(view, url)
-        if (url == webCore.baseUrl) {
-            progressObservable.onNext(99)
-            inject(JsAssets.MENU, webCore, {
-                inject(JsAssets.MENU_CLICK, webCore) //menu injection must be after or we will have a loop from the click listener
+        if (url == webCore.baseUrl && content == null) {
+            jsInject(JsAssets.MENU, callback = {
+                jsInject(JsAssets.MENU_CLICK) //menu injection must be after or we will have a loop from the click listener
             })
-        } else {
-            inject(JsAssets.MENU_CLICK, webCore)
-        }
+        } else if (url == contentBaseUrl) jsInject(JsAssets.MENU_CLICK)
     }
 
     override fun emit(flag: Int) {
         super.emit(flag)
-        progressObservable.onNext(100)
         super.injectAndFinish()
     }
 
     override fun onPageFinishedActions(url: String?) {
-        when (url) {
-            "https://m.facebook.com/settings",
-            "https://m.facebook.com/settings#",
-            "https://m.facebook.com/settings#!/settings?soft=bookmarks" -> {
+        when (url?.removePrefix(FB_URL_BASE)) {
+            "settings",
+            "settings#",
+            "settings#!/settings?soft=bookmarks" -> {
                 //do nothing; we will further inject before revealing
             }
             else -> injectAndFinish()