CLI v1.0.140

* Revert "Fix for #1426, aded backticks to auto-wrapping quotes."

This reverts commit 7dee93076a.

* changes to backtick behavior

- add shortcut ``` cmd+` ``` / ``` ctrl+` ```
- add menu item for `Inline code`

* rename menu item Inline Code -> Code

.github/FUNDING.yml

@@ -1,5 +1,4 @@
 # These are supported funding model platforms
 
-github: laurent22
 patreon: joplin
 custom: https://joplinapp.org/donate/

CliClient/locales/de_DE.po

@@ -738,7 +738,7 @@ msgid "Make a donation"
 msgstr "Spenden"
 
 msgid "Toggle development tools"
-msgstr ""
+msgstr "Entwicklerwerkzeuge ein-/ausschalten"
 
 #, javascript-format
 msgid "Open %s"
@@ -998,9 +998,8 @@ msgstr "Manche Objekte können nicht synchronisiert werden."
 msgid "View them now"
 msgstr "Zeige sie jetzt an"
 
-#, fuzzy
 msgid "One or more master keys need a password."
-msgstr "Master-Passwort eingeben:"
+msgstr "Mindestens ein Hauptschlüssel benötigt ein Passwort."
 
 msgid "Set the password"
 msgstr "Setze ein Passwort"
@@ -1211,7 +1210,7 @@ msgstr ""
 "Bitte wähle aus, wohin der Synchronisations-Status exportiert werden soll"
 
 msgid "Retry"
-msgstr ""
+msgstr "Erneut versuchen"
 
 msgid "Add or remove tags"
 msgstr "Schlagwörter hinzufügen oder entfernen"
@@ -1471,7 +1470,7 @@ msgid "Auto"
 msgstr "Automatisch"
 
 msgid "Max concurrent connections"
-msgstr ""
+msgstr "Maximale Anzahl an gleichzeitigen Verbindungen"
 
 msgid "Language"
 msgstr "Sprache"
@@ -1756,15 +1755,18 @@ msgstr "%s (%s) konnte nicht hochgeladen werden: %s"
 msgid "Item \"%s\" could not be downloaded: %s"
 msgstr "Eintrag \"%s\" konnte nicht heruntergeladen werden: %s"
 
-#, fuzzy
 msgid "Items that cannot be decrypted"
-msgstr "Objekte können nicht synchronisiert werden"
+msgstr "Objekte, die nicht entschlüsselt werden konnten"
 
 msgid ""
 "Joplin failed to decrypt these items multiple times, possibly because they "
 "are corrupted or too large. These items will remain on the device but Joplin "
 "will no longer attempt to decrypt them."
 msgstr ""
+"Joplin konnte diese Objekte trotz mehrfacher Versuche nicht entschlüsseln, "
+"weil sie wahrscheinlich entweder kaputt oder zu groß sind. Diese Objekte "
+"bleiben auf dem Gerat, aber Joplin wird nicht mehr versuchen sie zu "
+"entschlüsseln."
 
 msgid "Sync status (synced items / total items)"
 msgstr "Synchronisationsstatus (synchronisierte Objekte / gesamte Objekte)"
@@ -1891,9 +1893,8 @@ msgstr "Neue Schlagwörter:"
 msgid "Type new tags or select from list"
 msgstr "Neues Schlagwort eingeben oder aus der Liste auswählen"
 
-#, fuzzy
 msgid "More information"
-msgstr "Konfiguration"
+msgstr "Weitere Information"
 
 msgid ""
 "To work correctly, the app needs the following permissions. Please enable "

CliClient/package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "joplin",
-  "version": "1.0.139",
+  "version": "1.0.140",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {

CliClient/package.json

@@ -20,7 +20,7 @@
     ],
     "owner": "Laurent Cozic"
   },
-  "version": "1.0.139",
+  "version": "1.0.140",
   "bin": {
     "joplin": "./main.js"
   },

CliClient/run.sh

@@ -3,5 +3,4 @@ set -e
 CLIENT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 
 bash "$CLIENT_DIR/build.sh" && node "$CLIENT_DIR/build/main.js" --profile ~/Temp/TestNotes2 --stack-trace-enabled --log-level debug --env dev "$@"
-
-# bash $CLIENT_DIR/build.sh && NODE_PATH="$CLIENT_DIR/build/" node build/main.js --profile ~/.config/joplin --stack-trace-enabled --log-level debug "$@"
+# bash "$CLIENT_DIR/build.sh" && node "$CLIENT_DIR/build/main.js" --profile ~/.config/joplin --stack-trace-enabled --log-level debug --env dev "$@"

ElectronClient/app/app.js

@@ -668,6 +668,16 @@ class Application extends BaseApplication {
 							name: 'textLink',
 						});
 					},
+				}, {
+					label: _('Code'),
+					screens: ['Main'],
+					accelerator: 'CommandOrControl+`',
+					click: () => {
+						this.dispatch({
+							type: 'WINDOW_COMMAND',
+							name: 'textCode',
+						});
+					},
 				}, {
 					type: 'separator',
 					screens: ['Main'],

ElectronClient/app/gui/NoteText.jsx

@@ -896,9 +896,6 @@ class NoteTextComponent extends React.Component {
 				}
 				return output;
 			}
-			
-			//fixes #1426 but this is an Ace issue, so it can be removed if ace/brace is updated.
-			this.editor_.editor.getSession().getMode().$quotes = {'"': '"', "'": "'", "`": "`"};
 
 			// Disable Markdown auto-completion (eg. auto-adding a dash after a line with a dash.
 			// https://github.com/ajaxorg/ace/issues/2754
@@ -1022,6 +1019,8 @@ class NoteTextComponent extends React.Component {
 				fn = this.commandStartExternalEditing;
 			} else if (command.name === 'showLocalSearch') {
 				fn = this.commandShowLocalSearch;
+			} else if (command.name === 'textCode') {
+				fn = this.commandTextCode;
 			}
 		}
 

ReactNativeClient/lib/services/DecryptionWorker.js

@@ -106,16 +106,25 @@ class DecryptionWorker {
 			return;
 		}
 
+		// Note: the logic below is an optimisation to avoid going through the loop if no master key exists
+		// or if none is loaded. It means this logic needs to be duplicate a bit what's in the loop, like the
+		// "throw" and "dispatch" logic.
 		const loadedMasterKeyCount = await this.encryptionService().loadedMasterKeysCount();
 		if (!loadedMasterKeyCount) {
 			this.logger().info('DecryptionWorker: cannot start because no master key is currently loaded.');
 			const ids = await MasterKey.allIds();
 
 			if (ids.length) {
-				this.dispatch({
-					type: 'MASTERKEY_SET_NOT_LOADED',
-					ids: ids,
-				});
+				if (options.masterKeyNotLoadedHandler === 'throw') {
+					// By trying to load the master key here, we throw the "masterKeyNotLoaded" error
+					// which the caller needs.
+					await this.encryptionService().loadedMasterKey(ids[0]);
+				} else {
+					this.dispatch({
+						type: 'MASTERKEY_SET_NOT_LOADED',
+						ids: ids,
+					});
+				}
 			}
 			return;
 		}