From 51858199fd44ffbde8d4a501c180ab13bb22befd Mon Sep 17 00:00:00 2001
From: ammarahm-ed <ammarahmed6506@gmail.com>
Date: Tue, 24 Jan 2023 19:08:46 +0500
Subject: [PATCH] mobile: update

---
 .../screens/settings/gecko-view-loader.tsx    | 116 ++++++++++--------
 apps/mobile/native/android/app/build.gradle   |  22 ++--
 .../native/android/geckoview/build.gradle     |  14 ++-
 .../geckoview/src/main/AndroidManifest.xml    |   2 +-
 apps/mobile/package.json                      |   2 +-
 5 files changed, 85 insertions(+), 71 deletions(-)

diff --git a/apps/mobile/app/screens/settings/gecko-view-loader.tsx b/apps/mobile/app/screens/settings/gecko-view-loader.tsx
index 778be9aa5..1a43d818e 100644
--- a/apps/mobile/app/screens/settings/gecko-view-loader.tsx
+++ b/apps/mobile/app/screens/settings/gecko-view-loader.tsx
@@ -49,62 +49,70 @@ export const GeckoViewLoader = () => {
       }}
     >
       <>
-          <Paragraph
-            style={{ marginTop: 10,marginBottom:10 }}
-            color={colors.icon}
-            size={SIZE.sm}
-          >
-            {installed
-              ? "GeckoView is already downloaded & installed on this device."
-              : "Installing GeckoView will download additional data on your phone."}
-          </Paragraph>
-        {!installed ? (
-          <Button
-            title="Install GeckoView"
-            type="accent"
-            style={{
-              borderRadius: 100,
-              width: 250,
-              alignSelf: "flex-start"
-            }}
-            onPress={async () => {
-              try {
-                await SplitModuleLoader.installModule("geckoview");
-                SettingsService.set({
-                  useGeckoView: true
-                });
-              } catch (e) {
-                ToastEvent.error(e as Error);
-              }
-            }}
-          />
+        <Paragraph
+          style={{ marginTop: 10, marginBottom: 10 }}
+          color={colors.icon}
+          size={SIZE.sm}
+        >
+          {installed
+            ? "GeckoView is already downloaded & installed on this device."
+            : "Installing GeckoView will download additional data on your phone."}
+        </Paragraph>
+
+        {state?.status === "downloading" ||
+        state?.status === "installing" ||
+        state?.status === "pending" ? (
+          <Paragraph>Installing</Paragraph>
         ) : (
-          <Button
-            title={enabled ? "Disable GeckoView" : "Enable GeckoView"}
-            type="accent"
-            style={{
-              borderRadius: 100,
-              width: 250,
-              alignSelf: "flex-start"
-            }}
-            onPress={() => {
-              SettingsService.set({
-                useGeckoView: !enabled
-              });
-            }}
-          />
+          <>
+            {!installed ? (
+              <Button
+                title="Install GeckoView"
+                type="accent"
+                style={{
+                  borderRadius: 100,
+                  width: 250,
+                  alignSelf: "flex-start"
+                }}
+                onPress={async () => {
+                  try {
+                    await SplitModuleLoader.installModule("geckoview");
+                    SettingsService.set({
+                      useGeckoView: true
+                    });
+                  } catch (e) {
+                    ToastEvent.error(e as Error);
+                  }
+                }}
+              />
+            ) : (
+              <Button
+                title={enabled ? "Disable GeckoView" : "Enable GeckoView"}
+                type="accent"
+                style={{
+                  borderRadius: 100,
+                  width: 250,
+                  alignSelf: "flex-start"
+                }}
+                onPress={() => {
+                  SettingsService.set({
+                    useGeckoView: !enabled
+                  });
+                }}
+              />
+            )}
+          </>
         )}
-        {!installed && state
-          ? Object.keys(state).map((key) => {
-              <Paragraph
-                style={{ marginTop: 10 }}
-                color={colors.icon}
-                size={SIZE.xs + 1}
-              >
-                {key.toUpperCase()}: {state[key as never]}
-              </Paragraph>;
-            })
-          : null}
+
+        {state ? (
+          <Paragraph
+            style={{ marginTop: 10 }}
+            color={colors.icon}
+            size={SIZE.xs + 1}
+          >
+            {state.status}
+          </Paragraph>
+        ) : null}
       </>
     </View>
   );
diff --git a/apps/mobile/native/android/app/build.gradle b/apps/mobile/native/android/app/build.gradle
index 177cc6c13..a58d71f1c 100644
--- a/apps/mobile/native/android/app/build.gradle
+++ b/apps/mobile/native/android/app/build.gradle
@@ -160,7 +160,7 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled true
-        versionCode 2028 + 1048576 * 4
+        versionCode 2029 + 1048576 * 4
         versionName getNpmVersion()
         testBuildType System.getProperty('testBuildType', 'debug')
         testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
@@ -289,18 +289,18 @@ android {
 
     if (!isGeckoEnabled()) {
         packagingOptions {
-                exclude "lib/**/libmozglue.so"
+                //exclude "lib/**/libmozglue.so"
                 exclude "lib/**/libxul.so"
-                exclude "lib/**/libnss3.so"
-                exclude "lib/**/libnssckbi.so"
-                exclude "lib/**/libmozavutil.so"
-                exclude "lib/**/libsoftokn3.so"
-                exclude "lib/**/libmozavcodec.so"
-                exclude "lib/**/libipcclientcerts.so"
-                exclude "lib/**/libfreebl3.so"
-                exclude "lib/**/libplugin-container.so"
+                // exclude "lib/**/libnss3.so"
+                // exclude "lib/**/libnssckbi.so"
+                // exclude "lib/**/libmozavutil.so"
+                // exclude "lib/**/libsoftokn3.so"
+                // exclude "lib/**/libmozavcodec.so"
+                // exclude "lib/**/libipcclientcerts.so"
+                // exclude "lib/**/libfreebl3.so"
+                // exclude "lib/**/libplugin-container.so"
                 //exclude "lib/**/liblgpllibs.so"
-    }
+        }
     }
 
       
diff --git a/apps/mobile/native/android/geckoview/build.gradle b/apps/mobile/native/android/geckoview/build.gradle
index 48b0791cc..11144bfdd 100644
--- a/apps/mobile/native/android/geckoview/build.gradle
+++ b/apps/mobile/native/android/geckoview/build.gradle
@@ -30,10 +30,16 @@ android {
     }
     
     packagingOptions {
-        exclude "lib/**/liblgpllibs.so"
-        jniLibs {
-            useLegacyPackaging = true
-        }
+                exclude "lib/**/liblgpllibs.so"
+                exclude "lib/**/libmozglue.so"
+                exclude "lib/**/libnss3.so"
+                exclude "lib/**/libnssckbi.so"
+                exclude "lib/**/libmozavutil.so"
+                exclude "lib/**/libsoftokn3.so"
+                exclude "lib/**/libmozavcodec.so"
+                exclude "lib/**/libipcclientcerts.so"
+                exclude "lib/**/libfreebl3.so"
+                exclude "lib/**/libplugin-container.so"
     }
     configurations {
         extractSO
diff --git a/apps/mobile/native/android/geckoview/src/main/AndroidManifest.xml b/apps/mobile/native/android/geckoview/src/main/AndroidManifest.xml
index 225618363..3a71f9c85 100644
--- a/apps/mobile/native/android/geckoview/src/main/AndroidManifest.xml
+++ b/apps/mobile/native/android/geckoview/src/main/AndroidManifest.xml
@@ -14,6 +14,6 @@ split="geckoview-module">
     <dist:fusing dist:include="true" />
 </dist:module>
 
-<application android:extractNativeLibs="true" android:hasCode="false">
+<application android:hasCode="false">
 </application>
 </manifest>
diff --git a/apps/mobile/package.json b/apps/mobile/package.json
index 95e7a28bc..1ed0d54eb 100644
--- a/apps/mobile/package.json
+++ b/apps/mobile/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@notesnook/mobile",
-  "version": "2.4.5",
+  "version": "2.4.6",
   "private": true,
   "license": "GPL-3.0-or-later",
   "workspaces": [