Adjust android code to account for upstream changes

Author: MarmadileManteater

android/app/src/main/java/io/freetubeapp/freetube/javascript/FreeTubeJavaScriptInterface.kt

@@ -678,28 +678,28 @@ class FreeTubeJavaScriptInterface {
 
   // region Data Extraction
 
-  private fun getBotGuardScript(videoId: String, visitorData: String, sessionContext: String, includeDebugMessage: Boolean = true): String {
+  private fun getBotGuardScript(videoId: String, sessionContext: String, includeDebugMessage: Boolean = true): String {
     val script = context.assets.readText("botGuardScript.js")
     val functionName = script.split("export{")[1].split(" as default};")[0]
     val exportSection = "export{${functionName} as default};"
     val then = if (includeDebugMessage) {
-      "(TOKEN_RESULT) => { console.log(`Your potoken is \${JSON.stringify(TOKEN_RESULT)}`); Android.returnToken(JSON.stringify(TOKEN_RESULT)) }"
+      "(TOKEN_RESULT) => { console.log(`Your potoken is \${TOKEN_RESULT}`); Android.returnToken(TOKEN_RESULT) }"
     } else {
       "(TOKEN_RESULT) => { Android.returnToken(TOKEN_RESULT) }"
     }
     val bakedScript =
-      script.replace(exportSection, "; ${functionName}(\"$videoId\",\"$visitorData\", $sessionContext).then($then)")
+      script.replace(exportSection, "; ${functionName}(\"$videoId\", $sessionContext).then($then)")
     return bakedScript
   }
 
   @JavascriptInterface
-  fun generatePOTokens(videoId: String, visitorData: String, sessionContext: String): String {
+  fun generatePOToken(videoId: String, sessionContext: String): String {
     return Promise(context.threadPoolExecutor, {
       resolve,
       reject
       ->
         try {
-          val bgScript = getBotGuardScript(videoId, visitorData, sessionContext)
+          val bgScript = getBotGuardScript(videoId, sessionContext)
           val bgWv = context.bgWebView
           context.bgJsInterface.onReturnToken {
             run {

src/renderer/helpers/android.js

@@ -354,11 +354,9 @@ export function generatePOTokenFromVisitorData(visitorData) {
   return awaitAsyncResult(android.generatePOTokenFromVisitorData(visitorData))
 }
 
-export async function generatePOTokens(videoId, visitorData, sessionContext) {
-  const id = android.generatePOTokens(videoId, visitorData, sessionContext)
-  const data = JSON.parse(await awaitAsyncResult(id))
-  console.log(data)
-  return data
+export async function generatePOToken(videoId, sessionContext) {
+  const id = android.generatePOToken(videoId, sessionContext)
+  return await awaitAsyncResult(id)
 }
 
 export async function selectDataDirectory(copyFiles = false) {

src/renderer/helpers/api/local.js

@@ -11,7 +11,7 @@ import {
   getChannelPlaylistId,
   getRelativeTimeFromDate,
 } from '../utils'
-import { generatePOTokens, runDecipherScript } from '../android'
+import { generatePOToken, runDecipherScript } from '../android'
 
 const TRACKING_PARAM_NAMES = [
   'utm_source',
@@ -316,13 +316,11 @@ export async function getLocalVideoInfo(id) {
       throw error
     }
   } else if (process.env.IS_ANDROID) {
-    ({ contentPoToken, sessionPoToken } = await generatePOTokens(
+    contentPoToken = await generatePOToken(
       id,
-      webInnertube.session.context.client.visitorData,
       JSON.stringify(webInnertube.session.context)
-    ))
-    webInnertube.session.po_token = contentPoToken
-    webInnertube.session.player.po_token = sessionPoToken
+    )
+    webInnertube.session.player.po_token = contentPoToken
   }
 
   let clientName = webInnertube.session.context.client.clientName