From eeb762b1b99baf740d16ee90e67eae107c0b4022 Mon Sep 17 00:00:00 2001
From: Samfun75 <38332931+Samfun75@users.noreply.github.com>
Date: Wed, 24 Aug 2022 17:01:31 +0300
Subject: [PATCH] KickAssAnime: handle when link1 is blank (#793)

---
 src/en/kickassanime/build.gradle              |  2 +-
 .../en/kickassanime/KickAssAnime.kt           | 26 +++++++++++++------
 2 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/src/en/kickassanime/build.gradle b/src/en/kickassanime/build.gradle
index 1cb8d5184..eec071e15 100644
--- a/src/en/kickassanime/build.gradle
+++ b/src/en/kickassanime/build.gradle
@@ -5,7 +5,7 @@ ext {
     extName = 'KickAssAnime'
     pkgNameSuffix = 'en.kickassanime'
     extClass = '.KickAssAnime'
-    extVersionCode = 6
+    extVersionCode = 7
     libVersion = '13'
 }
 
diff --git a/src/en/kickassanime/src/eu/kanade/tachiyomi/animeextension/en/kickassanime/KickAssAnime.kt b/src/en/kickassanime/src/eu/kanade/tachiyomi/animeextension/en/kickassanime/KickAssAnime.kt
index 226ed7e4e..e18dc6087 100644
--- a/src/en/kickassanime/src/eu/kanade/tachiyomi/animeextension/en/kickassanime/KickAssAnime.kt
+++ b/src/en/kickassanime/src/eu/kanade/tachiyomi/animeextension/en/kickassanime/KickAssAnime.kt
@@ -66,7 +66,7 @@ class KickAssAnime : ConfigurableAnimeSource, AnimeHttpSource() {
     }
 
     // Add non working server names here
-    private val DeadServers = listOf(
+    private val deadServers = listOf(
         "BETA-SERVER", "BETASERVER1", "BETASERVER3", "DEVSTREAM",
         "THETA-ORIGINAL-V4", "DAILYMOTION", "KICKASSANIME1"
     )
@@ -112,17 +112,27 @@ class KickAssAnime : ConfigurableAnimeSource, AnimeHttpSource() {
     override fun videoListParse(response: Response): List<Video> {
         val data = getAppdata(response.asJsoup())
         val episode = data["episode"]!!.jsonObject
-        val link1 = episode["link1"]!!.jsonPrimitive.content
+        var link = episode["link1"]!!.jsonPrimitive.content
+        //check if link1 is not blank (link2-4 does work), if so check external servers for gogo links
+        if (link.isBlank()) {
+            for (li in data["ext_servers"]!!.jsonArray) {
+                if (li.jsonObject["name"]!!.jsonPrimitive.content == "Vidcdn") {
+                    link = li.jsonObject["link"]!!.jsonPrimitive.content
+                    break
+                }
+            }
+        }
+        if (link.isBlank()) return listOf()
         val videoList = mutableListOf<Video>()
 
         when {
-            link1.contains("gogoplay4.com") -> {
+            link.contains("gogoplay4.com") -> {
                 videoList.addAll(
-                    extractGogoVideo(link1)
+                    extractGogoVideo(link)
                 )
             }
-            link1.contains("betaplayer.life") -> {
-                var url = decode(link1).substringAfter("data=").substringBefore("&vref")
+            link.contains("betaplayer.life") -> {
+                var url = decode(link).substringAfter("data=").substringBefore("&vref")
                 if (url.startsWith("https").not()) {
                     url = "https:$url"
                 }
@@ -131,12 +141,12 @@ class KickAssAnime : ConfigurableAnimeSource, AnimeHttpSource() {
                 )
             }
             else -> {
-                val resp = client.newCall(GET(link1)).execute()
+                val resp = client.newCall(GET(link)).execute()
                 val sources = getVideoSource(resp.asJsoup())
 
                 sources.forEach { source ->
                     when (source.jsonObject["name"]!!.jsonPrimitive.content) {
-                        in DeadServers -> {}
+                        in deadServers -> {}
                         "BETAPLAYER" -> {
                             videoList.addAll(
                                 extractBetaVideo(