From d067ed17986fd77b44da730e62dedad886927482 Mon Sep 17 00:00:00 2001 From: evermind Date: Sun, 5 May 2024 07:12:08 +0200 Subject: [PATCH] BraveNewPipe: use old behaviour for retrieving the new version info data --- .../newpipe/BraveNewVersionWorkerHelper.kt | 16 ++++++++++++++++ .../java/org/schabi/newpipe/NewVersionWorker.kt | 5 +---- 2 files changed, 17 insertions(+), 4 deletions(-) create mode 100644 app/src/main/java/org/schabi/newpipe/BraveNewVersionWorkerHelper.kt diff --git a/app/src/main/java/org/schabi/newpipe/BraveNewVersionWorkerHelper.kt b/app/src/main/java/org/schabi/newpipe/BraveNewVersionWorkerHelper.kt new file mode 100644 index 000000000..88c315d93 --- /dev/null +++ b/app/src/main/java/org/schabi/newpipe/BraveNewVersionWorkerHelper.kt @@ -0,0 +1,16 @@ +package org.schabi.newpipe + +import com.grack.nanojson.JsonObject +import com.grack.nanojson.JsonParser +import org.schabi.newpipe.extractor.downloader.Response + +object BraveNewVersionWorkerHelper { + + fun getVersionInfo(response: Response): JsonObject { + val newpipeVersionInfo = JsonParser.`object`() + .from(response.responseBody()).getObject("flavors") + .getObject("github").getObject("stable") + return newpipeVersionInfo + } + +} \ No newline at end of file diff --git a/app/src/main/java/org/schabi/newpipe/NewVersionWorker.kt b/app/src/main/java/org/schabi/newpipe/NewVersionWorker.kt index 13130686e..ec1f33941 100644 --- a/app/src/main/java/org/schabi/newpipe/NewVersionWorker.kt +++ b/app/src/main/java/org/schabi/newpipe/NewVersionWorker.kt @@ -16,7 +16,6 @@ import androidx.work.WorkManager import androidx.work.Worker import androidx.work.WorkerParameters import androidx.work.workDataOf -import com.grack.nanojson.JsonParser import com.grack.nanojson.JsonParserException import org.schabi.newpipe.extractor.downloader.Response import org.schabi.newpipe.extractor.exceptions.ReCaptchaException @@ -118,9 +117,7 @@ class NewVersionWorker( // Parse the json from the response. try { - val newpipeVersionInfo = JsonParser.`object`() - .from(response.responseBody()).getObject("flavors") - .getObject("newpipe") + val newpipeVersionInfo = BraveNewVersionWorkerHelper.getVersionInfo(response) val versionName = newpipeVersionInfo.getString("version") val versionCode = newpipeVersionInfo.getInt("version_code")