1 files changed, 23 insertions, 8 deletions
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 3340e7d2..3f976fb8 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/web/FrostJSI.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/web/FrostJSI.kt
@@ -2,8 +2,9 @@ package com.pitchedapps.frost.web
 
 import android.content.Context
 import android.webkit.JavascriptInterface
-import ca.allanwang.kau.logging.KL
-import com.pitchedapps.frost.MainActivity
+import ca.allanwang.kau.utils.startActivity
+import com.pitchedapps.frost.activities.ImageActivity
+import com.pitchedapps.frost.activities.MainActivity
 import com.pitchedapps.frost.dbflow.CookieModel
 import com.pitchedapps.frost.facebook.formattedFbUrl
 import com.pitchedapps.frost.utils.*
@@ -13,12 +14,18 @@ import io.reactivex.subjects.Subject
 /**
  * Created by Allan Wang on 2017-06-01.
  */
-class FrostJSI(val context: Context, val webView: FrostWebViewCore) {
+class FrostJSI(val webView: FrostWebViewCore) {
 
-    val headerObservable: Subject<String>? = (context as? MainActivity)?.headerBadgeObservable
+    val context: Context
+        get() = webView.context
+
+    val activity: MainActivity?
+        get() = (context as? MainActivity)
+
+    val headerObservable: Subject<String>? = activity?.headerBadgeObservable
 
     val cookies: ArrayList<CookieModel>
-        get() = (context as? MainActivity)?.cookies() ?: arrayListOf()
+        get() = activity?.cookies() ?: arrayListOf()
 
     @JavascriptInterface
     fun loadUrl(url: String) {
@@ -35,8 +42,8 @@ class FrostJSI(val context: Context, val webView: FrostWebViewCore) {
     }
 
     @JavascriptInterface
-    fun contextMenu(url: String, text: String) {
-        webView.post { webView.context.showWebContextMenu(WebContext(url.formattedFbUrl, text)) }
+    fun contextMenu(url: String, text: String?) {
+        webView.post { context.showWebContextMenu(WebContext(url.formattedFbUrl, text)) }
     }
 
     /**
@@ -45,7 +52,7 @@ class FrostJSI(val context: Context, val webView: FrostWebViewCore) {
      */
     @JavascriptInterface
     fun longClick(start: Boolean) {
-        (webView.context as? MainActivity)?.viewPager?.enableSwipe = !start
+        activity?.viewPager?.enableSwipe = !start
     }
 
     @JavascriptInterface
@@ -53,6 +60,14 @@ class FrostJSI(val context: Context, val webView: FrostWebViewCore) {
         context.launchLogin(cookies, true)
     }
 
+    /**
+     * Launch image overlay
+     */
+    @JavascriptInterface
+    fun loadImage(imageUrl: String, text: String?) {
+        context.launchImageActivity(imageUrl, text)
+    }
+
     @JavascriptInterface
     fun emit(flag: Int) {
         webView.post { webView.frostWebClient.emit(flag) }