self-hosted/joplin
1
0
Fork 0
mirror of https://github.com/laurent22/joplin.git synced 2025-11-26 22:41:17 +02:00
Code Issues Releases Activity

iOS: Fixed sharing file

Browse Source
This commit is contained in:
Laurent Cozic
2023-02-19 19:00:17 +00:00
parent e93046e8e2
commit ed0edcb36c
3 changed files with 38 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -614,6 +614,9 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES; GCC_WARN_UNUSED_VARIABLE = YES;
HEADER_SEARCH_PATHS = (
"$(SRCROOT)/../node_modules/react-native/Libraries/LinkingIOS\n\n$(SRCROOT)/../node_modules/react-native/Libraries/LinkingIOS\n\n$(SRCROOT)/../node_modules/react-native/Libraries/LinkingIOS\n\n$(SRCROOT)/../node_modules/react-native/Libraries/LinkingIOS\n\n",
);
IPHONEOS_DEPLOYMENT_TARGET = 11.0; IPHONEOS_DEPLOYMENT_TARGET = 11.0;
LD_RUNPATH_SEARCH_PATHS = "/usr/lib/swift $(inherited)"; LD_RUNPATH_SEARCH_PATHS = "/usr/lib/swift $(inherited)";
LIBRARY_SEARCH_PATHS = ( LIBRARY_SEARCH_PATHS = (
@@ -669,6 +672,9 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES; GCC_WARN_UNUSED_VARIABLE = YES;
HEADER_SEARCH_PATHS = (
"$(SRCROOT)/../node_modules/react-native/Libraries/LinkingIOS\n\n$(SRCROOT)/../node_modules/react-native/Libraries/LinkingIOS\n\n$(SRCROOT)/../node_modules/react-native/Libraries/LinkingIOS\n\n$(SRCROOT)/../node_modules/react-native/Libraries/LinkingIOS\n\n",
);
IPHONEOS_DEPLOYMENT_TARGET = 11.0; IPHONEOS_DEPLOYMENT_TARGET = 11.0;
LD_RUNPATH_SEARCH_PATHS = "/usr/lib/swift $(inherited)"; LD_RUNPATH_SEARCH_PATHS = "/usr/lib/swift $(inherited)";
LIBRARY_SEARCH_PATHS = ( LIBRARY_SEARCH_PATHS = (

18
packages/app-mobile/ios/Joplin/AppDelegate.mm
View File

@@ -5,6 +5,7 @@
#import <React/RCTRootView.h> #import <React/RCTRootView.h>
#import <React/RCTAppSetupUtils.h> #import <React/RCTAppSetupUtils.h>
#import <React/RCTLinkingManager.h>
#import <RNCPushNotificationIOS.h> #import <RNCPushNotificationIOS.h>
#import "RNQuickActionManager.h" #import "RNQuickActionManager.h"
@@ -32,6 +33,23 @@ static NSString *const kRNConcurrentRoot = @"concurrentRoot";
@implementation AppDelegate @implementation AppDelegate
// ===================================================
// BEGIN Linking support
// ===================================================
- (BOOL)application:(UIApplication *)application
openURL:(NSURL *)url
options:(NSDictionary<UIApplicationOpenURLOptionsKey,id> *)options
{
return [RCTLinkingManager application:application openURL:url options:options];
}
// ===================================================
// END Linking support
// ===================================================
// =================================================== // ===================================================
// BEGIN react-native-quick-actions // BEGIN react-native-quick-actions
// =================================================== // ===================================================

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

@@ -117,6 +117,8 @@ import sensorInfo from './components/biometrics/sensorInfo';
import { getCurrentProfile } from '@joplin/lib/services/profileConfig'; import { getCurrentProfile } from '@joplin/lib/services/profileConfig';
import { getDatabaseName, getProfilesRootDir, getResourceDir, setDispatch } from './services/profiles'; import { getDatabaseName, getProfilesRootDir, getResourceDir, setDispatch } from './services/profiles';
const logger = Logger.create('root');
let storeDispatch = function(_action: any) {}; let storeDispatch = function(_action: any) {};
const logReducerAction = function(action: any) { const logReducerAction = function(action: any) {
@@ -727,17 +729,23 @@ class AppComponent extends React.Component {
}; };
this.handleOpenURL_ = (event: any) => { this.handleOpenURL_ = (event: any) => {
logger.info('Sharing: handleOpenURL_: start');
// If this is called while biometrics haven't been done yet, we can // If this is called while biometrics haven't been done yet, we can
// ignore the call, because handleShareData() will be called once // ignore the call, because handleShareData() will be called once
// biometricsDone is `true`. // biometricsDone is `true`.
if (event.url === ShareExtension.shareURL && this.props.biometricsDone) { if (event.url === ShareExtension.shareURL && this.props.biometricsDone) {
logger.info('Sharing: handleOpenURL_: Processing share data');
void this.handleShareData(); void this.handleShareData();
} }
}; };
this.handleNewShare_ = () => { this.handleNewShare_ = () => {
logger.info('Sharing: handleNewShare_: start');
// look at this.handleOpenURL_ comment // look at this.handleOpenURL_ comment
if (this.props.biometricsDone) { if (this.props.biometricsDone) {
logger.info('Sharing: handleNewShare_: Processing share data');
void this.handleShareData(); void this.handleShareData();
} }
}; };
@@ -865,6 +873,7 @@ class AppComponent extends React.Component {
} }
if (this.props.biometricsDone !== prevProps.biometricsDone && this.props.biometricsDone) { if (this.props.biometricsDone !== prevProps.biometricsDone && this.props.biometricsDone) {
logger.info('Sharing: componentDidUpdate: biometricsDone');
void this.handleShareData(); void this.handleShareData();
} }
} }
@@ -892,9 +901,13 @@ class AppComponent extends React.Component {
private async handleShareData() { private async handleShareData() {
const sharedData = await ShareExtension.data(); const sharedData = await ShareExtension.data();
logger.info('Sharing: handleShareData:', sharedData);
if (sharedData) { if (sharedData) {
reg.logger().info('Received shared data'); reg.logger().info('Received shared data');
if (this.props.selectedFolderId) { if (this.props.selectedFolderId) {
logger.info('Sharing: handleShareData: Processing...');
await handleShared(sharedData, this.props.selectedFolderId, this.props.dispatch); await handleShared(sharedData, this.props.selectedFolderId, this.props.dispatch);
} else { } else {
reg.logger().info('Cannot handle share - default folder id is not set'); reg.logger().info('Cannot handle share - default folder id is not set');