self-hosted/joplin
1
0
Fork 0
mirror of https://github.com/laurent22/joplin.git synced 2025-06-15 23:00:36 +02:00
Code Issues Releases Activity

All: Add support for application plugins (#3257)

Browse Source
This commit is contained in:
Laurent
2020-10-09 18:35:46 +01:00
committed by GitHub
parent 833fb1264f
commit fe41d37f8f
804 changed files with 95622 additions and 5307 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ReactNativeClient/lib/components/shared/config-shared.js
View File

@ -1,7 +1,7 @@
const Setting = require('lib/models/Setting.js');
const Setting = require('lib/models/Setting').default;
const SyncTargetRegistry = require('lib/SyncTargetRegistry');
const ObjectUtils = require('lib/ObjectUtils');
const { _ } = require('lib/locale.js');
const { _ } = require('lib/locale');
const { createSelector } = require('reselect');
const { reg } = require('lib/registry');

6
ReactNativeClient/lib/components/shared/dropbox-login-shared.js
View File

@ -1,8 +1,8 @@
const { shim } = require('lib/shim');
const shim = require('lib/shim').default;
const SyncTargetRegistry = require('lib/SyncTargetRegistry');
const { reg } = require('lib/registry.js');
const { _ } = require('lib/locale.js');
const Setting = require('lib/models/Setting');
const { _ } = require('lib/locale');
const Setting = require('lib/models/Setting').default;
class Shared {
constructor(comp, showInfoMessageBox, showErrorMessageBox) {

32
ReactNativeClient/lib/components/shared/encryption-config-shared.js
View File

@ -1,19 +1,21 @@
const EncryptionService = require('lib/services/EncryptionService');
const { _ } = require('lib/locale.js');
const { _ } = require('lib/locale');
const BaseItem = require('lib/models/BaseItem.js');
const Setting = require('lib/models/Setting.js');
const Setting = require('lib/models/Setting').default;
const MasterKey = require('lib/models/MasterKey.js');
const { reg } = require('lib/registry.js');
const shim = require('lib/shim').default;
const shared = {};
shared.constructor = function(comp) {
shared.constructor = function(comp, props) {
comp.state = {
passwordChecks: {},
stats: {
encrypted: null,
total: null,
},
passwords: Object.assign({}, props.passwords),
};
comp.isMounted_ = false;
@ -49,7 +51,7 @@ shared.upgradeMasterKey = async function(comp, masterKey) {
}
try {
const password = comp.props.passwords[masterKey.id];
const password = comp.state.passwords[masterKey.id];
const newMasterKey = await EncryptionService.instance().upgradeMasterKey(masterKey, password);
await MasterKey.save(newMasterKey);
reg.waitForSyncFinishedThenSync();
@ -65,13 +67,13 @@ shared.componentDidMount = async function(comp) {
shared.refreshStats(comp);
if (shared.refreshStatsIID_) {
clearInterval(shared.refreshStatsIID_);
shim.clearInterval(shared.refreshStatsIID_);
shared.refreshStatsIID_ = null;
}
shared.refreshStatsIID_ = setInterval(() => {
shared.refreshStatsIID_ = shim.setInterval(() => {
if (!comp.isMounted_) {
clearInterval(shared.refreshStatsIID_);
shim.clearInterval(shared.refreshStatsIID_);
shared.refreshStatsIID_ = null;
return;
}
@ -80,6 +82,10 @@ shared.componentDidMount = async function(comp) {
};
shared.componentDidUpdate = async function(comp, prevProps = null) {
if (prevProps && comp.props.passwords !== prevProps.passwords) {
comp.setState({ passwords: Object.assign({}, comp.props.passwords) });
}
if (!prevProps || comp.props.masterKeys !== prevProps.masterKeys || comp.props.passwords !== prevProps.passwords) {
comp.checkPasswords();
}
@ -87,7 +93,7 @@ shared.componentDidUpdate = async function(comp, prevProps = null) {
shared.componentWillUnmount = function() {
if (shared.refreshStatsIID_) {
clearInterval(shared.refreshStatsIID_);
shim.clearInterval(shared.refreshStatsIID_);
shared.refreshStatsIID_ = null;
}
};
@ -96,7 +102,7 @@ shared.checkPasswords = async function(comp) {
const passwordChecks = Object.assign({}, comp.state.passwordChecks);
for (let i = 0; i < comp.props.masterKeys.length; i++) {
const mk = comp.props.masterKeys[i];
const password = comp.props.passwords[mk.id];
const password = comp.state.passwords[mk.id];
const ok = password ? await EncryptionService.instance().checkMasterKeyPassword(mk, password) : false;
passwordChecks[mk.id] = ok;
}
@ -111,18 +117,18 @@ shared.decryptedStatText = function(comp) {
};
shared.onSavePasswordClick = function(comp, mk) {
const password = comp.props.passwords[mk.id];
const password = comp.state.passwords[mk.id];
if (!password) {
Setting.deleteObjectKey('encryption.passwordCache', mk.id);
Setting.deleteObjectValue('encryption.passwordCache', mk.id);
} else {
Setting.setObjectKey('encryption.passwordCache', mk.id, password);
Setting.setObjectValue('encryption.passwordCache', mk.id, password);
}
comp.checkPasswords();
};
shared.onPasswordChange = function(comp, mk, password) {
const passwords = comp.props.passwords;
const passwords = Object.assign({}, comp.state.passwords);
passwords[mk.id] = password;
comp.setState({ passwords: passwords });
};

2
ReactNativeClient/lib/components/shared/note-screen-shared.js
View File

@ -5,7 +5,7 @@ const Note = require('lib/models/Note.js');
const Resource = require('lib/models/Resource.js');
const ResourceFetcher = require('lib/services/ResourceFetcher.js');
const DecryptionWorker = require('lib/services/DecryptionWorker.js');
const Setting = require('lib/models/Setting.js');
const Setting = require('lib/models/Setting').default;
const Mutex = require('async-mutex').Mutex;
const shared = {};

5
ReactNativeClient/lib/components/shared/reduxSharedMiddleware.js
View File

@ -1,14 +1,17 @@
const Setting = require('lib/models/Setting');
const Setting = require('lib/models/Setting').default;
const Tag = require('lib/models/Tag');
const BaseModel = require('lib/BaseModel');
const Note = require('lib/models/Note');
const { reg } = require('lib/registry.js');
const ResourceFetcher = require('lib/services/ResourceFetcher');
const DecryptionWorker = require('lib/services/DecryptionWorker');
const eventManager = require('lib/eventManager').default;
const reduxSharedMiddleware = async function(store, next, action) {
const newState = store.getState();
eventManager.appStateEmit(newState);
let refreshTags = false;
if (action.type == 'FOLDER_SET_COLLAPSED' || action.type == 'FOLDER_TOGGLE') {