From af7842f77cd3f3cf47542292cd4c49bcd93aa7e7 Mon Sep 17 00:00:00 2001
From: WardPearce <wardpearce@pm.me>
Date: Wed, 25 Sep 2024 20:30:41 +1200
Subject: [PATCH] Reload page on android on launch to fix nodejs load issue

---
 materialious/android/app/build.gradle           | 4 ++--
 materialious/electron/package.json              | 2 +-
 materialious/package.json                       | 2 +-
 materialious/src/lib/patches/androidRequests.ts | 6 +-----
 materialious/src/lib/patches/poTokenAndroid.ts  | 9 +++++----
 update_versions.py                              | 2 +-
 6 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/materialious/android/app/build.gradle b/materialious/android/app/build.gradle
index aaee9576..5433d296 100644
--- a/materialious/android/app/build.gradle
+++ b/materialious/android/app/build.gradle
@@ -7,8 +7,8 @@ android {
         applicationId "us.materialio.app"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 49
-        versionName "1.5.8"
+        versionCode 50
+        versionName "1.5.9"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         aaptOptions {
              // Files and dirs to omit from the packaged assets dir, modified to accommodate modern web apps.
diff --git a/materialious/electron/package.json b/materialious/electron/package.json
index f3ca9fd7..64207f21 100644
--- a/materialious/electron/package.json
+++ b/materialious/electron/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "Materialious",
-	"version": "1.5.8",
+	"version": "1.5.9",
 	"description": "Modern material design for Invidious.",
 	"author": {
 		"name": "Ward Pearce",
diff --git a/materialious/package.json b/materialious/package.json
index bf03cb1f..71bc2f91 100644
--- a/materialious/package.json
+++ b/materialious/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "materialious",
-	"version": "1.5.8",
+	"version": "1.5.9",
 	"private": true,
 	"scripts": {
 		"dev": "vite dev",
diff --git a/materialious/src/lib/patches/androidRequests.ts b/materialious/src/lib/patches/androidRequests.ts
index 5d7a9a91..38905886 100644
--- a/materialious/src/lib/patches/androidRequests.ts
+++ b/materialious/src/lib/patches/androidRequests.ts
@@ -1,6 +1,5 @@
 import { goto } from "$app/navigation";
 import { Capacitor } from "@capacitor/core";
-import { NodeJS } from 'capacitor-nodejs';
 
 if (Capacitor.getPlatform() === 'android') {
   const originalFetch = window.fetch;
@@ -52,8 +51,5 @@ if (Capacitor.getPlatform() === 'android') {
     return originalXhrOpen.apply(this, args);
   };
 
-  // Must reload page after patches
-  NodeJS.whenReady().then(() => {
-    goto('/', { replaceState: true });
-  });
+  setTimeout(() => goto('/', { replaceState: true }), 300);
 }
diff --git a/materialious/src/lib/patches/poTokenAndroid.ts b/materialious/src/lib/patches/poTokenAndroid.ts
index 0d0533c9..d003e2a0 100644
--- a/materialious/src/lib/patches/poTokenAndroid.ts
+++ b/materialious/src/lib/patches/poTokenAndroid.ts
@@ -108,15 +108,16 @@ attemptClickPlayButton();
     InAppBrowser.addListener('closeEvent', closeListener);
     InAppBrowser.addListener('urlChangeEvent', urlChangeListener);
 
-    setTimeout(() => {
+    setTimeout(async () => {
       reject(new Error('Timeout trying to pull Po tokens'));
-      InAppBrowser.removeAllListeners();
-    }, 30000);
+      await InAppBrowser.removeAllListeners();
+      await InAppBrowser.close();
+    }, 60000);
 
     InAppBrowser.openWebView({
       url: 'https://www.youtube.com/embed/jNQXAC9IVRw',
       title: 'Pulling po tokens (This may take a moment)',
-      headers: headers
+      headers: headers,
     });
   });
 }
diff --git a/update_versions.py b/update_versions.py
index 79c61f97..2644a2b6 100644
--- a/update_versions.py
+++ b/update_versions.py
@@ -5,7 +5,7 @@ import json
 import os
 import re
 
-LATEST_VERSION = "1.5.8"
+LATEST_VERSION = "1.5.9"
 WORKING_DIR = os.path.join(os.path.dirname(os.path.realpath(__file__)), "materialious")
 
 ROOT_PACKAGE = os.path.join(WORKING_DIR, "package.json")