From d83da82629f65ae0e7f20529b2640f2e6085bec8 Mon Sep 17 00:00:00 2001
From: Reckless_Satoshi <reckless.satoshi@protonmail.com>
Date: Tue, 23 May 2023 04:31:57 -0700
Subject: [PATCH] Remove v8

---
 .../src/main/java/com/robosats/MainApplication.java  | 12 ------------
 mobile/android/build.gradle                          |  8 ++++++++
 mobile/package-lock.json                             |  4 +---
 mobile/package.json                                  |  4 +---
 4 files changed, 10 insertions(+), 18 deletions(-)

diff --git a/mobile/android/app/src/main/java/com/robosats/MainApplication.java b/mobile/android/app/src/main/java/com/robosats/MainApplication.java
index 1d289c84..6536347b 100644
--- a/mobile/android/app/src/main/java/com/robosats/MainApplication.java
+++ b/mobile/android/app/src/main/java/com/robosats/MainApplication.java
@@ -9,13 +9,10 @@ import com.facebook.react.ReactNativeHost;
 import com.facebook.react.ReactPackage;
 import com.facebook.react.config.ReactFeatureFlags;
 import com.facebook.soloader.SoLoader;
-import com.facebook.react.bridge.JavaScriptExecutorFactory;
-import com.facebook.react.modules.systeminfo.AndroidInfoHelpers;
 import android.webkit.WebView;
 import com.robosats.newarchitecture.MainApplicationReactNativeHost;
 import java.lang.reflect.InvocationTargetException;
 import java.util.List;
-import io.csie.kudo.reactnative.v8.executor.V8ExecutorFactory;
 
 public class MainApplication extends Application implements ReactApplication {
 
@@ -39,15 +36,6 @@ public class MainApplication extends Application implements ReactApplication {
         protected String getJSMainModuleName() {
           return "index";
         }
-
-        @Override
-        protected JavaScriptExecutorFactory getJavaScriptExecutorFactory() {
-          return new V8ExecutorFactory(
-              getApplicationContext(),
-              getPackageName(),
-              AndroidInfoHelpers.getFriendlyDeviceName(),
-              getUseDeveloperSupport());
-        }
       };
 
   private final ReactNativeHost mNewArchitectureNativeHost =
diff --git a/mobile/android/build.gradle b/mobile/android/build.gradle
index 239b1536..3771ce8f 100644
--- a/mobile/android/build.gradle
+++ b/mobile/android/build.gradle
@@ -20,6 +20,14 @@ buildscript {
         }
     }
     repositories {
+        maven {
+            // Replace AAR from original RN with AAR from react-native-v8
+            url("$rootDir/../node_modules/react-native-v8/dist")
+        }
+        maven {
+            // prebuilt libv8android.so
+            url("$rootDir/../node_modules/v8-android/dist")
+         }
         google()
         mavenCentral()
     }
diff --git a/mobile/package-lock.json b/mobile/package-lock.json
index 08b8c398..ace0b5e3 100644
--- a/mobile/package-lock.json
+++ b/mobile/package-lock.json
@@ -14,9 +14,7 @@
         "react-native": "^0.71.8",
         "react-native-encrypted-storage": "^4.0.3",
         "react-native-tor": "^0.1.8",
-        "react-native-v8": "^2.1.3",
-        "react-native-webview": "^12.1.0",
-        "v8-android-nointl": "^11.110.1"
+        "react-native-webview": "^12.1.0"
       },
       "devDependencies": {
         "@babel/core": "^7.21.4",
diff --git a/mobile/package.json b/mobile/package.json
index 2ee2147a..014527f1 100644
--- a/mobile/package.json
+++ b/mobile/package.json
@@ -18,9 +18,7 @@
     "react-native": "^0.71.8",
     "react-native-encrypted-storage": "^4.0.3",
     "react-native-tor": "^0.1.8",
-    "react-native-v8": "^2.1.3",
-    "react-native-webview": "^12.1.0",
-    "v8-android-nointl": "^11.110.1"
+    "react-native-webview": "^12.1.0"
   },
   "devDependencies": {
     "@babel/core": "^7.21.4",