Fix learnmore link handling

iflix · Nov 6, 2019 · 75dc81a · 75dc81a
1 parent b706bc6
commit 75dc81a
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 6 deletions.
diff --git a/example/src/main/java/iflix/play/webview/example/IflixPlayerExampleActivity.kt b/example/src/main/java/iflix/play/webview/example/IflixPlayerExampleActivity.kt
@@ -6,6 +6,7 @@ import android.support.v7.app.AppCompatActivity
 
 import iflix.play.webview.player.IflixPlayerWebViewActivity
 import iflix.play.webview.player.IflixPlayerWebViewActivity.Companion.IFLIX_ASSET_TYPE_MOVIE
+import iflix.play.webview.player.IflixPlayerWebViewActivity.Companion.IFLIX_ASSET_TYPE_SHOW
 import iflix.play.webview.player.IflixPlayerWebViewActivity.Companion.INTENT_IFLIX_ASSET_ID
 import iflix.play.webview.player.IflixPlayerWebViewActivity.Companion.INTENT_IFLIX_ASSET_TYPE
 
@@ -15,8 +16,8 @@ class IflixPlayerExampleActivity : AppCompatActivity() {
         super.onCreate(savedInstanceState)
 
         val intent = Intent(this, IflixPlayerWebViewActivity::class.java)
-        intent.putExtra(INTENT_IFLIX_ASSET_TYPE, IFLIX_ASSET_TYPE_MOVIE) // IFLIX_ASSET_TYPE_MOVIE or IFLIX_ASSET_TYPE_SHOW
-        intent.putExtra(INTENT_IFLIX_ASSET_ID, "128530") // wheely movie id
+        intent.putExtra(INTENT_IFLIX_ASSET_TYPE, IFLIX_ASSET_TYPE_SHOW) // IFLIX_ASSET_TYPE_MOVIE or IFLIX_ASSET_TYPE_SHOW
+        intent.putExtra(INTENT_IFLIX_ASSET_ID, "18808") // wheely movie id
         startActivity(intent)
 
         finish()

diff --git a/player/src/main/java/iflix/play/webview/player/IflixPlayerWebViewActivity.kt b/player/src/main/java/iflix/play/webview/player/IflixPlayerWebViewActivity.kt
@@ -3,6 +3,7 @@ package iflix.play.webview.player
 import android.content.pm.ActivityInfo
 import android.os.Build
 import android.os.Bundle
+import android.os.Message
 import android.support.annotation.RequiresApi
 import android.support.v7.app.AppCompatActivity
 import android.view.View
@@ -11,6 +12,14 @@ import android.webkit.PermissionRequest
 import android.webkit.WebSettings
 import android.webkit.WebView
 import android.webkit.WebViewClient
+import android.support.v4.content.ContextCompat.startActivity
+import android.content.Intent
+import android.net.Uri
+import android.util.Log
+import android.support.v4.content.ContextCompat.startActivity
+
+
+
 
 class IflixPlayerWebViewActivity : AppCompatActivity() {
 
@@ -29,7 +38,7 @@ class IflixPlayerWebViewActivity : AppCompatActivity() {
         super.onCreate(savedInstanceState)
 
         // force
-        setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE);
+        setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE)
 
         setContentView(R.layout.activity_webview)
 
@@ -68,14 +77,18 @@ class IflixPlayerWebViewActivity : AppCompatActivity() {
         settings.mediaPlaybackRequiresUserGesture = false
 
         // include "partner/grab" in the user agent string for tracking
-        settings.userAgentString = System.getProperty("http.agent") + " partner/grab"
+        settings.userAgentString = System.getProperty("http.agent") + " partner/webtest"
 
         // WebView settings
         webView.fitsSystemWindows = true
 
         webView.webViewClient = object: WebViewClient() {
             override fun shouldOverrideUrlLoading(view: WebView, url: String): Boolean {
-                view.loadUrl(url)
+                if (url.contains("/embed") && url.contains("iflix.com")) {
+                    view.loadUrl(url)
+                } else {
+                    view.getContext()?.startActivity(Intent(Intent.ACTION_VIEW, Uri.parse(url)))
+                }
                 return true
             }
         }
@@ -85,6 +98,11 @@ class IflixPlayerWebViewActivity : AppCompatActivity() {
             override fun onPermissionRequest(request: PermissionRequest?) {
                 request!!.grant(arrayOf(PermissionRequest.RESOURCE_PROTECTED_MEDIA_ID))
             }
+
+            override fun onCreateWindow(view: WebView?, isDialog: Boolean, isUserGesture: Boolean, resultMsg: Message?): Boolean {
+                view?.getContext()?.startActivity(Intent(Intent.ACTION_VIEW, Uri.parse(view.getHitTestResult().extra)))
+                return false
+            }
         }
 
         // force fullscreen
@@ -96,7 +114,8 @@ class IflixPlayerWebViewActivity : AppCompatActivity() {
         val assetType = intent.getStringExtra(INTENT_IFLIX_ASSET_TYPE)
         val assetId = intent.getStringExtra(INTENT_IFLIX_ASSET_ID)
 
-        webView.loadUrl("https://m.iflix.com/embed/" + assetType + "/" + assetId)
+        val url = "https://www.iflix.com/embed/short/112774"
+        webView.loadUrl(url)
     }
 
     override fun onBackPressed() {