1berry/joplin
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/release-3.3' into dev

Browse Source
This commit is contained in:
Henry Heino 2025-06-10 13:19:58 -07:00
commit c392854bdf
10 changed files with 48 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
packages/app-desktop/InteropServiceHelper.ts
View File

@ -112,9 +112,11 @@ export default class InteropServiceHelper {
// fails on Linux (even if run in the main process).
// As such, we use window.print(), which seems to work.
//
// 2025-05-03: Windows also needs the window.print() workaround.
// 2025-05-03: Windows and MacOS also need the window.print() workaround.
// See https://github.com/electron/electron/pull/46937.
if (shim.isLinux() || shim.isWindows()) {
const applyWorkaround = true;
if (applyWorkaround) {
await win.webContents.executeJavaScript(`
// Blocks while the print dialog is open
window.print();

2
packages/app-mobile/android/app/build.gradle
View File

@ -89,7 +89,7 @@ android {
applicationId "net.cozic.joplin"
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
versionCode 2097771
versionCode 2097773
versionName "3.4.0"
ndk {
abiFilters "armeabi-v7a", "x86", "arm64-v8a", "x86_64"

2
packages/app-mobile/android/app/src/main/cpp/whisperWrapper.cpp
View File

@ -75,7 +75,7 @@ extern "C"
JNIEXPORT void JNICALL
Java_net_cozic_joplin_audio_NativeWhisperLib_00024Companion_free(JNIEnv *env, jobject thiz,
jlong pointer) {
std::free(reinterpret_cast<WhisperSession *>(pointer));
delete reinterpret_cast<WhisperSession *>(pointer);
}
extern "C"

1
packages/app-mobile/components/SideMenu.tsx
View File

@ -326,7 +326,6 @@ const SideMenuComponent: React.FC<Props> = props => {
const SideMenu = connect((state: State) => {
return {
themeId: state.settings.theme,
isOpen: state.showSideMenu,
};
})(SideMenuComponent);

8
packages/app-mobile/components/buttons/FloatingActionButton.tsx
View File

@ -45,10 +45,12 @@ const useIcon = (iconName: string) => {
const FloatingActionButton = (props: ActionButtonProps) => {
const [open, setOpen] = useState(false);
const onMenuToggled = useCallback(() => {
props.dispatch({
type: 'SIDE_MENU_CLOSE',
});
const newOpen = !open;
if (newOpen) {
props.dispatch({
type: 'SIDE_MENU_CLOSE',
});
}
setOpen(newOpen);
}, [setOpen, open, props.dispatch]);

8
packages/app-mobile/ios/Joplin.xcodeproj/project.pbxproj
View File

@ -543,7 +543,7 @@
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_ENTITLEMENTS = Joplin/Joplin.entitlements;
CURRENT_PROJECT_VERSION = 140;
CURRENT_PROJECT_VERSION = 141;
DEVELOPMENT_TEAM = A9BXAFS6CT;
ENABLE_BITCODE = NO;
INFOPLIST_FILE = Joplin/Info.plist;
@ -578,7 +578,7 @@
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_ENTITLEMENTS = Joplin/Joplin.entitlements;
CURRENT_PROJECT_VERSION = 136;
CURRENT_PROJECT_VERSION = 141;
DEVELOPMENT_TEAM = A9BXAFS6CT;
INFOPLIST_FILE = Joplin/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 15.6;
@ -779,7 +779,7 @@
CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
CODE_SIGN_ENTITLEMENTS = ShareExtension/ShareExtension.entitlements;
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 140;
CURRENT_PROJECT_VERSION = 141;
DEBUG_INFORMATION_FORMAT = dwarf;
DEVELOPMENT_TEAM = A9BXAFS6CT;
GCC_C_LANGUAGE_STANDARD = gnu11;
@ -822,7 +822,7 @@
CODE_SIGN_ENTITLEMENTS = ShareExtension/ShareExtension.entitlements;
CODE_SIGN_STYLE = Automatic;
COPY_PHASE_STRIP = NO;
CURRENT_PROJECT_VERSION = 140;
CURRENT_PROJECT_VERSION = 141;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DEVELOPMENT_TEAM = A9BXAFS6CT;
GCC_C_LANGUAGE_STANDARD = gnu11;

12
packages/app-mobile/ios/ShareExtension/Source/ShareExtension/ShareViewController.m
View File

@ -132,10 +132,18 @@
UIResponder* responder = self;
while (responder != nil) {
if ([responder respondsToSelector:selector]) {
[responder performSelector:selector withObject:[NSURL URLWithString:ShareExtensionShareURL]];
UIApplication *app = (UIApplication*) responder;
NSURL *url = [NSURL URLWithString:ShareExtensionShareURL];
[app openURL:url options:@{} completionHandler:^(BOOL success) {
if (success) {
NSLog(@"Opened URL successfully!");
} else {
NSLog(@"Failed to open URL.");
}
}];
break;
}
responder = responder.nextResponder;
}
}

16
packages/app-mobile/root.tsx
View File

@ -1248,13 +1248,16 @@ class AppComponent extends React.Component<AppComponentProps, AppComponentState>
}
}
private sideMenu_change(isOpen: boolean) {
private sideMenu_change = (isOpen: boolean) => {
// Make sure showSideMenu property of state is updated
// when the menu is open/closed.
this.props.dispatch({
type: isOpen ? 'SIDE_MENU_OPEN' : 'SIDE_MENU_CLOSE',
});
}
// Avoid dispatching unnecessarily. See https://github.com/laurent22/joplin/issues/12427
if (isOpen !== this.props.showSideMenu) {
this.props.dispatch({
type: isOpen ? 'SIDE_MENU_OPEN' : 'SIDE_MENU_CLOSE',
});
}
};
private getSideMenuWidth = () => {
const sideMenuWidth = getResponsiveValue({
@ -1346,7 +1349,8 @@ class AppComponent extends React.Component<AppComponentProps, AppComponentState>
toleranceY={20}
openMenuOffset={this.state.sideMenuWidth}
menuPosition={menuPosition}
onChange={(isOpen: boolean) => this.sideMenu_change(isOpen)}
onChange={this.sideMenu_change}
isOpen={this.props.showSideMenu}
disableGestures={disableSideMenuGestures}
>
<StatusBar barStyle={statusBarStyle} />

8
readme/about/changelog/android.md
View File

@ -1,5 +1,13 @@
# Joplin Android Changelog
## [android-v3.3.10](https://github.com/laurent22/joplin/releases/tag/android-v3.3.10) (Pre-release) - 2025-06-10T08:07:25Z
- New: Add additional checks when updating sidebar state (#12428 by [@personalizedrefrigerator](https://github.com/personalizedrefrigerator))
## [android-v3.3.9](https://github.com/laurent22/joplin/releases/tag/android-v3.3.9) (Pre-release) - 2025-06-09T17:11:04Z
- Fixed: Voice typing: Fix memory leak (#12402 by [@personalizedrefrigerator](https://github.com/personalizedrefrigerator))
## [android-v3.3.8](https://github.com/laurent22/joplin/releases/tag/android-v3.3.8) (Pre-release) - 2025-05-01T15:45:35Z
- New: Force quick action shortcuts to have the same size (#12195 by [@personalizedrefrigerator](https://github.com/personalizedrefrigerator))

5
readme/about/changelog/ios.md
View File

@ -1,5 +1,10 @@
# Joplin iOS Changelog
## [ios-v13.3.8](https://github.com/laurent22/joplin/releases/tag/ios-v13.3.8) - 2025-06-09T17:15:06Z
- Fixed: Fix error shown the first time a user attempts to record (#12328) (#12314 by [@personalizedrefrigerator](https://github.com/personalizedrefrigerator))
- Fixed: Fix sharing to Joplin (#12334) (#12331 by [@personalizedrefrigerator](https://github.com/personalizedrefrigerator))
## [ios-v13.3.7](https://github.com/laurent22/joplin/releases/tag/ios-v13.3.7) - 2025-05-01T16:06:30Z
- New: Force quick action shortcuts to have the same size (#12195 by [@personalizedrefrigerator](https://github.com/personalizedrefrigerator))