mobile: fix sync on iOS

apps/mobile/app/package.json

@@ -17,13 +17,11 @@
     "phone": "^3.1.14",
     "qclone": "^1.2.0",
     "react-native-actions-sheet": "0.9.7",
-    "react-native-check-version": "https://github.com/flexible-agency/react-native-check-version",
     "react-native-drax": "^0.10.2",
     "react-native-image-zoom-viewer": "^3.0.1",
     "react-native-keyboard-aware-scroll-view": "^0.9.5",
     "react-native-progress": "^5.0.0",
     "react-native-qrcode-svg": "^6.0.6",
-    "react-native-reanimated-material-menu": "github:ammarahm-ed/react-native-reanimated-material-menu",
     "react-native-reanimated-progress-bar": "1.0.1",
     "react-native-swiper-flatlist": "3.2.2",
     "timeago.js": "4.0.2",
@@ -43,7 +41,9 @@
     "pathe": "1.1.2",
     "react-native-format-currency": "0.0.5",
     "@lingui/react": "4.11.2",
-    "@lingui/core": "4.11.2"
+    "@lingui/core": "4.11.2",
+    "react-native-check-version": "^1.3.0",
+    "react-native-reanimated-material-menu": "github:ammarahm-ed/react-native-reanimated-material-menu"
   },
   "sideEffects": false
 }

apps/mobile/app/services/background-sync.ts

@@ -30,24 +30,12 @@ import SettingsService from "./settings";
 
 async function doInBackground(callback: () => Promise<void>) {
   if (Platform.OS === "ios") {
-    try {
-      const bgTaskId = await beginBackgroundTask();
-      const result = await callback();
-      await endBackgroundTask(bgTaskId);
-      return result;
-    } catch (e) {
-      return (e as Error).message;
-    }
+    const bgTaskId = await beginBackgroundTask();
+    const result = await callback();
+    await endBackgroundTask(bgTaskId);
+    return result;
   } else {
-    // eslint-disable-next-line no-async-promise-executor
-    return new Promise(async (resolve) => {
-      try {
-        const result = await callback();
-        resolve(result);
-      } catch (e) {
-        resolve((e as Error).message);
-      }
-    });
+    return await callback();
   }
 }
 

apps/mobile/app/services/biometrics.ts

@@ -20,7 +20,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 import { Platform } from "react-native";
 import FingerprintScanner, {
   AuthenticateIOS
-} from "react-native-fingerprint-scanner";
+} from "@ammarahmed/react-native-fingerprint-scanner";
 import * as Keychain from "react-native-keychain";
 import { MMKV } from "../common/database/mmkv";
 import Storage from "../common/database/storage";

apps/mobile/native/ios/Notesnook.xcodeproj/project.pbxproj

@@ -1744,7 +1744,10 @@
 				ONLY_ACTIVE_ARCH = YES;
 				OTHER_CFLAGS = "$(inherited)";
 				OTHER_CPLUSPLUSFLAGS = "$(inherited)";
-				OTHER_LDFLAGS = "$(inherited)  ";
+				OTHER_LDFLAGS = (
+					"$(inherited)",
+					" ",
+				);
 				REACT_NATIVE_PATH = "${PODS_ROOT}/../../../node_modules/react-native";
 				SDKROOT = iphoneos;
 				USE_HERMES = true;
@@ -1808,7 +1811,10 @@
 				ONLY_ACTIVE_ARCH = NO;
 				OTHER_CFLAGS = "$(inherited)";
 				OTHER_CPLUSPLUSFLAGS = "$(inherited)";
-				OTHER_LDFLAGS = "$(inherited)  ";
+				OTHER_LDFLAGS = (
+					"$(inherited)",
+					" ",
+				);
 				REACT_NATIVE_PATH = "${PODS_ROOT}/../../../node_modules/react-native";
 				SDKROOT = iphoneos;
 				USE_HERMES = true;

apps/mobile/native/ios/Podfile.lock

@@ -970,6 +970,8 @@ PODS:
     - React
   - react-native-background-actions (2.6.7):
     - React-Core
+  - react-native-begin-background-task (0.1.0):
+    - React
   - react-native-blob-util (0.18.3):
     - React-Core
   - react-native-config (1.5.1):
@@ -981,7 +983,7 @@ PODS:
   - react-native-document-picker (7.1.3):
     - React-Core
   - react-native-fingerprint-scanner (5.0.0):
-    - React
+    - React-Core
   - react-native-get-random-values (1.9.0):
     - React-Core
   - react-native-gzip (1.1.0):
@@ -1486,11 +1488,12 @@ DEPENDENCIES:
   - React-Mapbuffer (from `../../node_modules/react-native/ReactCommon`)
   - react-native-actions-shortcuts (from `../../node_modules/react-native-actions-shortcuts`)
   - react-native-background-actions (from `../../node_modules/react-native-background-actions`)
+  - react-native-begin-background-task (from `../../node_modules/react-native-begin-background-task`)
   - react-native-blob-util (from `../../node_modules/react-native-blob-util`)
   - react-native-config (from `../../node_modules/react-native-config`)
   - react-native-date-picker (from `../../node_modules/react-native-date-picker`)
   - react-native-document-picker (from `../../node_modules/react-native-document-picker`)
-  - react-native-fingerprint-scanner (from `../../node_modules/react-native-fingerprint-scanner`)
+  - "react-native-fingerprint-scanner (from `../../node_modules/@ammarahmed/react-native-fingerprint-scanner`)"
   - react-native-get-random-values (from `../../node_modules/react-native-get-random-values`)
   - react-native-gzip (from `../../node_modules/react-native-gzip`)
   - react-native-html-to-pdf-lite (from `../../node_modules/react-native-html-to-pdf-lite`)
@@ -1642,6 +1645,8 @@ EXTERNAL SOURCES:
     :path: "../../node_modules/react-native-actions-shortcuts"
   react-native-background-actions:
     :path: "../../node_modules/react-native-background-actions"
+  react-native-begin-background-task:
+    :path: "../../node_modules/react-native-begin-background-task"
   react-native-blob-util:
     :path: "../../node_modules/react-native-blob-util"
   react-native-config:
@@ -1651,7 +1656,7 @@ EXTERNAL SOURCES:
   react-native-document-picker:
     :path: "../../node_modules/react-native-document-picker"
   react-native-fingerprint-scanner:
-    :path: "../../node_modules/react-native-fingerprint-scanner"
+    :path: "../../node_modules/@ammarahmed/react-native-fingerprint-scanner"
   react-native-get-random-values:
     :path: "../../node_modules/react-native-get-random-values"
   react-native-gzip:
@@ -1833,11 +1838,12 @@ SPEC CHECKSUMS:
   React-Mapbuffer: 6c1cacdbf40b531f549eba249e531a7d0bfd8e7f
   react-native-actions-shortcuts: 5d9cf0c9c308333dfcc1e05c3f9afa8c428e2533
   react-native-background-actions: 2c251c986f23347f9c1722f05fd296938f60edb1
+  react-native-begin-background-task: 3b889e07458afc5822a7277cf9cbc7cd077e39ee
   react-native-blob-util: 2d36383bb52c15c5451be81cb7ddf22bc34a12a6
   react-native-config: 86038147314e2e6d10ea9972022aa171e6b1d4d8
   react-native-date-picker: 93e43b3084cea595b4d68b1405d6d99849663bd6
   react-native-document-picker: ec07866a30707f23660c0f3ae591d669d3e89096
-  react-native-fingerprint-scanner: 3e8c46641b5751a31f45e66789d4b6f342be5e6d
+  react-native-fingerprint-scanner: be63e626b31fb951780a5fac5328b065a61a3d6e
   react-native-get-random-values: dee677497c6a740b71e5612e8dbd83e7539ed5bb
   react-native-gzip: c5e87ee9e359f02350e3a2ee52eb35eddc398868
   react-native-html-to-pdf-lite: 21bfb169bf4cbcd7bec9f736975ee1b3f5292d4a

apps/mobile/native/package.json

@@ -25,7 +25,6 @@
     "react-native": "0.74.5",
     "react-native-actions-shortcuts": "^1.0.1",
     "react-native-background-actions": "^2.6.6",
-    "react-native-begin-background-task": "https://github.com/blockfirm/react-native-begin-background-task.git",
     "react-native-blob-util": "^0.18.3",
     "react-native-bootsplash": "4.1.4",
     "react-native-config": "^1.4.6",
@@ -33,9 +32,7 @@
     "react-native-device-info": "^8.4.1",
     "react-native-document-picker": "^7.1.1",
     "@ammarahmed/react-native-eventsource": "1.1.0",
-    "react-native-exit-app": "https://github.com/ammarahm-ed/react-native-exit-app.git",
     "react-native-file-viewer": "^2.1.1",
-    "react-native-fingerprint-scanner": "https://github.com/ammarahm-ed/react-native-fingerprint-scanner.git",
     "react-native-gesture-handler": "^2.18.0",
     "react-native-reanimated": "3.14.0",
     "react-native-safe-area-context": "^4.10.8",
@@ -52,9 +49,7 @@
     "react-native-modal-datetime-picker": "14.0.0",
     "react-native-navigation-bar-color": "2.0.2",
     "react-native-notification-sounds": "0.5.5",
-    "react-native-orientation": "https://github.com/yamill/react-native-orientation.git",
     "react-native-pdf": "6.6.2",
-    "react-native-privacy-snapshot": "github:standardnotes/react-native-privacy-snapshot",
     "react-native-scoped-storage": "^1.9.5",
     "react-native-securerandom": "^1.0.1",
     "react-native-share": "^7.2.0",
@@ -70,13 +65,18 @@
     "react-native-screenguard": "^1.0.0",
     "@formatjs/intl-locale": "4.0.0",
     "@formatjs/intl-pluralrules": "5.2.14",
-    "detox": "^20.27.6",
     "@ammarahmed/react-native-share-extension": "^2.6.0",
     "@ammarahmed/react-native-sodium": "1.5.6",
     "react-native-mmkv-storage": "^0.10.2",
-    "@react-native-community/datetimepicker": "^8.2.0"
+    "@react-native-community/datetimepicker": "^8.2.0",
+    "react-native-exit-app": "github:ammarahm-ed/react-native-exit-app",
+    "react-native-orientation": "github:yamill/react-native-orientation",
+    "react-native-begin-background-task": "github:blockfirm/react-native-begin-background-task",
+    "react-native-privacy-snapshot": "github:standardnotes/react-native-privacy-snapshot",
+    "@ammarahmed/react-native-fingerprint-scanner": "^5.0.0"
   },
   "devDependencies": {
+    "detox": "^20.27.6",
     "@babel/core": "^7.20.0",
     "@babel/eslint-parser": "^7.16.5",
     "@babel/plugin-transform-named-capturing-groups-regex": "^7.16.5",

apps/mobile/patches/react-native-fingerprint-scanner+5.0.0.patch

@@ -1,11 +0,0 @@
-diff --git a/node_modules/react-native-fingerprint-scanner/android/build.gradle b/node_modules/react-native-fingerprint-scanner/android/build.gradle
-index eaf3829..6c392ba 100644
---- a/node_modules/react-native-fingerprint-scanner/android/build.gradle
-+++ b/node_modules/react-native-fingerprint-scanner/android/build.gradle
-@@ -49,5 +49,5 @@ dependencies {
-     // 1.2.3 is the minimum version compatible with androidx.
-     // See https://github.com/uccmawei/FingerprintIdentify/issues/74
-     // (translation https://translate.google.com/translate?sl=zh-CN&tl=en&u=https://github.com/uccmawei/FingerprintIdentify/issues/74)
--    implementation "com.wei.android.lib:fingerprintidentify:${safeExtGet("fingerprintidentify", "1.2.6")}"
-+    implementation "com.github.uccmawei:FingerprintIdentify:1.2.6"
- }