mirror of
https://github.com/streetwriters/notesnook.git
synced 2025-12-23 23:19:40 +01:00
mobile: fix app crash on android 15 & 16
This commit is contained in:
@@ -97,7 +97,6 @@ export const Header = ({
|
|||||||
style={{
|
style={{
|
||||||
flexDirection: "row",
|
flexDirection: "row",
|
||||||
justifyContent: "space-between",
|
justifyContent: "space-between",
|
||||||
marginTop: DefaultAppStyles.GAP_SMALL,
|
|
||||||
borderRadius: 10,
|
borderRadius: 10,
|
||||||
paddingVertical: 3,
|
paddingVertical: 3,
|
||||||
borderWidth: hasSearch ? 1 : 0,
|
borderWidth: hasSearch ? 1 : 0,
|
||||||
|
|||||||
@@ -29,6 +29,7 @@ import useGlobalSafeAreaInsets from "../../hooks/use-global-safe-area-insets";
|
|||||||
import { useSettingStore } from "../../stores/use-setting-store";
|
import { useSettingStore } from "../../stores/use-setting-store";
|
||||||
import { NotesnookModule } from "../../utils/notesnook-module";
|
import { NotesnookModule } from "../../utils/notesnook-module";
|
||||||
import { DefaultAppStyles } from "../../utils/styles";
|
import { DefaultAppStyles } from "../../utils/styles";
|
||||||
|
import { SafeAreaView } from "react-native-safe-area-context";
|
||||||
|
|
||||||
const NoteItem = (props: {
|
const NoteItem = (props: {
|
||||||
id: string | number;
|
id: string | number;
|
||||||
@@ -111,7 +112,7 @@ export const NotePreviewConfigure = () => {
|
|||||||
);
|
);
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<View
|
<SafeAreaView
|
||||||
style={{
|
style={{
|
||||||
backgroundColor: colors.primary.background,
|
backgroundColor: colors.primary.background,
|
||||||
flex: 1
|
flex: 1
|
||||||
@@ -165,6 +166,6 @@ export const NotePreviewConfigure = () => {
|
|||||||
ListFooterComponent={<View style={{ height: 200 }} />}
|
ListFooterComponent={<View style={{ height: 200 }} />}
|
||||||
/>
|
/>
|
||||||
</View>
|
</View>
|
||||||
</View>
|
</SafeAreaView>
|
||||||
);
|
);
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -61,15 +61,6 @@
|
|||||||
android:supportsRtl="true"
|
android:supportsRtl="true"
|
||||||
android:networkSecurityConfig="@xml/network_security_config">
|
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">
|
<receiver android:exported="false" android:label="@string/quick_note" android:name=".NoteWidget">
|
||||||
<intent-filter>
|
<intent-filter>
|
||||||
<action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
|
<action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
|
||||||
@@ -90,6 +81,15 @@
|
|||||||
android:resource="@xml/note_widget_info" />
|
android:resource="@xml/note_widget_info" />
|
||||||
</receiver>
|
</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"
|
<activity android:configChanges="keyboard|keyboardHidden|orientation|screenLayout|screenSize|smallestScreenSize|uiMode"
|
||||||
android:label="NotePreviewConfigure"
|
android:label="NotePreviewConfigure"
|
||||||
android:launchMode="singleTask"
|
android:launchMode="singleTask"
|
||||||
|
|||||||
@@ -48,7 +48,8 @@ public class NotePreviewWidget extends AppWidgetProvider {
|
|||||||
private static Bundle getActivityOptionsBundle() {
|
private static Bundle getActivityOptionsBundle() {
|
||||||
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE) {
|
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE) {
|
||||||
ActivityOptions activityOptions = ActivityOptions.makeBasic();
|
ActivityOptions activityOptions = ActivityOptions.makeBasic();
|
||||||
activityOptions.setPendingIntentBackgroundActivityStartMode(ActivityOptions.MODE_BACKGROUND_ACTIVITY_START_ALLOWED);
|
activityOptions.setPendingIntentCreatorBackgroundActivityStartMode(
|
||||||
|
ActivityOptions.MODE_BACKGROUND_ACTIVITY_START_ALLOWED);
|
||||||
return activityOptions.toBundle();
|
return activityOptions.toBundle();
|
||||||
} else
|
} else
|
||||||
return null;
|
return null;
|
||||||
|
|||||||
@@ -31,7 +31,8 @@ public class NoteWidget extends AppWidgetProvider {
|
|||||||
private static Bundle getActivityOptionsBundle() {
|
private static Bundle getActivityOptionsBundle() {
|
||||||
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE) {
|
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE) {
|
||||||
ActivityOptions activityOptions = ActivityOptions.makeBasic();
|
ActivityOptions activityOptions = ActivityOptions.makeBasic();
|
||||||
activityOptions.setPendingIntentBackgroundActivityStartMode(ActivityOptions.MODE_BACKGROUND_ACTIVITY_START_ALLOWED);
|
activityOptions.setPendingIntentCreatorBackgroundActivityStartMode(
|
||||||
|
ActivityOptions.MODE_BACKGROUND_ACTIVITY_START_ALLOWED);
|
||||||
return activityOptions.toBundle();
|
return activityOptions.toBundle();
|
||||||
} else
|
} else
|
||||||
return null;
|
return null;
|
||||||
|
|||||||
@@ -26,7 +26,8 @@ public class ReminderWidgetProvider extends AppWidgetProvider {
|
|||||||
private static Bundle getActivityOptionsBundle() {
|
private static Bundle getActivityOptionsBundle() {
|
||||||
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE) {
|
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE) {
|
||||||
ActivityOptions activityOptions = ActivityOptions.makeBasic();
|
ActivityOptions activityOptions = ActivityOptions.makeBasic();
|
||||||
activityOptions.setPendingIntentBackgroundActivityStartMode(ActivityOptions.MODE_BACKGROUND_ACTIVITY_START_ALLOWED);
|
activityOptions.setPendingIntentCreatorBackgroundActivityStartMode(
|
||||||
|
ActivityOptions.MODE_BACKGROUND_ACTIVITY_START_ALLOWED);
|
||||||
return activityOptions.toBundle();
|
return activityOptions.toBundle();
|
||||||
} else
|
} else
|
||||||
return null;
|
return null;
|
||||||
|
|||||||
@@ -66,7 +66,7 @@
|
|||||||
"react-native-screenguard": "^1.0.0",
|
"react-native-screenguard": "^1.0.0",
|
||||||
"@formatjs/intl-locale": "4.0.0",
|
"@formatjs/intl-locale": "4.0.0",
|
||||||
"@formatjs/intl-pluralrules": "5.2.14",
|
"@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-community/datetimepicker": "^8.2.0",
|
||||||
"react-native-exit-app": "github:ammarahm-ed/react-native-exit-app",
|
"react-native-exit-app": "github:ammarahm-ed/react-native-exit-app",
|
||||||
"react-native-begin-background-task": "github:blockfirm/react-native-begin-background-task",
|
"react-native-begin-background-task": "github:blockfirm/react-native-begin-background-task",
|
||||||
|
|||||||
9
apps/mobile/package-lock.json
generated
9
apps/mobile/package-lock.json
generated
@@ -14,7 +14,6 @@
|
|||||||
"app/"
|
"app/"
|
||||||
],
|
],
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@ammarahmed/react-native-sodium": "^1.6.3",
|
|
||||||
"@notesnook/common": "file:../../packages/common",
|
"@notesnook/common": "file:../../packages/common",
|
||||||
"@notesnook/core": "file:../../packages/core",
|
"@notesnook/core": "file:../../packages/core",
|
||||||
"@notesnook/crypto": "file:../../packages/crypto",
|
"@notesnook/crypto": "file:../../packages/crypto",
|
||||||
@@ -28325,7 +28324,7 @@
|
|||||||
"@ammarahmed/react-native-eventsource": "1.1.0",
|
"@ammarahmed/react-native-eventsource": "1.1.0",
|
||||||
"@ammarahmed/react-native-fingerprint-scanner": "^5.0.0",
|
"@ammarahmed/react-native-fingerprint-scanner": "^5.0.0",
|
||||||
"@ammarahmed/react-native-share-extension": "^2.9.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",
|
"@bam.tech/react-native-image-resizer": "3.0.11",
|
||||||
"@callstack/repack": "~5.1.2",
|
"@callstack/repack": "~5.1.2",
|
||||||
"@formatjs/intl-locale": "4.0.0",
|
"@formatjs/intl-locale": "4.0.0",
|
||||||
@@ -28479,9 +28478,9 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/@ammarahmed/react-native-sodium": {
|
"node_modules/@ammarahmed/react-native-sodium": {
|
||||||
"version": "1.6.3",
|
"version": "1.6.4",
|
||||||
"resolved": "https://registry.npmjs.org/@ammarahmed/react-native-sodium/-/react-native-sodium-1.6.3.tgz",
|
"resolved": "https://registry.npmjs.org/@ammarahmed/react-native-sodium/-/react-native-sodium-1.6.4.tgz",
|
||||||
"integrity": "sha512-TnJqAa/c3MmWouD4q32VR03JI4TgXqUarzBOrRk3tcX91JVsG2UnuPUHK3iRzyLI7/mBiLdMR4XBdzoy+oXmjw==",
|
"integrity": "sha512-+OIBABV/8IPXVQPRxiub0WW86X/bs14GHnQ1VqtxWGv7phwfyOVzi9c1/LDeRqjCDKBAYHOv2a5PLHZb2RzeGw==",
|
||||||
"license": "ISC"
|
"license": "ISC"
|
||||||
},
|
},
|
||||||
"node_modules/@ampproject/remapping": {
|
"node_modules/@ampproject/remapping": {
|
||||||
|
|||||||
@@ -54,7 +54,6 @@
|
|||||||
"@types/validator": "^13.12.2",
|
"@types/validator": "^13.12.2",
|
||||||
"diffblazer": "^1.0.1",
|
"diffblazer": "^1.0.1",
|
||||||
"react": "18.2.0",
|
"react": "18.2.0",
|
||||||
"react-native": "0.77.2",
|
"react-native": "0.77.2"
|
||||||
"@ammarahmed/react-native-sodium": "^1.6.3"
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
38
apps/mobile/patches/react-native-pdf+6.7.7.patch
Normal file
38
apps/mobile/patches/react-native-pdf+6.7.7.patch
Normal file
@@ -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'
|
||||||
|
}
|
||||||
Reference in New Issue
Block a user