From 3e485f9b415acc22350d5135c73b2bbb34bc44b9 Mon Sep 17 00:00:00 2001
From: Secozzi <49240133+Secozzi@users.noreply.github.com>
Date: Tue, 2 Jan 2024 12:21:41 +0000
Subject: [PATCH] fix(all/googledrive): Fix nextPageToken (#2687)

---
 src/all/googledrive/build.gradle                     |  2 +-
 .../animeextension/all/googledrive/GoogleDrive.kt    | 12 +++++++-----
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/all/googledrive/build.gradle b/src/all/googledrive/build.gradle
index 88c44b78d..3e811ba47 100644
--- a/src/all/googledrive/build.gradle
+++ b/src/all/googledrive/build.gradle
@@ -8,7 +8,7 @@ ext {
     extName = 'Google Drive'
     pkgNameSuffix = 'all.googledrive'
     extClass = '.GoogleDrive'
-    extVersionCode = 12
+    extVersionCode = 13
     libVersion = '13'
 }
 
diff --git a/src/all/googledrive/src/eu/kanade/tachiyomi/animeextension/all/googledrive/GoogleDrive.kt b/src/all/googledrive/src/eu/kanade/tachiyomi/animeextension/all/googledrive/GoogleDrive.kt
index 149a8fb6d..2076ac7eb 100644
--- a/src/all/googledrive/src/eu/kanade/tachiyomi/animeextension/all/googledrive/GoogleDrive.kt
+++ b/src/all/googledrive/src/eu/kanade/tachiyomi/animeextension/all/googledrive/GoogleDrive.kt
@@ -203,7 +203,7 @@ class GoogleDrive : ConfigurableAnimeSource, AnimeHttpSource() {
         // Get cover
 
         val coverResponse = client.newCall(
-            createPost(driveDocument, folderId, searchReqWithType(folderId, "cover", IMAGE_MIMETYPE)),
+            createPost(driveDocument, folderId, nextPageToken, searchReqWithType(folderId, "cover", IMAGE_MIMETYPE)),
         ).execute().parseAs<PostResponse> { JSON_REGEX.find(it)!!.groupValues[1] }
 
         coverResponse.items?.firstOrNull()?.let {
@@ -213,7 +213,7 @@ class GoogleDrive : ConfigurableAnimeSource, AnimeHttpSource() {
         // Get details
 
         val detailsResponse = client.newCall(
-            createPost(driveDocument, folderId, searchReqWithType(folderId, "details.json", "")),
+            createPost(driveDocument, folderId, nextPageToken, searchReqWithType(folderId, "details.json", "")),
         ).execute().parseAs<PostResponse> { JSON_REGEX.find(it)!!.groupValues[1] }
 
         detailsResponse.items?.firstOrNull()?.let {
@@ -302,7 +302,7 @@ class GoogleDrive : ConfigurableAnimeSource, AnimeHttpSource() {
 
             while (pageToken != null) {
                 val response = client.newCall(
-                    createPost(driveDocument, folderId),
+                    createPost(driveDocument, folderId, pageToken),
                 ).execute()
 
                 val parsed = response.parseAs<PostResponse> {
@@ -386,6 +386,7 @@ class GoogleDrive : ConfigurableAnimeSource, AnimeHttpSource() {
     private fun createPost(
         document: Document,
         folderId: String,
+        pageToken: String?,
         getMultiFormPath: (String, String, String) -> String = { folderIdStr, nextPageTokenStr, keyStr ->
             defaultGetRequest(folderIdStr, nextPageTokenStr, keyStr)
         },
@@ -404,7 +405,7 @@ class GoogleDrive : ConfigurableAnimeSource, AnimeHttpSource() {
                 it.name == "SAPISID" || it.name == "__Secure-3PAPISID"
             }?.value ?: ""
 
-        val requestUrl = getMultiFormPath(folderId, nextPageToken ?: "", key)
+        val requestUrl = getMultiFormPath(folderId, pageToken ?: "", key)
         val body = """--$BOUNDARY
                     |content-type: application/http
                     |content-transfer-encoding: binary
@@ -455,11 +456,12 @@ class GoogleDrive : ConfigurableAnimeSource, AnimeHttpSource() {
 
         if (page == 1) nextPageToken = ""
         val post = if (genMultiFormReq == null) {
-            createPost(driveDocument, folderId)
+            createPost(driveDocument, folderId, nextPageToken)
         } else {
             createPost(
                 driveDocument,
                 folderId,
+                nextPageToken,
                 genMultiFormReq,
             )
         }