Android release v1.0.328

File corrected and completed until line 470

.eslintignore

@@ -21,38 +21,41 @@ Clipper/content_scripts/Readability.js
 Clipper/dist
 Clipper/icons
 Clipper/popup/build
+Clipper/popup/config/webpack.config.js
 Clipper/popup/node_modules
+Clipper/popup/scripts/build.js
 docs/
 ElectronClient/dist
+ElectronClient/gui/editors/TinyMCE/plugins/lists.js
 ElectronClient/lib
 ElectronClient/lib/vendor/sjcl-rn.js
 ElectronClient/lib/vendor/sjcl.js
 ElectronClient/locales
 ElectronClient/node_modules
+ElectronClient/packageInfo.js
 highlight.pack.js
+Modules/TinyMCE/JoplinLists/
 node_modules/
 ReactNativeClient/android
 ReactNativeClient/ios
+ReactNativeClient/lib/joplin-renderer/assets/
+ReactNativeClient/lib/joplin-renderer/vendor/fountain.min.js
+ReactNativeClient/lib/rnInjectedJs/
 ReactNativeClient/lib/vendor/
 ReactNativeClient/lib/welcomeAssets.js
 ReactNativeClient/locales
 ReactNativeClient/node_modules
+ReactNativeClient/pluginAssets/
 readme/
-Tools/node_modules
-Tools/PortableAppsLauncher
 Server/.git/
 Server/.github/
-Server/docs/
-Server/dist/
 Server/bin/
+Server/dist/
+Server/docs/
 Server/node_modules/
-ElectronClient/packageInfo.js
-ReactNativeClient/pluginAssets/
-ReactNativeClient/lib/joplin-renderer/vendor/fountain.min.js
-ReactNativeClient/lib/joplin-renderer/assets/
-ReactNativeClient/lib/rnInjectedJs/
-Clipper/popup/config/webpack.config.js
-Clipper/popup/scripts/build.js
+Tools/node_modules
+Tools/PortableAppsLauncher
+Modules/TinyMCE/IconPack/postinstall.js
 
 # AUTO-GENERATED - EXCLUDED TYPESCRIPT BUILD
 ElectronClient/gui/editors/PlainEditor.js
@@ -64,6 +67,7 @@ ElectronClient/gui/ResourceScreen.js
 ElectronClient/gui/ShareNoteDialog.js
 ElectronClient/gui/utils/NoteText.js
 ReactNativeClient/lib/AsyncActionQueue.js
+ReactNativeClient/lib/joplin-renderer/MdToHtml/rules/checkbox.js
 ReactNativeClient/lib/joplin-renderer/MdToHtml/rules/fence.js
 ReactNativeClient/lib/joplin-renderer/MdToHtml/rules/mermaid.js
 ReactNativeClient/lib/joplin-renderer/MdToHtml/rules/sanitize_html.js

.eslintrc.js

@@ -54,16 +54,21 @@ module.exports = {
 		// This error is always a false positive so far since it detects
 		// possible race conditions in contexts where we know it cannot happen.
 		"require-atomic-updates": 0,
+		"prefer-const": ["error"],
+		"no-var": ["error"],
 
 		// Checks rules of Hooks
 		"react-hooks/rules-of-hooks": "error",
 		// Checks effect dependencies
-		"react-hooks/exhaustive-deps": "warn",
+		// Disable because of this: https://github.com/facebook/react/issues/16265
+		// "react-hooks/exhaustive-deps": "warn",
 
 		// -------------------------------
 		// Formatting
 		// -------------------------------
 		"space-in-parens": ["error", "never"],
+		"space-infix-ops": ["error"],
+		"curly": ["error", "multi-line", "consistent"],
 		"semi": ["error", "always"],
 		"eol-last": ["error", "always"],
 		"quotes": ["error", "single"],
@@ -92,7 +97,7 @@ module.exports = {
 		"multiline-comment-style": ["error", "separate-lines"],
 		"space-before-blocks": "error",
 		"spaced-comment": ["error", "always"],
-		"keyword-spacing": ["error", { "before": true, "after": true }]
+		"keyword-spacing": ["error", { "before": true, "after": true }],
 	},
 	"plugins": [
 		"react",

.github/stale.yml

@@ -1,6 +1,6 @@
 # Configuration for probot-stale - https://github.com/probot/stale
 # Number of days of inactivity before an issue becomes stale
-daysUntilStale: 90
+daysUntilStale: 45
 # Number of days of inactivity before a stale issue is closed
 daysUntilClose: 7
 # Issues with these labels will never be considered stale

.gitignore

@@ -59,6 +59,7 @@ ElectronClient/gui/ResourceScreen.js
 ElectronClient/gui/ShareNoteDialog.js
 ElectronClient/gui/utils/NoteText.js
 ReactNativeClient/lib/AsyncActionQueue.js
+ReactNativeClient/lib/joplin-renderer/MdToHtml/rules/checkbox.js
 ReactNativeClient/lib/joplin-renderer/MdToHtml/rules/fence.js
 ReactNativeClient/lib/joplin-renderer/MdToHtml/rules/mermaid.js
 ReactNativeClient/lib/joplin-renderer/MdToHtml/rules/sanitize_html.js

BUILD.md

@@ -22,19 +22,6 @@ Then you can test the various applications:
 	cd ElectronClient
 	npm start
 
-If you'd like to auto-reload the app on changes rather than having to quit and restart it manually each time, you can use [watchman-make](https://facebook.github.io/watchman/docs/watchman-make.html):
-
-```sh
-cd ElectronClient
-watchman-make -p '**/*.js' '**/*.jsx' --run "npm start"
-```
-
-It still requires you to quit the application each time you want it to rebuild, but at least you don't have to re-run `"npm start"` each time. Here's what the workflow loop looks like in practice:
-
-1. Edit and save files in your text editor.
-2. Switch to the Electron app and <kbd>cmd</kbd>+<kbd>Q</kbd> to quit it.
-3. `watchman` immediately restarts the app for you (whereas usually you'd have to switch back to the terminal, type `"npm start"`, and hit enter).
-
 ## Testing the Terminal application
 
 	cd CliClient
@@ -47,12 +34,12 @@ First you need to setup React Native to build projects with native code. For thi
 Then:
 
 	cd ReactNativeClient
-	npm start-android
-	# Or: npm start-ios
+	npm run start-android
+	# Or: npm run start-ios
 
 To run the iOS application, it might be easier to open the file `ios/Joplin.xcworkspace` on XCode and run the app from there.
 
-Normally the bundler should start automatically with the application. If it doesn't run `npm start`.
+Normally the bundler should start automatically with the application. If it doesn't, run `npm start`.
 
 ## Building the clipper
 
@@ -80,37 +67,21 @@ You can specify additional parameters when running the desktop or CLI applicatio
 
 Most of the application is written in JavaScript, however new classes and files should generally be written in [TypeScript](https://www.typescriptlang.org/). All TypeScript files are generated next to the .ts or .tsx file. So for example, if there's a file "lib/MyClass.ts", there will be a generated "lib/MyClass.js" next to it. It is implemented that way as it requires minimal changes to integrate TypeScript in the existing JavaScript code base.
 
-# Troubleshooting desktop application
+## Hot reload
 
-## On Linux and macOS
+If you'd like to auto-reload the desktop app on changes rather than having to quit and restart it manually each time, you can use [watchman-make](https://facebook.github.io/watchman/docs/watchman-make.html):
 
-If there's an error `while loading shared libraries: libgconf-2.so.4: cannot open shared object file: No such file or directory`, run `sudo apt-get install libgconf-2-4`
+```sh
+cd ElectronClient
+watchman-make -p '**/*.js' '**/*.jsx' --run "npm start"
+```
 
-If you get a node-gyp related error, you might need to manually install it: `npm install -g node-gyp`.
+It still requires you to quit the application each time you want it to rebuild, but at least you don't have to re-run `"npm start"` each time. Here's what the workflow loop looks like in practice:
 
-If you get the error `libtool: unrecognized option '-static'`, follow the instructions [in this post](https://stackoverflow.com/a/38552393/561309) to use the correct libtool version.
+1. Edit and save files in your text editor.
+2. Switch to the Electron app and <kbd>cmd</kbd>+<kbd>Q</kbd> to quit it.
+3. `watchman` immediately restarts the app for you (whereas usually you'd have to switch back to the terminal, type `"npm start"`, and hit enter).
 
-## On Windows
+# Troubleshooting
 
-If node-gyp does not work (MSBUILD: error MSB3428: Could not load the Visual C++ component "VCBuild.exe"), you might need to install `windows-build-tools` using `npm install --global windows-build-tools`.
-
-If `yarn dist` fails, it may need administrative rights.
-
-If you get an `error MSB8020: The build tools for v140 cannot be found.` try to run with a different toolset version, eg `npm install --toolset=v141` (See [here](https://github.com/mapbox/node-sqlite3/issues/1124) for more info).
-
-## Other issues
-
-> The application window doesn't open or is white
-
-This is an indication that there's an early initialisation error. Try this:
-
-- In ElectronAppWrapper, set `debugEarlyBugs` to `true`. This will force the window to show up and should open the console next to it, which should display any error.
-- In more rare cases, an already open instance of Joplin can create strange low-level bugs that will display no error but will result in this white window. A non-dev instance of Joplin, or a dev instance that wasn't properly closed might cause this. So make sure you close everything and try again. Perhaps even other Electron apps running (Skype, Slack, etc.) could cause this?
-- Also try to delete node_modules and rebuild.
-- If all else fails, switch your computer off and on again, to make sure you start clean.
-
-> How to work on the app from Windows?
-
-**You should not use WSL at all** because this is a GUI app that lives outside of WSL, and the WSL layer can cause all kind of very hard to debug issues. It can also lock files in node_modules that cannot be unlocked when the app crashes. (You need to restart your computer.) Likewise, don't run the TypeScript watch command from WSL.
-
-So everything should be done from a Windows Command prompt or Windows PowerShell running as Administrator. All build and start commands are designed to work cross-platform, including on Windows.
+Please read for the [Build Troubleshooting Document](https://github.com/laurent22/joplin/blob/master/readme/build_troubleshooting.md) for various tips on how to get the build working.

CONTRIBUTING.md

@@ -23,13 +23,11 @@ Avoid listing multiple requests in one topic. One topic per request makes it eas
 
 Finally, when submitting a pull request, don't forget to [test your code](#unit-tests).
 
-# Contribute to the project
-
-## Contributing to Joplin's translation
+# Contributing to Joplin's translation
 
 Joplin is available in multiple languages thanks to the help of its users. You can help translate Joplin to your language or keep it up to date. Please read the documentation about [Localisation](https://joplinapp.org/#localisation).
 
-## Contributing to Joplin's code
+# Contributing to Joplin's code
 
 If you want to start contributing to the project's code, please follow these guidelines before creating a pull request: 
 
@@ -41,7 +39,7 @@ If you want to start contributing to the project's code, please follow these gui
 
 Building the apps is relatively easy - please [see the build instructions](https://github.com/laurent22/joplin/blob/master/BUILD.md) for more details.
 
-### Coding style
+## Coding style
 
 Coding style is enforced by a pre-commit hook that runs eslint. This hook is installed whenever running `npm install` on any of the application directory. If for some reason the pre-commit hook didn't get installed, you can manually install it by running `npm install` at the root of the repository.
 
@@ -49,44 +47,45 @@ For new React components, please use [React Hooks](https://reactjs.org/docs/hook
 
 For changes made to the Desktop client that affect the user interface, refer to `ElectronClient/app/theme.js` for all styling information. The goal is to create a consistent user interface to allow for easy navigation of Joplin's various features and improve the overall user experience.
 
-### Unit tests
+## Automated tests
 
-When submitting a pull request for a new feature or bug fix, please add unit tests for your code. Unit testing GUI changes is not always possible so it is not required, but any change in a file under /lib for example should be unit tested.
+When submitting a pull request for a new feature or bug fixes, please add automated tests for your code whenever possible. Tests in Joplin are divided in **unit tests** and **feature tests**.
+
+* **Unit tests** are used to tests models, services or utility classes - they are relatively low level. Unit tests should be prefixed with the type of class that is being tested - for example "models_Folder" or "services_SearchEngine".
+
+* **Feature tests** on the other hand are to test higher level functionalities such as interactions with the GUI and how they affect the underlying model. Often these tests would dispatch Redux actions, and inspect how the application state has been changed. The feature tests should be prefixed with "feature_", for example "feature_TagList". There's a good explanation on what qualifies as a feature test in [this post](https://github.com/laurent22/joplin/pull/2819#issuecomment-603502230).
 
 The tests are under CliClient/tests. To get them running, you first need to build the CLI app:
 
 ```sh
-npm run tsc # Build the .ts and .tsx files
-cd CliClient
 npm install
+cd CliClient
 ```
 
 To run all the test units:
 
 ```sh
-npm run test
+npm test
 ```
 
 To run just one particular file:
 
 ```sh
-npm run test -- --filter=markdownUtils # Don't add the .js extension
+npm test -- --filter=markdownUtils # Don't add the .js extension
 ```
 
 To filter tests. For example, to run all the test units that contain "should handle conflict" in their description:
 
 ```sh
-npm run test -- --filter="should handle conflict"
+npm test -- --filter="should handle conflict"
 ```
 
-If you get the error `Cannot find module '/joplin/CliClient/node_modules/sqlite3/lib/binding/node-v79-darwin-x64/node_sqlite3.node'`, you may need to run `npm rebuild`.
-
 ## About abandoned pull requests
 
-It happens that a pull request is started but not finished and despite our attempts to contact the contributor, we don’t hear from them again.
+It happens that a pull request is started but not finished and despite our attempts to contact the contributor, we don't hear from them again.
 
 In that case we will not merge the pull request, even if only small changes are missing. Our policy is simply to close the pull request. Why? Because an unfinished pull request essentially means giving us work and moving on. We would rather not encourage this behaviour.
 
 Also, please note that since we have spent time reviewing the pull request and proposing solutions, we reserve the right to re-use that knowledge to create a new pull request, potentially based on your changes.
 
-We’d much prefer that you complete the pull request though, so we’ll be sure to ping you a few times before that!
+We'd much prefer that you complete the pull request though, so we'll be sure to ping you a few times before that!

CliClient/app/app-gui.js

@@ -134,7 +134,7 @@ class AppGui {
 			const item = folderList.currentItem;
 
 			if (item === '-') {
-				let newIndex = event.currentIndex + (event.previousIndex < event.currentIndex ? +1 : -1);
+				const newIndex = event.currentIndex + (event.previousIndex < event.currentIndex ? +1 : -1);
 				let nextItem = folderList.itemAt(newIndex);
 				if (!nextItem) nextItem = folderList.itemAt(event.previousIndex);
 
@@ -186,7 +186,7 @@ class AppGui {
 			borderRightWidth: 1,
 		};
 		noteList.on('currentItemChange', async () => {
-			let note = noteList.currentItem;
+			const note = noteList.currentItem;
 			this.store_.dispatch({
 				type: 'NOTE_SELECT',
 				id: note ? note.id : null,
@@ -338,7 +338,7 @@ class AppGui {
 
 		if (consoleWidget.isMaximized__ === doMaximize) return;
 
-		let constraints = {
+		const constraints = {
 			type: 'stretch',
 			factor: !doMaximize ? 1 : 4,
 		};
@@ -415,10 +415,10 @@ class AppGui {
 	async handleModelAction(action) {
 		this.logger().info('Action:', action);
 
-		let state = Object.assign({}, defaultState);
+		const state = Object.assign({}, defaultState);
 		state.notes = this.widget('noteList').items;
 
-		let newState = reducer(state, action);
+		const newState = reducer(state, action);
 
 		if (newState !== state) {
 			this.widget('noteList').items = newState.notes;
@@ -485,9 +485,9 @@ class AppGui {
 		// this.logger().debug('Got command: ' + cmd);
 
 		try {
-			let note = this.widget('noteList').currentItem;
-			let folder = this.widget('folderList').currentItem;
-			let args = splitCommandString(cmd);
+			const note = this.widget('noteList').currentItem;
+			const folder = this.widget('folderList').currentItem;
+			const args = splitCommandString(cmd);
 
 			for (let i = 0; i < args.length; i++) {
 				if (args[i] == '$n') {
@@ -548,7 +548,7 @@ class AppGui {
 	stdout(text) {
 		if (text === null || text === undefined) return;
 
-		let lines = text.split('\n');
+		const lines = text.split('\n');
 		for (let i = 0; i < lines.length; i++) {
 			const v = typeof lines[i] === 'object' ? JSON.stringify(lines[i]) : lines[i];
 			this.widget('console').addLine(v);
@@ -626,7 +626,7 @@ class AppGui {
 
 			if (link.type === 'item') {
 				const itemId = link.id;
-				let item = await BaseItem.loadItemById(itemId);
+				const item = await BaseItem.loadItemById(itemId);
 				if (!item) throw new Error(`No item with ID ${itemId}`); // Should be nearly impossible
 
 				if (item.type_ === BaseModel.TYPE_RESOURCE) {
@@ -750,7 +750,7 @@ class AppGui {
 				// -------------------------------------------------------------------------
 
 				const shortcutKey = this.currentShortcutKeys_.join('');
-				let keymapItem = this.keymapItemByKey(shortcutKey);
+				const keymapItem = this.keymapItemByKey(shortcutKey);
 
 				// If this command is an alias to another command, resolve to the actual command
 
@@ -766,7 +766,7 @@ class AppGui {
 					if (keymapItem.type === 'function') {
 						this.processFunctionCommand(keymapItem.command);
 					} else if (keymapItem.type === 'prompt') {
-						let promptOptions = {};
+						const promptOptions = {};
 						if ('cursorPosition' in keymapItem) promptOptions.cursorPosition = keymapItem.cursorPosition;
 						const commandString = await statusBar.prompt(keymapItem.command ? keymapItem.command : '', null, promptOptions);
 						this.addCommandToConsole(commandString);

CliClient/app/app.js

@@ -47,7 +47,7 @@ class Application extends BaseApplication {
 	}
 
 	async loadItem(type, pattern, options = null) {
-		let output = await this.loadItems(type, pattern, options);
+		const output = await this.loadItems(type, pattern, options);
 
 		if (output.length > 1) {
 			// output.sort((a, b) => { return a.user_updated_time < b.user_updated_time ? +1 : -1; });
@@ -144,7 +144,7 @@ class Application extends BaseApplication {
 			if (options.type === 'boolean') {
 				if (answer === null) return false; // Pressed ESCAPE
 				if (!answer) answer = options.answers[0];
-				let positiveIndex = options.booleanAnswerDefault == 'y' ? 0 : 1;
+				const positiveIndex = options.booleanAnswerDefault == 'y' ? 0 : 1;
 				return answer.toLowerCase() === options.answers[positiveIndex].toLowerCase();
 			} else {
 				return answer;
@@ -181,7 +181,7 @@ class Application extends BaseApplication {
 				const ext = fileExtension(path);
 				if (ext != 'js') return;
 
-				let CommandClass = require(`./${path}`);
+				const CommandClass = require(`./${path}`);
 				let cmd = new CommandClass();
 				if (!cmd.enabled()) return;
 				cmd = this.setupCommand(cmd);
@@ -192,8 +192,8 @@ class Application extends BaseApplication {
 		}
 
 		if (uiType !== null) {
-			let temp = [];
-			for (let n in this.commands_) {
+			const temp = [];
+			for (const n in this.commands_) {
 				if (!this.commands_.hasOwnProperty(n)) continue;
 				const c = this.commands_[n];
 				if (!c.supportsUi(uiType)) continue;
@@ -207,8 +207,8 @@ class Application extends BaseApplication {
 
 	async commandNames() {
 		const metadata = await this.commandMetadata();
-		let output = [];
-		for (let n in metadata) {
+		const output = [];
+		for (const n in metadata) {
 			if (!metadata.hasOwnProperty(n)) continue;
 			output.push(n);
 		}
@@ -227,7 +227,7 @@ class Application extends BaseApplication {
 		const commands = this.commands();
 
 		output = {};
-		for (let n in commands) {
+		for (const n in commands) {
 			if (!commands.hasOwnProperty(n)) continue;
 			const cmd = commands[n];
 			output[n] = cmd.metadata();
@@ -251,7 +251,7 @@ class Application extends BaseApplication {
 			CommandClass = require(`${__dirname}/command-${name}.js`);
 		} catch (error) {
 			if (error.message && error.message.indexOf('Cannot find module') >= 0) {
-				let e = new Error(_('No such command: %s', name));
+				const e = new Error(_('No such command: %s', name));
 				e.type = 'notFound';
 				throw e;
 			} else {
@@ -362,7 +362,7 @@ class Application extends BaseApplication {
 		}
 
 		const output = [];
-		for (let n in itemsByCommand) {
+		for (const n in itemsByCommand) {
 			if (!itemsByCommand.hasOwnProperty(n)) continue;
 			output.push(itemsByCommand[n]);
 		}

CliClient/app/autocompletion.js

@@ -1,20 +1,20 @@
-var { app } = require('./app.js');
-var Note = require('lib/models/Note.js');
-var Folder = require('lib/models/Folder.js');
-var Tag = require('lib/models/Tag.js');
-var { cliUtils } = require('./cli-utils.js');
-var yargParser = require('yargs-parser');
-var fs = require('fs-extra');
+const { app } = require('./app.js');
+const Note = require('lib/models/Note.js');
+const Folder = require('lib/models/Folder.js');
+const Tag = require('lib/models/Tag.js');
+const { cliUtils } = require('./cli-utils.js');
+const yargParser = require('yargs-parser');
+const fs = require('fs-extra');
 
 async function handleAutocompletionPromise(line) {
 	// Auto-complete the command name
 	const names = await app().commandNames();
-	let words = getArguments(line);
+	const words = getArguments(line);
 	// If there is only one word and it is not already a command name then you
 	// should look for commands it could be
 	if (words.length == 1) {
 		if (names.indexOf(words[0]) === -1) {
-			let x = names.filter(n => n.indexOf(words[0]) === 0);
+			const x = names.filter(n => n.indexOf(words[0]) === 0);
 			if (x.length === 1) {
 				return `${x[0]} `;
 			}
@@ -36,8 +36,8 @@ async function handleAutocompletionPromise(line) {
 	}
 
 	// complete an option
-	let next = words.length > 1 ? words[words.length - 1] : '';
-	let l = [];
+	const next = words.length > 1 ? words[words.length - 1] : '';
+	const l = [];
 	if (next[0] === '-') {
 		for (let i = 0; i < metadata.options.length; i++) {
 			const options = metadata.options[i][0].split(' ');
@@ -60,7 +60,7 @@ async function handleAutocompletionPromise(line) {
 		if (l.length === 0) {
 			return line;
 		}
-		let ret = l.map(a => toCommandLine(a));
+		const ret = l.map(a => toCommandLine(a));
 		ret.prefix = `${toCommandLine(words.slice(0, -1))} `;
 		return ret;
 	}
@@ -69,7 +69,7 @@ async function handleAutocompletionPromise(line) {
 	// words that don't start with a - less one for the command name
 	const positionalArgs = words.filter(a => a.indexOf('-') !== 0).length - 1;
 
-	let cmdUsage = yargParser(metadata.usage)['_'];
+	const cmdUsage = yargParser(metadata.usage)['_'];
 	cmdUsage.splice(0, 1);
 
 	if (cmdUsage.length >= positionalArgs) {
@@ -95,29 +95,29 @@ async function handleAutocompletionPromise(line) {
 		}
 
 		if (argName == 'tag') {
-			let tags = await Tag.search({ titlePattern: `${next}*` });
+			const tags = await Tag.search({ titlePattern: `${next}*` });
 			l.push(...tags.map(n => n.title));
 		}
 
 		if (argName == 'file') {
-			let files = await fs.readdir('.');
+			const files = await fs.readdir('.');
 			l.push(...files);
 		}
 
 		if (argName == 'tag-command') {
-			let c = filterList(['add', 'remove', 'list', 'notetags'], next);
+			const c = filterList(['add', 'remove', 'list', 'notetags'], next);
 			l.push(...c);
 		}
 
 		if (argName == 'todo-command') {
-			let c = filterList(['toggle', 'clear'], next);
+			const c = filterList(['toggle', 'clear'], next);
 			l.push(...c);
 		}
 	}
 	if (l.length === 1) {
 		return toCommandLine([...words.slice(0, -1), l[0]]);
 	} else if (l.length > 1) {
-		let ret = l.map(a => toCommandLine(a));
+		const ret = l.map(a => toCommandLine(a));
 		ret.prefix = `${toCommandLine(words.slice(0, -1))} `;
 		return ret;
 	}
@@ -155,7 +155,7 @@ function getArguments(line) {
 	let inSingleQuotes = false;
 	let inDoubleQuotes = false;
 	let currentWord = '';
-	let parsed = [];
+	const parsed = [];
 	for (let i = 0; i < line.length; i++) {
 		if (line[i] === '"') {
 			if (inDoubleQuotes) {
@@ -192,7 +192,7 @@ function getArguments(line) {
 	return parsed;
 }
 function filterList(list, next) {
-	let output = [];
+	const output = [];
 	for (let i = 0; i < list.length; i++) {
 		if (list[i].indexOf(next) !== 0) continue;
 		output.push(list[i]);

CliClient/app/base-command.js

@@ -50,7 +50,7 @@ class BaseCommand {
 	async cancel() {}
 
 	name() {
-		let r = this.usage().split(' ');
+		const r = this.usage().split(' ');
 		return r[0];
 	}
 

CliClient/app/build-doc.js

@@ -15,11 +15,11 @@ function wrap(text, indent) {
 }
 
 function renderOptions(options) {
-	let output = [];
+	const output = [];
 	const optionColWidth = getOptionColWidth(options);
 
 	for (let i = 0; i < options.length; i++) {
-		let option = options[i];
+		const option = options[i];
 		const flag = option[0];
 		const indent = INDENT + INDENT + ' '.repeat(optionColWidth + 2);
 
@@ -33,7 +33,7 @@ function renderOptions(options) {
 }
 
 function renderCommand(cmd) {
-	let output = [];
+	const output = [];
 	output.push(INDENT + cmd.usage());
 	output.push('');
 	output.push(wrap(cmd.description(), INDENT + INDENT));
@@ -48,14 +48,14 @@ function renderCommand(cmd) {
 }
 
 function getCommands() {
-	let output = [];
+	const output = [];
 	fs.readdirSync(__dirname).forEach(path => {
 		if (path.indexOf('command-') !== 0) return;
 		const ext = fileExtension(path);
 		if (ext != 'js') return;
 
-		let CommandClass = require(`./${path}`);
-		let cmd = new CommandClass();
+		const CommandClass = require(`./${path}`);
+		const cmd = new CommandClass();
 		if (!cmd.enabled()) return;
 		if (cmd.hidden()) return;
 		output.push(cmd);
@@ -73,7 +73,7 @@ function getOptionColWidth(options) {
 }
 
 function getHeader() {
-	let output = [];
+	const output = [];
 
 	output.push('NAME');
 	output.push('');
@@ -84,7 +84,7 @@ function getHeader() {
 	output.push('DESCRIPTION');
 	output.push('');
 
-	let description = [];
+	const description = [];
 	description.push('Joplin is a note taking and to-do application, which can handle a large number of notes organised into notebooks.');
 	description.push('The notes are searchable, can be copied, tagged and modified with your own text editor.');
 	description.push('\n\n');
@@ -98,7 +98,7 @@ function getHeader() {
 }
 
 function getFooter() {
-	let output = [];
+	const output = [];
 
 	output.push('WEBSITE');
 	output.push('');
@@ -120,10 +120,10 @@ async function main() {
 	// setLocale('fr_FR');
 
 	const commands = getCommands();
-	let commandBlocks = [];
+	const commandBlocks = [];
 
 	for (let i = 0; i < commands.length; i++) {
-		let cmd = commands[i];
+		const cmd = commands[i];
 		commandBlocks.push(renderCommand(cmd));
 	}
 

CliClient/app/cli-integration-tests.js

@@ -40,8 +40,8 @@ function createClient(id) {
 const client = createClient(1);
 
 function execCommand(client, command) {
-	let exePath = `node ${joplinAppPath}`;
-	let cmd = `${exePath} --update-geolocation-disabled --env dev --profile ${client.profileDir} ${command}`;
+	const exePath = `node ${joplinAppPath}`;
+	const cmd = `${exePath} --update-geolocation-disabled --env dev --profile ${client.profileDir} ${command}`;
 	logger.info(`${client.id}: ${command}`);
 
 	return new Promise((resolve, reject) => {
@@ -129,8 +129,8 @@ testUnits.testCat = async () => {
 	await execCommand(client, 'mkbook nb1');
 	await execCommand(client, 'mknote mynote');
 
-	let folder = await Folder.loadByTitle('nb1');
-	let note = await Note.loadFolderNoteByField(folder.id, 'title', 'mynote');
+	const folder = await Folder.loadByTitle('nb1');
+	const note = await Note.loadFolderNoteByField(folder.id, 'title', 'mynote');
 
 	let r = await execCommand(client, 'cat mynote');
 	assertTrue(r.indexOf('mynote') >= 0);
@@ -149,7 +149,7 @@ testUnits.testConfig = async () => {
 	await Setting.load();
 	assertEquals('subl', Setting.value('editor'));
 
-	let r = await execCommand(client, 'config');
+	const r = await execCommand(client, 'config');
 	assertTrue(r.indexOf('editor') >= 0);
 	assertTrue(r.indexOf('subl') >= 0);
 };
@@ -161,14 +161,14 @@ testUnits.testCp = async () => {
 
 	await execCommand(client, 'cp n1');
 
-	let f1 = await Folder.loadByTitle('nb1');
-	let f2 = await Folder.loadByTitle('nb2');
+	const f1 = await Folder.loadByTitle('nb1');
+	const f2 = await Folder.loadByTitle('nb2');
 	let notes = await Note.previews(f1.id);
 
 	assertEquals(2, notes.length);
 
 	await execCommand(client, 'cp n1 nb2');
-	let notesF1 = await Note.previews(f1.id);
+	const notesF1 = await Note.previews(f1.id);
 	assertEquals(2, notesF1.length);
 	notes = await Note.previews(f2.id);
 	assertEquals(1, notes.length);
@@ -179,7 +179,7 @@ testUnits.testLs = async () => {
 	await execCommand(client, 'mkbook nb1');
 	await execCommand(client, 'mknote note1');
 	await execCommand(client, 'mknote note2');
-	let r = await execCommand(client, 'ls');
+	const r = await execCommand(client, 'ls');
 
 	assertTrue(r.indexOf('note1') >= 0);
 	assertTrue(r.indexOf('note2') >= 0);
@@ -191,8 +191,8 @@ testUnits.testMv = async () => {
 	await execCommand(client, 'mknote n1');
 	await execCommand(client, 'mv n1 nb2');
 
-	let f1 = await Folder.loadByTitle('nb1');
-	let f2 = await Folder.loadByTitle('nb2');
+	const f1 = await Folder.loadByTitle('nb1');
+	const f2 = await Folder.loadByTitle('nb2');
 	let notes1 = await Note.previews(f1.id);
 	let notes2 = await Note.previews(f2.id);
 
@@ -218,18 +218,18 @@ async function main() {
 	logger.info(await execCommand(client, 'version'));
 
 	await db.open({ name: `${client.profileDir}/database.sqlite` });
-	BaseModel.db_ = db;
+	BaseModel.setDb(db);
 	await Setting.load();
 
 	let onlyThisTest = 'testMv';
 	onlyThisTest = '';
 
-	for (let n in testUnits) {
+	for (const n in testUnits) {
 		if (!testUnits.hasOwnProperty(n)) continue;
 		if (onlyThisTest && n != onlyThisTest) continue;
 
 		await clearDatabase();
-		let testName = n.substr(4).toLowerCase();
+		const testName = n.substr(4).toLowerCase();
 		process.stdout.write(`${testName}: `);
 		await testUnits[n]();
 		console.info('');

CliClient/app/cli-utils.js

@@ -11,27 +11,27 @@ cliUtils.printArray = function(logFunction, rows) {
 	const ALIGN_LEFT = 0;
 	const ALIGN_RIGHT = 1;
 
-	let colWidths = [];
-	let colAligns = [];
+	const colWidths = [];
+	const colAligns = [];
 
 	for (let i = 0; i < rows.length; i++) {
-		let row = rows[i];
+		const row = rows[i];
 
 		for (let j = 0; j < row.length; j++) {
-			let item = row[j];
-			let width = item ? item.toString().length : 0;
-			let align = typeof item == 'number' ? ALIGN_RIGHT : ALIGN_LEFT;
+			const item = row[j];
+			const width = item ? item.toString().length : 0;
+			const align = typeof item == 'number' ? ALIGN_RIGHT : ALIGN_LEFT;
 			if (!colWidths[j] || colWidths[j] < width) colWidths[j] = width;
 			if (colAligns.length <= j) colAligns[j] = align;
 		}
 	}
 
 	for (let row = 0; row < rows.length; row++) {
-		let line = [];
+		const line = [];
 		for (let col = 0; col < colWidths.length; col++) {
-			let item = rows[row][col];
-			let width = colWidths[col];
-			let dir = colAligns[col] == ALIGN_LEFT ? stringPadding.RIGHT : stringPadding.LEFT;
+			const item = rows[row][col];
+			const width = colWidths[col];
+			const dir = colAligns[col] == ALIGN_LEFT ? stringPadding.RIGHT : stringPadding.LEFT;
 			line.push(stringPadding(item, width, ' ', dir));
 		}
 		logFunction(line.join(' '));
@@ -39,7 +39,7 @@ cliUtils.printArray = function(logFunction, rows) {
 };
 
 cliUtils.parseFlags = function(flags) {
-	let output = {};
+	const output = {};
 	flags = flags.split(',');
 	for (let i = 0; i < flags.length; i++) {
 		let f = flags[i].trim();
@@ -76,11 +76,11 @@ cliUtils.parseCommandArg = function(arg) {
 cliUtils.makeCommandArgs = function(cmd, argv) {
 	let cmdUsage = cmd.usage();
 	cmdUsage = yargParser(cmdUsage);
-	let output = {};
+	const output = {};
 
-	let options = cmd.options();
-	let booleanFlags = [];
-	let aliases = {};
+	const options = cmd.options();
+	const booleanFlags = [];
+	const aliases = {};
 	for (let i = 0; i < options.length; i++) {
 		if (options[i].length != 2) throw new Error(`Invalid options: ${options[i]}`);
 		let flags = options[i][0];
@@ -97,7 +97,7 @@ cliUtils.makeCommandArgs = function(cmd, argv) {
 		}
 	}
 
-	let args = yargParser(argv, {
+	const args = yargParser(argv, {
 		boolean: booleanFlags,
 		alias: aliases,
 		string: ['_'],
@@ -113,8 +113,8 @@ cliUtils.makeCommandArgs = function(cmd, argv) {
 		}
 	}
 
-	let argOptions = {};
-	for (let key in args) {
+	const argOptions = {};
+	for (const key in args) {
 		if (!args.hasOwnProperty(key)) continue;
 		if (key == '_') continue;
 		argOptions[key] = args[key];
@@ -134,7 +134,7 @@ cliUtils.promptMcq = function(message, answers) {
 	});
 
 	message += '\n\n';
-	for (let n in answers) {
+	for (const n in answers) {
 		if (!answers.hasOwnProperty(n)) continue;
 		message += `${_('%s: %s', n, answers[n])}\n`;
 	}

CliClient/app/command-apidoc.js

@@ -56,7 +56,6 @@ class Command extends BaseCommand {
 		lines.push('# Joplin API');
 		lines.push('');
 
-		lines.push('When the Web Clipper service is enabled, Joplin exposes a [REST API](https://en.wikipedia.org/wiki/Representational_state_transfer) which allows third-party applications to access Joplin\'s data and to create, modify or delete notes, notebooks, resources or tags.');
 		lines.push('');
 		lines.push('In order to use it, you\'ll first need to find on which port the service is running. To do so, open the Web Clipper Options in Joplin and if the service is running it should tell you on which port. Normally it runs on port **41184**. If you want to find it programmatically, you may follow this kind of algorithm:');
 		lines.push('');

CliClient/app/command-attach.js

@@ -14,9 +14,9 @@ class Command extends BaseCommand {
 	}
 
 	async action(args) {
-		let title = args['note'];
+		const title = args['note'];
 
-		let note = await app().loadItem(BaseModel.TYPE_NOTE, title, { parent: app().currentFolder() });
+		const note = await app().loadItem(BaseModel.TYPE_NOTE, title, { parent: app().currentFolder() });
 		this.encryptionCheck(note);
 		if (!note) throw new Error(_('Cannot find "%s".', title));
 

CliClient/app/command-cat.js

@@ -18,9 +18,9 @@ class Command extends BaseCommand {
 	}
 
 	async action(args) {
-		let title = args['note'];
+		const title = args['note'];
 
-		let item = await app().loadItem(BaseModel.TYPE_NOTE, title, { parent: app().currentFolder() });
+		const item = await app().loadItem(BaseModel.TYPE_NOTE, title, { parent: app().currentFolder() });
 		if (!item) throw new Error(_('Cannot find "%s".', title));
 
 		const content = args.options.verbose ? await Note.serialize(item) : await Note.serializeForEdit(item);

CliClient/app/command-config.js

@@ -35,7 +35,7 @@ class Command extends BaseCommand {
 			});
 
 			inputStream.on('end', () => {
-				let json = chunks.join('');
+				const json = chunks.join('');
 				let settingsObj;
 				try {
 					settingsObj = JSON.parse(json);
@@ -83,7 +83,7 @@ class Command extends BaseCommand {
 		};
 
 		if (isExport || (!isImport && !args.value)) {
-			let keys = Setting.keys(!verbose, 'cli');
+			const keys = Setting.keys(!verbose, 'cli');
 			keys.sort();
 
 			if (isExport) {

CliClient/app/command-dump.js

@@ -18,15 +18,15 @@ class Command extends BaseCommand {
 
 	async action() {
 		let items = [];
-		let folders = await Folder.all();
+		const folders = await Folder.all();
 		for (let i = 0; i < folders.length; i++) {
-			let folder = folders[i];
-			let notes = await Note.previews(folder.id);
+			const folder = folders[i];
+			const notes = await Note.previews(folder.id);
 			items.push(folder);
 			items = items.concat(notes);
 		}
 
-		let tags = await Tag.all();
+		const tags = await Tag.all();
 		for (let i = 0; i < tags.length; i++) {
 			tags[i].notes_ = await Tag.noteIds(tags[i].id);
 		}

CliClient/app/command-e2ee.js

@@ -24,12 +24,11 @@ class Command extends BaseCommand {
 			['-p, --password <password>', 'Use this password as master password (For security reasons, it is not recommended to use this option).'],
 			['-v, --verbose', 'More verbose output for the `target-status` command'],
 			['-o, --output <directory>', 'Output directory'],
+			['--retry-failed-items', 'Applies to `decrypt` command - retries decrypting items that previously could not be decrypted.'],
 		];
 	}
 
 	async action(args) {
-		// change-password
-
 		const options = args.options;
 
 		const askForMasterKey = async error => {
@@ -44,6 +43,27 @@ class Command extends BaseCommand {
 			return true;
 		};
 
+		const startDecryption = async () => {
+			this.stdout(_('Starting decryption... Please wait as it may take several minutes depending on how much there is to decrypt.'));
+
+			while (true) {
+				try {
+					await DecryptionWorker.instance().start();
+					break;
+				} catch (error) {
+					if (error.code === 'masterKeyNotLoaded') {
+						const ok = await askForMasterKey(error);
+						if (!ok) return;
+						continue;
+					}
+
+					throw error;
+				}
+			}
+
+			this.stdout(_('Completed decryption.'));
+		};
+
 		if (args.command === 'enable') {
 			const password = options.password ? options.password.toString() : await this.prompt(_('Enter master password:'), { type: 'string', secure: true });
 			if (!password) {
@@ -73,24 +93,8 @@ class Command extends BaseCommand {
 				const plainText = await EncryptionService.instance().decryptString(args.path);
 				this.stdout(plainText);
 			} else {
-				this.stdout(_('Starting decryption... Please wait as it may take several minutes depending on how much there is to decrypt.'));
-
-				while (true) {
-					try {
-						await DecryptionWorker.instance().start();
-						break;
-					} catch (error) {
-						if (error.code === 'masterKeyNotLoaded') {
-							const ok = await askForMasterKey(error);
-							if (!ok) return;
-							continue;
-						}
-
-						throw error;
-					}
-				}
-
-				this.stdout(_('Completed decryption.'));
+				if (args.options['retry-failed-items']) await DecryptionWorker.instance().clearDisabledItems();
+				await startDecryption();
 			}
 
 			return;
@@ -138,7 +142,7 @@ class Command extends BaseCommand {
 			if (!targetPath) throw new Error('Please specify the sync target path.');
 
 			const dirPaths = function(targetPath) {
-				let paths = [];
+				const paths = [];
 				fs.readdirSync(targetPath).forEach(path => {
 					paths.push(path);
 				});
@@ -151,10 +155,10 @@ class Command extends BaseCommand {
 			let encryptedResourceCount = 0;
 			let otherItemCount = 0;
 
-			let encryptedPaths = [];
-			let decryptedPaths = [];
+			const encryptedPaths = [];
+			const decryptedPaths = [];
 
-			let paths = dirPaths(targetPath);
+			const paths = dirPaths(targetPath);
 
 			for (let i = 0; i < paths.length; i++) {
 				const path = paths[i];
@@ -164,7 +168,7 @@ class Command extends BaseCommand {
 				// this.stdout(fullPath);
 
 				if (path === '.resource') {
-					let resourcePaths = dirPaths(fullPath);
+					const resourcePaths = dirPaths(fullPath);
 					for (let j = 0; j < resourcePaths.length; j++) {
 						const resourcePath = resourcePaths[j];
 						resourceCount++;

CliClient/app/command-edit.js

@@ -35,7 +35,7 @@ class Command extends BaseCommand {
 			// Load note or create it if it doesn't exist
 			// -------------------------------------------------------------------------
 
-			let title = args['note'];
+			const title = args['note'];
 
 			if (!app().currentFolder()) throw new Error(_('No active notebook.'));
 			let note = await app().loadItem(BaseModel.TYPE_NOTE, title);
@@ -91,7 +91,7 @@ class Command extends BaseCommand {
 
 			const updatedContent = await fs.readFile(tempFilePath, 'utf8');
 			if (updatedContent !== originalContent) {
-				let updatedNote = await Note.unserializeForEdit(updatedContent);
+				const updatedNote = await Note.unserializeForEdit(updatedContent);
 				updatedNote.id = note.id;
 				await Note.save(updatedNote);
 				this.stdout(_('Note has been saved.'));

CliClient/app/command-export.js

@@ -24,7 +24,7 @@ class Command extends BaseCommand {
 	}
 
 	async action(args) {
-		let exportOptions = {};
+		const exportOptions = {};
 		exportOptions.path = args.path;
 
 		exportOptions.format = args.options.format ? args.options.format : 'jex';

CliClient/app/command-geoloc.js

@@ -14,9 +14,9 @@ class Command extends BaseCommand {
 	}
 
 	async action(args) {
-		let title = args['note'];
+		const title = args['note'];
 
-		let item = await app().loadItem(BaseModel.TYPE_NOTE, title, { parent: app().currentFolder() });
+		const item = await app().loadItem(BaseModel.TYPE_NOTE, title, { parent: app().currentFolder() });
 		if (!item) throw new Error(_('Cannot find "%s".', title));
 		const url = Note.geolocationUrl(item);
 		this.stdout(url);

CliClient/app/command-help.js

@@ -15,8 +15,8 @@ class Command extends BaseCommand {
 
 	allCommands() {
 		const commands = app().commands(app().uiType());
-		let output = [];
-		for (let n in commands) {
+		const output = [];
+		for (const n in commands) {
 			if (!commands.hasOwnProperty(n)) continue;
 			const command = commands[n];
 			if (command.hidden()) continue;
@@ -48,7 +48,7 @@ class Command extends BaseCommand {
 				.gui()
 				.keymap();
 
-			let rows = [];
+			const rows = [];
 
 			for (let i = 0; i < keymap.length; i++) {
 				const item = keymap[i];

CliClient/app/command-import.js

@@ -25,7 +25,7 @@ class Command extends BaseCommand {
 	}
 
 	async action(args) {
-		let folder = await app().loadItem(BaseModel.TYPE_FOLDER, args.notebook);
+		const folder = await app().loadItem(BaseModel.TYPE_FOLDER, args.notebook);
 
 		if (args.notebook && !folder) throw new Error(_('Cannot find "%s".', args.notebook));
 
@@ -39,7 +39,7 @@ class Command extends BaseCommand {
 		// onProgress/onError supported by Enex import only
 
 		importOptions.onProgress = progressState => {
-			let line = [];
+			const line = [];
 			line.push(_('Found: %d.', progressState.loaded));
 			line.push(_('Created: %d.', progressState.created));
 			if (progressState.updated) line.push(_('Updated: %d.', progressState.updated));
@@ -51,7 +51,7 @@ class Command extends BaseCommand {
 		};
 
 		importOptions.onError = error => {
-			let s = error.trace ? error.trace : error.toString();
+			const s = error.trace ? error.trace : error.toString();
 			this.stdout(s);
 		};
 

CliClient/app/command-ls.js

@@ -34,11 +34,11 @@ class Command extends BaseCommand {
 	}
 
 	async action(args) {
-		let pattern = args['note-pattern'];
+		const pattern = args['note-pattern'];
 		let items = [];
-		let options = args.options;
+		const options = args.options;
 
-		let queryOptions = {};
+		const queryOptions = {};
 		if (options.limit) queryOptions.limit = options.limit;
 		if (options.sort) {
 			queryOptions.orderBy = options.sort;
@@ -70,19 +70,19 @@ class Command extends BaseCommand {
 		} else {
 			let hasTodos = false;
 			for (let i = 0; i < items.length; i++) {
-				let item = items[i];
+				const item = items[i];
 				if (item.is_todo) {
 					hasTodos = true;
 					break;
 				}
 			}
 
-			let seenTitles = [];
-			let rows = [];
+			const seenTitles = [];
+			const rows = [];
 			let shortIdShown = false;
 			for (let i = 0; i < items.length; i++) {
-				let item = items[i];
-				let row = [];
+				const item = items[i];
+				const row = [];
 
 				if (options.long) {
 					row.push(BaseModel.shortId(item.id));

CliClient/app/command-mkbook.js

@@ -13,7 +13,7 @@ class Command extends BaseCommand {
 	}
 
 	async action(args) {
-		let folder = await Folder.save({ title: args['new-notebook'] }, { userSideValidation: true });
+		const folder = await Folder.save({ title: args['new-notebook'] }, { userSideValidation: true });
 		app().switchCurrentFolder(folder);
 	}
 }

CliClient/app/command-rmnote.js

@@ -26,7 +26,7 @@ class Command extends BaseCommand {
 
 		const ok = force ? true : await this.prompt(notes.length > 1 ? _('%d notes match this pattern. Delete them?', notes.length) : _('Delete note?'), { booleanAnswerDefault: 'n' });
 		if (!ok) return;
-		let ids = notes.map(n => n.id);
+		const ids = notes.map(n => n.id);
 		await Note.batchDelete(ids);
 	}
 }

CliClient/app/command-search.js

@@ -18,8 +18,8 @@ class Command extends BaseCommand {
 	}
 
 	async action(args) {
-		let pattern = args['pattern'];
-		let folderTitle = args['notebook'];
+		const pattern = args['pattern'];
+		const folderTitle = args['notebook'];
 
 		let folder = null;
 		if (folderTitle) {

CliClient/app/command-set.js

@@ -23,18 +23,18 @@ class Command extends BaseCommand {
 	}
 
 	async action(args) {
-		let title = args['note'];
-		let propName = args['name'];
+		const title = args['note'];
+		const propName = args['name'];
 		let propValue = args['value'];
 		if (!propValue) propValue = '';
 
-		let notes = await app().loadItems(BaseModel.TYPE_NOTE, title);
+		const notes = await app().loadItems(BaseModel.TYPE_NOTE, title);
 		if (!notes.length) throw new Error(_('Cannot find "%s".', title));
 
 		for (let i = 0; i < notes.length; i++) {
 			this.encryptionCheck(notes[i]);
 
-			let newNote = {
+			const newNote = {
 				id: notes[i].id,
 				type_: notes[i].type_,
 			};

CliClient/app/command-status.js

@@ -14,30 +14,39 @@ class Command extends BaseCommand {
 	}
 
 	async action() {
-		let service = new ReportService();
-		let report = await service.status(Setting.value('sync.target'));
+		const service = new ReportService();
+		const report = await service.status(Setting.value('sync.target'));
 
 		for (let i = 0; i < report.length; i++) {
-			let section = report[i];
+			const section = report[i];
 
 			if (i > 0) this.stdout('');
 
 			this.stdout(`# ${section.title}`);
 			this.stdout('');
 
-			for (let n in section.body) {
+			let canRetryType = '';
+
+			for (const n in section.body) {
 				if (!section.body.hasOwnProperty(n)) continue;
-				let line = section.body[n];
-				this.stdout(line);
+				const item = section.body[n];
+
+				if (typeof item === 'object') {
+					canRetryType = item.canRetryType;
+					this.stdout(item.text);
+				} else {
+					this.stdout(item);
+				}
+			}
+
+			if (canRetryType === 'e2ee') {
+				this.stdout('');
+				this.stdout(_('To retry decryption of these items. Run `e2ee decrypt --retry-failed-items`'));
 			}
 		}
 
-		app()
-			.gui()
-			.showConsole();
-		app()
-			.gui()
-			.maximizeConsole();
+		app().gui().showConsole();
+		app().gui().maximizeConsole();
 	}
 }
 

CliClient/app/command-sync.js

@@ -161,9 +161,9 @@ class Command extends BaseCommand {
 
 			const sync = await syncTarget.synchronizer();
 
-			let options = {
+			const options = {
 				onProgress: report => {
-					let lines = Synchronizer.reportToLines(report);
+					const lines = Synchronizer.reportToLines(report);
 					if (lines.length) cliUtils.redraw(lines.join(' '));
 				},
 				onMessage: msg => {
@@ -185,7 +185,7 @@ class Command extends BaseCommand {
 			options.context = context;
 
 			try {
-				let newContext = await sync.start(options);
+				const newContext = await sync.start(options);
 				Setting.setValue(contextKey, JSON.stringify(newContext));
 			} catch (error) {
 				if (error.code == 'alreadyStarted') {

CliClient/app/command-tag.js

@@ -20,7 +20,7 @@ class Command extends BaseCommand {
 
 	async action(args) {
 		let tag = null;
-		let options = args.options;
+		const options = args.options;
 
 		if (args.tag) tag = await app().loadItem(BaseModel.TYPE_TAG, args.tag);
 		let notes = [];
@@ -46,7 +46,7 @@ class Command extends BaseCommand {
 			}
 		} else if (command == 'list') {
 			if (tag) {
-				let notes = await Tag.notes(tag.id);
+				const notes = await Tag.notes(tag.id);
 				notes.map(note => {
 					let line = '';
 					if (options.long) {
@@ -70,7 +70,7 @@ class Command extends BaseCommand {
 					this.stdout(line);
 				});
 			} else {
-				let tags = await Tag.all();
+				const tags = await Tag.all();
 				tags.map(tag => {
 					this.stdout(tag.title);
 				});

CliClient/app/command-use.js

@@ -17,7 +17,7 @@ class Command extends BaseCommand {
 	}
 
 	async action(args) {
-		let folder = await app().loadItem(BaseModel.TYPE_FOLDER, args['notebook']);
+		const folder = await app().loadItem(BaseModel.TYPE_FOLDER, args['notebook']);
 		if (!folder) throw new Error(_('Cannot find "%s".', args['notebook']));
 		app().switchCurrentFolder(folder);
 	}

CliClient/app/fuzzing.js

@@ -12,7 +12,7 @@ const fs = require('fs-extra');
 const baseDir = `${dirname(__dirname)}/tests/fuzzing`;
 const syncDir = `${baseDir}/sync`;
 const joplinAppPath = `${__dirname}/main.js`;
-let syncDurations = [];
+const syncDurations = [];
 
 const fsDriver = new FsDriverNode();
 Logger.fsDriver_ = fsDriver;
@@ -34,10 +34,10 @@ function createClient(id) {
 }
 
 async function createClients() {
-	let output = [];
-	let promises = [];
+	const output = [];
+	const promises = [];
 	for (let clientId = 0; clientId < 2; clientId++) {
-		let client = createClient(clientId);
+		const client = createClient(clientId);
 		promises.push(fs.remove(client.profileDir));
 		promises.push(
 			execCommand(client, 'config sync.target 2').then(() => {
@@ -2064,8 +2064,8 @@ function randomWord() {
 }
 
 function execCommand(client, command, options = {}) {
-	let exePath = `node ${joplinAppPath}`;
-	let cmd = `${exePath} --update-geolocation-disabled --env dev --log-level debug --profile ${client.profileDir} ${command}`;
+	const exePath = `node ${joplinAppPath}`;
+	const cmd = `${exePath} --update-geolocation-disabled --env dev --log-level debug --profile ${client.profileDir} ${command}`;
 	logger.info(`${client.id}: ${command}`);
 
 	if (options.killAfter) {
@@ -2073,7 +2073,7 @@ function execCommand(client, command, options = {}) {
 	}
 
 	return new Promise((resolve, reject) => {
-		let childProcess = exec(cmd, (error, stdout, stderr) => {
+		const childProcess = exec(cmd, (error, stdout, stderr) => {
 			if (error) {
 				if (error.signal == 'SIGTERM') {
 					resolve('Process was killed');
@@ -2096,7 +2096,7 @@ function execCommand(client, command, options = {}) {
 }
 
 async function clientItems(client) {
-	let itemsJson = await execCommand(client, 'dump');
+	const itemsJson = await execCommand(client, 'dump');
 	try {
 		return JSON.parse(itemsJson);
 	} catch (error) {
@@ -2105,7 +2105,7 @@ async function clientItems(client) {
 }
 
 function randomTag(items) {
-	let tags = [];
+	const tags = [];
 	for (let i = 0; i < items.length; i++) {
 		if (items[i].type_ != 5) continue;
 		tags.push(items[i]);
@@ -2115,7 +2115,7 @@ function randomTag(items) {
 }
 
 function randomNote(items) {
-	let notes = [];
+	const notes = [];
 	for (let i = 0; i < items.length; i++) {
 		if (items[i].type_ != 1) continue;
 		notes.push(items[i]);
@@ -2125,14 +2125,14 @@ function randomNote(items) {
 }
 
 async function execRandomCommand(client) {
-	let possibleCommands = [
+	const possibleCommands = [
 		['mkbook {word}', 40], // CREATE FOLDER
 		['mknote {word}', 70], // CREATE NOTE
 		[
 			async () => {
 				// DELETE RANDOM ITEM
-				let items = await clientItems(client);
-				let item = randomElement(items);
+				const items = await clientItems(client);
+				const item = randomElement(items);
 				if (!item) return;
 
 				if (item.type_ == 1) {
@@ -2150,8 +2150,8 @@ async function execRandomCommand(client) {
 		[
 			async () => {
 				// SYNC
-				let avgSyncDuration = averageSyncDuration();
-				let options = {};
+				const avgSyncDuration = averageSyncDuration();
+				const options = {};
 				if (!isNaN(avgSyncDuration)) {
 					if (Math.random() >= 0.5) {
 						options.killAfter = avgSyncDuration * Math.random();
@@ -2164,8 +2164,8 @@ async function execRandomCommand(client) {
 		[
 			async () => {
 				// UPDATE RANDOM ITEM
-				let items = await clientItems(client);
-				let item = randomNote(items);
+				const items = await clientItems(client);
+				const item = randomNote(items);
 				if (!item) return;
 
 				return execCommand(client, `set ${item.id} title "${randomWord()}"`);
@@ -2175,12 +2175,12 @@ async function execRandomCommand(client) {
 		[
 			async () => {
 				// ADD TAG
-				let items = await clientItems(client);
-				let note = randomNote(items);
+				const items = await clientItems(client);
+				const note = randomNote(items);
 				if (!note) return;
 
-				let tag = randomTag(items);
-				let tagTitle = !tag || Math.random() >= 0.9 ? `tag-${randomWord()}` : tag.title;
+				const tag = randomTag(items);
+				const tagTitle = !tag || Math.random() >= 0.9 ? `tag-${randomWord()}` : tag.title;
 
 				return execCommand(client, `tag add ${tagTitle} ${note.id}`);
 			},
@@ -2191,7 +2191,7 @@ async function execRandomCommand(client) {
 	let cmd = null;
 	while (true) {
 		cmd = randomElement(possibleCommands);
-		let r = 1 + Math.floor(Math.random() * 100);
+		const r = 1 + Math.floor(Math.random() * 100);
 		if (r <= cmd[1]) break;
 	}
 
@@ -2210,7 +2210,7 @@ function averageSyncDuration() {
 }
 
 function randomNextCheckTime() {
-	let output = time.unixMs() + 1000 + Math.random() * 1000 * 120;
+	const output = time.unixMs() + 1000 + Math.random() * 1000 * 120;
 	logger.info(`Next sync check: ${time.unixMsToIso(output)} (${Math.round((output - time.unixMs()) / 1000)} sec.)`);
 	return output;
 }
@@ -2223,11 +2223,11 @@ function findItem(items, itemId) {
 }
 
 function compareItems(item1, item2) {
-	let output = [];
-	for (let n in item1) {
+	const output = [];
+	for (const n in item1) {
 		if (!item1.hasOwnProperty(n)) continue;
-		let p1 = item1[n];
-		let p2 = item2[n];
+		const p1 = item1[n];
+		const p2 = item2[n];
 
 		if (n == 'notes_') {
 			p1.sort();
@@ -2243,13 +2243,13 @@ function compareItems(item1, item2) {
 }
 
 function findMissingItems_(items1, items2) {
-	let output = [];
+	const output = [];
 
 	for (let i = 0; i < items1.length; i++) {
-		let item1 = items1[i];
+		const item1 = items1[i];
 		let found = false;
 		for (let j = 0; j < items2.length; j++) {
-			let item2 = items2[j];
+			const item2 = items2[j];
 			if (item1.id == item2.id) {
 				found = true;
 				break;
@@ -2269,33 +2269,33 @@ function findMissingItems(items1, items2) {
 }
 
 async function compareClientItems(clientItems) {
-	let itemCounts = [];
+	const itemCounts = [];
 	for (let i = 0; i < clientItems.length; i++) {
-		let items = clientItems[i];
+		const items = clientItems[i];
 		itemCounts.push(items.length);
 	}
 	logger.info(`Item count: ${itemCounts.join(', ')}`);
 
-	let missingItems = findMissingItems(clientItems[0], clientItems[1]);
+	const missingItems = findMissingItems(clientItems[0], clientItems[1]);
 	if (missingItems[0].length || missingItems[1].length) {
 		logger.error('Items are different');
 		logger.error(missingItems);
 		process.exit(1);
 	}
 
-	let differences = [];
-	let items = clientItems[0];
+	const differences = [];
+	const items = clientItems[0];
 	for (let i = 0; i < items.length; i++) {
-		let item1 = items[i];
+		const item1 = items[i];
 		for (let clientId = 1; clientId < clientItems.length; clientId++) {
-			let item2 = findItem(clientItems[clientId], item1.id);
+			const item2 = findItem(clientItems[clientId], item1.id);
 			if (!item2) {
 				logger.error(`Item not found on client ${clientId}:`);
 				logger.error(item1);
 				process.exit(1);
 			}
 
-			let diff = compareItems(item1, item2);
+			const diff = compareItems(item1, item2);
 			if (diff.length) {
 				differences.push({
 					item1: JSON.stringify(item1),
@@ -2315,7 +2315,7 @@ async function compareClientItems(clientItems) {
 async function main() {
 	await fs.remove(syncDir);
 
-	let clients = await createClients();
+	const clients = await createClients();
 	let clientId = 0;
 
 	for (let i = 0; i < clients.length; i++) {
@@ -2348,7 +2348,7 @@ async function main() {
 
 		if (state == 'syncCheck') {
 			state = 'waitForSyncCheck';
-			let clientItems = [];
+			const clientItems = [];
 			// Up to 3 sync operations must be performed by each clients in order for them
 			// to be perfectly in sync - in order for each items to send their changes
 			// and get those from the other clients, and to also get changes that are
@@ -2356,12 +2356,12 @@ async function main() {
 			// with another one).
 			for (let loopCount = 0; loopCount < 3; loopCount++) {
 				for (let i = 0; i < clients.length; i++) {
-					let beforeTime = time.unixMs();
+					const beforeTime = time.unixMs();
 					await execCommand(clients[i], 'sync');
 					syncDurations.push(time.unixMs() - beforeTime);
 					if (syncDurations.length > 20) syncDurations.splice(0, 1);
 					if (loopCount === 2) {
-						let dump = await execCommand(clients[i], 'dump');
+						const dump = await execCommand(clients[i], 'dump');
 						clientItems[i] = JSON.parse(dump);
 					}
 				}

CliClient/app/gui/FolderListWidget.js

@@ -20,7 +20,7 @@ class FolderListWidget extends ListWidget {
 		this.trimItemTitle = false;
 
 		this.itemRenderer = item => {
-			let output = [];
+			const output = [];
 			if (item === '-') {
 				output.push('-'.repeat(this.innerWidth));
 			} else if (item.type_ === Folder.modelType()) {
@@ -121,7 +121,7 @@ class FolderListWidget extends ListWidget {
 
 	folderHasChildren_(folders, folderId) {
 		for (let i = 0; i < folders.length; i++) {
-			let folder = folders[i];
+			const folder = folders[i];
 			if (folder.parent_id === folderId) return true;
 		}
 		return false;

CliClient/app/gui/NoteWidget.js

@@ -46,6 +46,8 @@ class NoteWidget extends TextWidget {
 
 				if (this.note_ && this.note_.encryption_applied) {
 					this.text = _('One or more items are currently encrypted and you may need to supply a master password. To do so please type `e2ee decrypt`. If you have already supplied the password, the encrypted items are being decrypted in the background and will be available soon.');
+					this.text += '\n\n';
+					this.text += _('You may also type `status` for more information.');
 				} else {
 					this.text = this.note_ ? `${this.note_.title}\n\n${this.note_.body}` : '';
 				}

CliClient/app/gui/StatusBarWidget.js

@@ -106,7 +106,7 @@ class StatusBarWidget extends BaseWidget {
 
 			const isSecurePrompt = !!this.promptState_.secure;
 
-			let options = {
+			const options = {
 				cancelable: true,
 				history: this.history,
 				default: this.promptState_.initialText,

CliClient/app/help-utils.js

@@ -6,11 +6,11 @@ const MAX_WIDTH = 78;
 const INDENT = '    ';
 
 function renderTwoColumnData(options, baseIndent, width) {
-	let output = [];
+	const output = [];
 	const optionColWidth = getOptionColWidth(options);
 
 	for (let i = 0; i < options.length; i++) {
-		let option = options[i];
+		const option = options[i];
 		const flag = option[0];
 		const indent = baseIndent + INDENT + ' '.repeat(optionColWidth + 2);
 
@@ -28,7 +28,7 @@ function renderCommandHelp(cmd, width = null) {
 
 	const baseIndent = '';
 
-	let output = [];
+	const output = [];
 	output.push(baseIndent + cmd.usage());
 	output.push('');
 	output.push(wrap(cmd.description(), baseIndent + INDENT, width));
@@ -42,7 +42,7 @@ function renderCommandHelp(cmd, width = null) {
 
 	if (cmd.name() === 'config') {
 		const renderMetadata = md => {
-			let desc = [];
+			const desc = [];
 
 			if (md.label) {
 				let label = md.label();
@@ -77,7 +77,7 @@ function renderCommandHelp(cmd, width = null) {
 		output.push(_('Possible keys/values:'));
 		output.push('');
 
-		let keysValues = [];
+		const keysValues = [];
 		const keys = Setting.keys(true, 'cli');
 		for (let i = 0; i < keys.length; i++) {
 			if (keysValues.length) keysValues.push(['', '']);

CliClient/app/main.js

@@ -54,7 +54,7 @@ shimInit();
 const application = app();
 
 if (process.platform === 'win32') {
-	var rl = require('readline').createInterface({
+	const rl = require('readline').createInterface({
 		input: process.stdin,
 		output: process.stdout,
 	});

CliClient/locales-build/index.js

@@ -34,42 +34,44 @@ locales['sr_RS'] = require('./sr_RS.json');
 locales['sv'] = require('./sv.json');
 locales['th_TH'] = require('./th_TH.json');
 locales['tr_TR'] = require('./tr_TR.json');
+locales['vi'] = require('./vi.json');
 locales['zh_CN'] = require('./zh_CN.json');
 locales['zh_TW'] = require('./zh_TW.json');
-stats['ar'] = {"percentDone":92};
-stats['eu'] = {"percentDone":39};
-stats['bs_BA'] = {"percentDone":85};
-stats['bg_BG'] = {"percentDone":77};
-stats['ca'] = {"percentDone":61};
-stats['hr_HR'] = {"percentDone":32};
-stats['cs_CZ'] = {"percentDone":94};
-stats['da_DK'] = {"percentDone":85};
-stats['de_DE'] = {"percentDone":100};
-stats['et_EE'] = {"percentDone":76};
+stats['ar'] = {"percentDone":87};
+stats['eu'] = {"percentDone":37};
+stats['bs_BA'] = {"percentDone":81};
+stats['bg_BG'] = {"percentDone":73};
+stats['ca'] = {"percentDone":58};
+stats['hr_HR'] = {"percentDone":30};
+stats['cs_CZ'] = {"percentDone":90};
+stats['da_DK'] = {"percentDone":81};
+stats['de_DE'] = {"percentDone":97};
+stats['et_EE'] = {"percentDone":72};
 stats['en_GB'] = {"percentDone":100};
 stats['en_US'] = {"percentDone":100};
-stats['es_ES'] = {"percentDone":95};
-stats['eo'] = {"percentDone":44};
-stats['fr_FR'] = {"percentDone":95};
-stats['gl_ES'] = {"percentDone":50};
-stats['it_IT'] = {"percentDone":97};
-stats['nl_BE'] = {"percentDone":39};
-stats['nl_NL'] = {"percentDone":97};
-stats['nb_NO'] = {"percentDone":89};
-stats['fa'] = {"percentDone":38};
-stats['pl_PL'] = {"percentDone":75};
-stats['pt_PT'] = {"percentDone":91};
-stats['pt_BR'] = {"percentDone":88};
-stats['ro'] = {"percentDone":39};
-stats['sl_SI'] = {"percentDone":49};
-stats['sv'] = {"percentDone":68};
-stats['th_TH'] = {"percentDone":61};
-stats['tr_TR'] = {"percentDone":92};
-stats['el_GR'] = {"percentDone":93};
-stats['ru_RU'] = {"percentDone":95};
-stats['sr_RS'] = {"percentDone":75};
+stats['es_ES'] = {"percentDone":90};
+stats['eo'] = {"percentDone":41};
+stats['fr_FR'] = {"percentDone":91};
+stats['gl_ES'] = {"percentDone":47};
+stats['it_IT'] = {"percentDone":96};
+stats['nl_NL'] = {"percentDone":92};
+stats['nl_BE'] = {"percentDone":37};
+stats['nb_NO'] = {"percentDone":97};
+stats['fa'] = {"percentDone":36};
+stats['pl_PL'] = {"percentDone":84};
+stats['pt_PT'] = {"percentDone":98};
+stats['pt_BR'] = {"percentDone":98};
+stats['ro'] = {"percentDone":37};
+stats['sl_SI'] = {"percentDone":46};
+stats['sv'] = {"percentDone":78};
+stats['th_TH'] = {"percentDone":58};
+stats['vi'] = {"percentDone":94};
+stats['tr_TR'] = {"percentDone":96};
+stats['el_GR'] = {"percentDone":89};
+stats['ru_RU'] = {"percentDone":97};
+stats['sr_RS'] = {"percentDone":78};
 stats['zh_CN'] = {"percentDone":97};
-stats['zh_TW'] = {"percentDone":91};
-stats['ja_JP'] = {"percentDone":100};
-stats['ko'] = {"percentDone":97};
+stats['zh_TW'] = {"percentDone":98};
+stats['ja_JP'] = {"percentDone":97};
+stats['ko'] = {"percentDone":95};
 module.exports = { locales: locales, stats: stats };