A fully open source & end-to-end encrypted note taking alternative to Evernote.
TypeScript asp-net-coredotnet-coreelectronfosshacktoberfestnote-managmentnote-takingnote-taking-appnotebooknotesnotes-appopen-sourceopensourceprivacyproductivityreactreact-nativereactjsself-hosted
mobile: fix app crash on android 15 & 16
Ammar Ahmed0c2d57716d37
diff --git a/apps/mobile/app/components/header/index.tsx b/apps/mobile/app/components/header/index.tsxindex 24762c2ca..5b64d97f3 100644--- a/apps/mobile/app/components/header/index.tsx+++ b/apps/mobile/app/components/header/index.tsx@@ -97,7 +97,6 @@ export const Header = ({style={{flexDirection: "row",justifyContent: "space-between",- marginTop: DefaultAppStyles.GAP_SMALL,borderRadius: 10,paddingVertical: 3,borderWidth: hasSearch ? 1 : 0,diff --git a/apps/mobile/app/screens/note-preview-configure/index.tsx b/apps/mobile/app/screens/note-preview-configure/index.tsxindex 1192a1fe9..0428aa37d 100644--- a/apps/mobile/app/screens/note-preview-configure/index.tsx+++ b/apps/mobile/app/screens/note-preview-configure/index.tsx@@ -29,6 +29,7 @@ import useGlobalSafeAreaInsets from "../../hooks/use-global-safe-area-insets";import { useSettingStore } from "../../stores/use-setting-store";import { NotesnookModule } from "../../utils/notesnook-module";import { DefaultAppStyles } from "../../utils/styles";+import { SafeAreaView } from "react-native-safe-area-context";const NoteItem = (props: {id: string | number;@@ -111,7 +112,7 @@ export const NotePreviewConfigure = () => {);return (- <View+ <SafeAreaViewstyle={{backgroundColor: colors.primary.background,flex: 1@@ -165,6 +166,6 @@ export const NotePreviewConfigure = () => {ListFooterComponent={<View style={{ height: 200 }} />}/></View>- </View>+ </SafeAreaView>);};diff --git a/apps/mobile/native/android/app/src/main/AndroidManifest.xml b/apps/mobile/native/android/app/src/main/AndroidManifest.xmlindex ca9a03dd1..9326d6996 100644--- a/apps/mobile/native/android/app/src/main/AndroidManifest.xml+++ b/apps/mobile/native/android/app/src/main/AndroidManifest.xml@@ -60,15 +60,6 @@android:largeHeap="true"android:supportsRtl="true"android:networkSecurityConfig="@xml/network_security_config">-- <receiver android:exported="false" android:label="@string/reminders_title" android:name=".ReminderWidgetProvider">- <intent-filter>- <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />- </intent-filter>- <meta-data- android:name="android.appwidget.provider"- android:resource="@xml/widget_reminders_info" />- </receiver><receiver android:exported="false" android:label="@string/quick_note" android:name=".NoteWidget"><intent-filter>@@ -90,6 +81,15 @@android:resource="@xml/note_widget_info" /></receiver>+ <receiver android:exported="false" android:label="@string/reminders_title" android:name=".ReminderWidgetProvider">+ <intent-filter>+ <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />+ </intent-filter>+ <meta-data+ android:name="android.appwidget.provider"+ android:resource="@xml/widget_reminders_info" />+ </receiver>+<activity android:configChanges="keyboard|keyboardHidden|orientation|screenLayout|screenSize|smallestScreenSize|uiMode"android:label="NotePreviewConfigure"android:launchMode="singleTask"diff --git a/apps/mobile/native/android/app/src/main/java/com/streetwriters/notesnook/NotePreviewWidget.java b/apps/mobile/native/android/app/src/main/java/com/streetwriters/notesnook/NotePreviewWidget.javaindex a6116d8ae..9ebb4d993 100644--- a/apps/mobile/native/android/app/src/main/java/com/streetwriters/notesnook/NotePreviewWidget.java+++ b/apps/mobile/native/android/app/src/main/java/com/streetwriters/notesnook/NotePreviewWidget.java@@ -48,7 +48,8 @@ public class NotePreviewWidget extends AppWidgetProvider {private static Bundle getActivityOptionsBundle() {if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE) {ActivityOptions activityOptions = ActivityOptions.makeBasic();- activityOptions.setPendingIntentBackgroundActivityStartMode(ActivityOptions.MODE_BACKGROUND_ACTIVITY_START_ALLOWED);+ activityOptions.setPendingIntentCreatorBackgroundActivityStartMode(+ ActivityOptions.MODE_BACKGROUND_ACTIVITY_START_ALLOWED);return activityOptions.toBundle();} elsereturn null;diff --git a/apps/mobile/native/android/app/src/main/java/com/streetwriters/notesnook/NoteWidget.java b/apps/mobile/native/android/app/src/main/java/com/streetwriters/notesnook/NoteWidget.javaindex 99026f6a8..6207f5ef1 100644--- a/apps/mobile/native/android/app/src/main/java/com/streetwriters/notesnook/NoteWidget.java+++ b/apps/mobile/native/android/app/src/main/java/com/streetwriters/notesnook/NoteWidget.java@@ -31,7 +31,8 @@ public class NoteWidget extends AppWidgetProvider {private static Bundle getActivityOptionsBundle() {if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE) {ActivityOptions activityOptions = ActivityOptions.makeBasic();- activityOptions.setPendingIntentBackgroundActivityStartMode(ActivityOptions.MODE_BACKGROUND_ACTIVITY_START_ALLOWED);+ activityOptions.setPendingIntentCreatorBackgroundActivityStartMode(+ ActivityOptions.MODE_BACKGROUND_ACTIVITY_START_ALLOWED);return activityOptions.toBundle();} elsereturn null;diff --git a/apps/mobile/native/android/app/src/main/java/com/streetwriters/notesnook/ReminderWidgetProvider.java b/apps/mobile/native/android/app/src/main/java/com/streetwriters/notesnook/ReminderWidgetProvider.javaindex 1b0faf560..8c8300958 100644--- a/apps/mobile/native/android/app/src/main/java/com/streetwriters/notesnook/ReminderWidgetProvider.java+++ b/apps/mobile/native/android/app/src/main/java/com/streetwriters/notesnook/ReminderWidgetProvider.java@@ -26,7 +26,8 @@ public class ReminderWidgetProvider extends AppWidgetProvider {private static Bundle getActivityOptionsBundle() {if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE) {ActivityOptions activityOptions = ActivityOptions.makeBasic();- activityOptions.setPendingIntentBackgroundActivityStartMode(ActivityOptions.MODE_BACKGROUND_ACTIVITY_START_ALLOWED);+ activityOptions.setPendingIntentCreatorBackgroundActivityStartMode(+ ActivityOptions.MODE_BACKGROUND_ACTIVITY_START_ALLOWED);return activityOptions.toBundle();} elsereturn null;diff --git a/apps/mobile/native/package.json b/apps/mobile/native/package.jsonindex 12cb4e330..344b4d653 100644--- a/apps/mobile/native/package.json+++ b/apps/mobile/native/package.json@@ -66,7 +66,7 @@"react-native-screenguard": "^1.0.0","@formatjs/intl-locale": "4.0.0","@formatjs/intl-pluralrules": "5.2.14",- "@ammarahmed/react-native-sodium": "^1.6.3",+ "@ammarahmed/react-native-sodium": "^1.6.4","@react-native-community/datetimepicker": "^8.2.0","react-native-exit-app": "github:ammarahm-ed/react-native-exit-app","react-native-begin-background-task": "github:blockfirm/react-native-begin-background-task",diff --git a/apps/mobile/package-lock.json b/apps/mobile/package-lock.jsonindex 75662f893..1901e96d3 100644--- a/apps/mobile/package-lock.json+++ b/apps/mobile/package-lock.json@@ -14,7 +14,6 @@"app/"],"dependencies": {- "@ammarahmed/react-native-sodium": "^1.6.3","@notesnook/common": "file:../../packages/common","@notesnook/core": "file:../../packages/core","@notesnook/crypto": "file:../../packages/crypto",@@ -28325,7 +28324,7 @@"@ammarahmed/react-native-eventsource": "1.1.0","@ammarahmed/react-native-fingerprint-scanner": "^5.0.0","@ammarahmed/react-native-share-extension": "^2.9.0",- "@ammarahmed/react-native-sodium": "^1.6.3",+ "@ammarahmed/react-native-sodium": "^1.6.4","@bam.tech/react-native-image-resizer": "3.0.11","@callstack/repack": "~5.1.2","@formatjs/intl-locale": "4.0.0",@@ -28479,9 +28478,9 @@}},"node_modules/@ammarahmed/react-native-sodium": {- "version": "1.6.3",- "resolved": "https://registry.npmjs.org/@ammarahmed/react-native-sodium/-/react-native-sodium-1.6.3.tgz",- "integrity": "sha512-TnJqAa/c3MmWouD4q32VR03JI4TgXqUarzBOrRk3tcX91JVsG2UnuPUHK3iRzyLI7/mBiLdMR4XBdzoy+oXmjw==",+ "version": "1.6.4",+ "resolved": "https://registry.npmjs.org/@ammarahmed/react-native-sodium/-/react-native-sodium-1.6.4.tgz",+ "integrity": "sha512-+OIBABV/8IPXVQPRxiub0WW86X/bs14GHnQ1VqtxWGv7phwfyOVzi9c1/LDeRqjCDKBAYHOv2a5PLHZb2RzeGw==","license": "ISC"},"node_modules/@ampproject/remapping": {diff --git a/apps/mobile/package.json b/apps/mobile/package.jsonindex 1f8056dc0..ffd6bb168 100644--- a/apps/mobile/package.json+++ b/apps/mobile/package.json@@ -54,7 +54,6 @@"@types/validator": "^13.12.2","diffblazer": "^1.0.1","react": "18.2.0",- "react-native": "0.77.2",- "@ammarahmed/react-native-sodium": "^1.6.3"+ "react-native": "0.77.2"}}diff --git a/apps/mobile/patches/react-native-pdf+6.7.7.patch b/apps/mobile/patches/react-native-pdf+6.7.7.patchnew file mode 100644index 000000000..444398983--- /dev/null+++ b/apps/mobile/patches/react-native-pdf+6.7.7.patch@@ -0,0 +1,38 @@+diff --git a/node_modules/react-native-pdf/android/.gradle/5.6.1/fileChanges/last-build.bin b/node_modules/react-native-pdf/android/.gradle/5.6.1/fileChanges/last-build.bin+deleted file mode 100644+index f76dd23..0000000+Binary files a/node_modules/react-native-pdf/android/.gradle/5.6.1/fileChanges/last-build.bin and /dev/null differ+diff --git a/node_modules/react-native-pdf/android/.gradle/5.6.1/fileHashes/fileHashes.lock b/node_modules/react-native-pdf/android/.gradle/5.6.1/fileHashes/fileHashes.lock+deleted file mode 100644+index 52d8866..0000000+Binary files a/node_modules/react-native-pdf/android/.gradle/5.6.1/fileHashes/fileHashes.lock and /dev/null differ+diff --git a/node_modules/react-native-pdf/android/.gradle/5.6.1/gc.properties b/node_modules/react-native-pdf/android/.gradle/5.6.1/gc.properties+deleted file mode 100644+index e69de29..0000000+diff --git a/node_modules/react-native-pdf/android/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/node_modules/react-native-pdf/android/.gradle/buildOutputCleanup/buildOutputCleanup.lock+deleted file mode 100644+index 1508dc9..0000000+Binary files a/node_modules/react-native-pdf/android/.gradle/buildOutputCleanup/buildOutputCleanup.lock and /dev/null differ+diff --git a/node_modules/react-native-pdf/android/.gradle/buildOutputCleanup/cache.properties b/node_modules/react-native-pdf/android/.gradle/buildOutputCleanup/cache.properties+deleted file mode 100644+index f4a32a7..0000000+--- a/node_modules/react-native-pdf/android/.gradle/buildOutputCleanup/cache.properties++++ /dev/null+@@ -1,2 +0,0 @@+-#Sat Oct 12 21:44:37 CST 2019+-gradle.version=5.6.1+diff --git a/node_modules/react-native-pdf/android/.gradle/vcs-1/gc.properties b/node_modules/react-native-pdf/android/.gradle/vcs-1/gc.properties+deleted file mode 100644+index e69de29..0000000+diff --git a/node_modules/react-native-pdf/android/build.gradle b/node_modules/react-native-pdf/android/build.gradle+index 3dfe1dc..70ef9da 100644+--- a/node_modules/react-native-pdf/android/build.gradle++++ b/node_modules/react-native-pdf/android/build.gradle+@@ -126,6 +126,6 @@ dependencies {+ // The repo from zacharee is based on PdfiumAndroidKt, a much newer fork of PdfiumAndroid, with better maintenance and updated native libraries.+ implementation 'com.github.zacharee:AndroidPdfViewer:4.0.1'+ // Depend on PdfiumAndroidKt directly so this can be updated independently of AndroidPdfViewer as updates are provided.+- implementation 'io.legere:pdfiumandroid:1.0.24'++ implementation 'io.legere:pdfiumandroid:1.0.32'+ implementation 'com.google.code.gson:gson:2.8.5'+ }