self-hosted/joplin
1
0
Fork 0
mirror of https://github.com/laurent22/joplin.git synced 2025-01-11 18:24:43 +02:00
Code Issues Releases Activity

Merge branch 'master' of github.com:laurent22/joplin

Browse Source
This commit is contained in:
Laurent Cozic 2019-07-13 15:58:06 +01:00
commit 4d9d84a8f3
2 changed files with 42 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ElectronClient/app/gui/NoteText.jsx
View File

@ -853,7 +853,7 @@ class NoteTextComponent extends React.Component {
this.editor_.editor.renderer.on('afterRender', this.onAfterEditorRender_);
const cancelledKeys = [];
const letters = ['F', 'T', 'P', 'Q', 'L', ',', 'G'];
const letters = ['F', 'T', 'P', 'Q', 'L', ',', 'G', 'K'];
for (let i = 0; i < letters.length; i++) {
const l = letters[i];
cancelledKeys.push('Ctrl+' + l);

42
ReactNativeClient/lib/components/screens/config.js
View File

@ -17,6 +17,7 @@ const { time } = require('lib/time-utils');
const SearchEngine = require('lib/services/SearchEngine');
const RNFS = require('react-native-fs');
import { PermissionsAndroid } from 'react-native';
import Slider from '@react-native-community/slider';
class ConfigScreenComponent extends BaseScreenComponent {
@ -43,7 +44,22 @@ class ConfigScreenComponent extends BaseScreenComponent {
NavService.go('EncryptionConfig');
}
this.saveButton_press = () => {
this.saveButton_press = async () => {
if (
this.state.changedSettingKeys.includes('sync.target')
&& this.state.settings['sync.target'] === SyncTargetRegistry.nameToId('filesystem')
&& !await this.checkFilesystemPermission()
) {
Alert.alert(
_('Warning'),
_(
'Joplin does not have permission to access "%s". ' +
'Either choose a different sync target, ' +
'or give Joplin the "Storage" permission.',
this.state.settings['sync.2.path'],
));
// Save settings anyway, even if permission has not been granted
}
return shared.saveSettings(this);
};
@ -90,6 +106,30 @@ class ConfigScreenComponent extends BaseScreenComponent {
}
}
async checkFilesystemPermission() {
if (Platform.OS !== 'android') {
// Not implemented yet
return true;
}
const hasPermission = await PermissionsAndroid.check(
PermissionsAndroid.PERMISSIONS.WRITE_EXTERNAL_STORAGE);
if (hasPermission) {
return true;
}
const requestResult = await PermissionsAndroid.request(
PermissionsAndroid.PERMISSIONS.WRITE_EXTERNAL_STORAGE,
{
title: _('Permission to write to external storage'),
message: _(
'In order to use file system synchronization your ' +
'permission to write to external storage is required.'
),
buttonPositive: _('OK'),
},
);
return (requestResult === PermissionsAndroid.RESULTS.GRANTED);
}
UNSAFE_componentWillMount() {
this.setState({ settings: this.props.settings });
}