update

Joplin_install_and_update.sh

@@ -180,12 +180,11 @@ SANDBOXPARAM=""
 if command -v lsb_release &> /dev/null; then
   DISTVER=$(lsb_release -is) && DISTVER=$DISTVER$(lsb_release -rs)
   DISTCODENAME=$(lsb_release -cs)
-  DISTMAJOR=$(lsb_release -rs|cut -d. -f1)
   #-----------------------------------------------------
   # Check for "The SUID sandbox helper binary was found, but is not configured correctly" problem.
   # It is present in Debian 1X. A (temporary) patch will be applied at .desktop file
   # Linux Mint 4 Debbie is based on Debian 10 and requires the same param handling.
-  if [[ $DISTVER =~ Debian1. ]] || [ "$DISTVER" = "Linuxmint4" ] && [ "$DISTCODENAME" = "debbie" ] || [ "$DISTVER" = "CentOS" ] && [[ "$DISTMAJOR" =~ 6|7 ]]
+  if [[ $DISTVER =~ Debian1. ]] || [ "$DISTVER" = "Linuxmint4" ] && [ "$DISTCODENAME" = "debbie" ]
   then
     SANDBOXPARAM=" --no-sandbox"
   fi

packages/app-desktop/gui/EncryptionConfigScreen.tsx

@@ -50,7 +50,7 @@ class EncryptionConfigScreenComponent extends React.Component<Props> {
 		return shared.checkPasswords(this);
 	}
 
-	private renderMasterKey(mk: MasterKeyEntity, _isDefault: boolean) {
+	private renderMasterKey(mk: MasterKeyEntity, isDefault: boolean) {
 		const theme = themeStyle(this.props.themeId);
 
 		const onToggleEnabledClick = () => {
@@ -104,7 +104,7 @@ class EncryptionConfigScreenComponent extends React.Component<Props> {
 				{renderPasswordInput(mk.id)}
 				<td style={theme.textStyle}>{passwordOk}</td>
 				<td style={theme.textStyle}>
-					<button style={theme.buttonStyle} onClick={() => onToggleEnabledClick()}>{masterKeyEnabled(mk) ? _('Disable') : _('Enable')}</button>
+					<button disabled={isActive || isDefault} style={theme.buttonStyle} onClick={() => onToggleEnabledClick()}>{masterKeyEnabled(mk) ? _('Disable') : _('Enable')}</button>
 				</td>
 			</tr>
 		);
@@ -270,11 +270,7 @@ class EncryptionConfigScreenComponent extends React.Component<Props> {
 
 		const onToggleButtonClick = async () => {
 			const isEnabled = getEncryptionEnabled();
-			let masterKey = getDefaultMasterKey();
-
-			// If the user has explicitly disabled the master key, we generate a
-			// new one. Needed for one the password has been forgotten.
-			if (!masterKey.enabled) masterKey = null;
+			const masterKey = getDefaultMasterKey();
 
 			let answer = null;
 			if (isEnabled) {

packages/app-desktop/package-lock.json

@@ -1,12 +1,12 @@
 {
 	"name": "@joplin/app-desktop",
-	"version": "2.4.5",
+	"version": "2.4.4",
 	"lockfileVersion": 2,
 	"requires": true,
 	"packages": {
 		"": {
 			"name": "@joplin/app-desktop",
-			"version": "2.4.5",
+			"version": "2.4.4",
 			"license": "MIT",
 			"dependencies": {
 				"@fortawesome/fontawesome-free": "^5.13.0",

packages/app-desktop/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@joplin/app-desktop",
-  "version": "2.4.5",
+  "version": "2.4.4",
   "description": "Joplin for Desktop",
   "main": "main.js",
   "private": true,

packages/app-mobile/components/screens/encryption-config.tsx

@@ -13,7 +13,8 @@ import shared from '@joplin/lib/components/shared/encryption-config-shared';
 import { MasterKeyEntity } from '@joplin/lib/services/e2ee/types';
 import { State } from '@joplin/lib/reducer';
 import { SyncInfo } from '@joplin/lib/services/synchronizer/syncInfoUtils';
-import { getDefaultMasterKey, setupAndDisableEncryption, toggleAndSetupEncryption } from '@joplin/lib/services/e2ee/utils';
+import { setupAndDisableEncryption, toggleAndSetupEncryption } from '@joplin/lib/services/e2ee/utils';
+import MasterKey from '@joplin/lib/models/MasterKey';
 
 interface Props {}
 
@@ -145,11 +146,7 @@ class EncryptionConfigScreenComponent extends BaseScreenComponent<Props> {
 
 	passwordPromptComponent() {
 		const theme = themeStyle(this.props.themeId);
-		let masterKey = getDefaultMasterKey();
-
-		// If the user has explicitly disabled the master key, we generate a
-		// new one. Needed for one the password has been forgotten.
-		if (!masterKey.enabled) masterKey = null;
+		const masterKey = MasterKey.latest();
 
 		const onEnableClick = async () => {
 			try {

packages/app-mobile/ios/Podfile.lock

@@ -488,7 +488,7 @@ SPEC CHECKSUMS:
   boost-for-react-native: 39c7adb57c4e60d6c5479dd8623128eb5b3f0f2c
   DoubleConversion: cf9b38bf0b2d048436d9a82ad2abe1404f11e7de
   FBLazyVector: e686045572151edef46010a6f819ade377dfeb4b
-  FBReactNativeSpec: d2f54de51f69366bd1f5c1fb9270698dce678f8d
+  FBReactNativeSpec: 6da2c8ff1ebe6b6cf4510fcca58c24c4d02b16fc
   glog: 73c2498ac6884b13ede40eda8228cb1eee9d9d62
   JoplinCommonShareExtension: 270b4f8eb4e22828eeda433a04ed689fc1fd09b5
   JoplinRNShareExtension: 7137e9787374e1b0797ecbef9103d1588d90e403

packages/app-mobile/root.tsx

@@ -480,6 +480,7 @@ async function initialize(dispatch: Function) {
 		}
 
 		reg.logger().info('Database is ready.');
+
 		reg.logger().info('Loading settings...');
 
 		await loadKeychainServiceAndSettings(KeychainServiceDriverMobile);

packages/app-mobile/utils/fs-driver-rn.ts

@@ -128,9 +128,8 @@ export default class FsDriverRN extends FsDriverBase {
 		};
 	}
 
-	public close(): Promise<void> {
+	public close(): void {
 		// Nothing
-		return null;
 	}
 
 	public readFile(path: string, encoding = 'utf8') {

packages/lib/package-lock.json

@@ -64,6 +64,7 @@
 				"xml2js": "^0.4.19"
 			},
 			"devDependencies": {
+				"@types/css": "^0.0.33",
 				"@types/fs-extra": "^9.0.6",
 				"@types/jest": "^26.0.15",
 				"@types/node": "^14.14.6",
@@ -1003,6 +1004,12 @@
 				"@babel/types": "^7.3.0"
 			}
 		},
+		"node_modules/@types/css": {
+			"version": "0.0.33",
+			"resolved": "https://registry.npmjs.org/@types/css/-/css-0.0.33.tgz",
+			"integrity": "sha512-qjeDgh86R0LIeEM588q65yatc8Yyo/VvSIYFqq8JOIHDolhGNX0rz7k/OuxqDpnpqlefoHj8X4Ai/6hT9IWtKQ==",
+			"dev": true
+		},
 		"node_modules/@types/fs-extra": {
 			"version": "9.0.11",
 			"resolved": "https://registry.npmjs.org/@types/fs-extra/-/fs-extra-9.0.11.tgz",
@@ -9688,6 +9695,12 @@
 				"@babel/types": "^7.3.0"
 			}
 		},
+		"@types/css": {
+			"version": "0.0.33",
+			"resolved": "https://registry.npmjs.org/@types/css/-/css-0.0.33.tgz",
+			"integrity": "sha512-qjeDgh86R0LIeEM588q65yatc8Yyo/VvSIYFqq8JOIHDolhGNX0rz7k/OuxqDpnpqlefoHj8X4Ai/6hT9IWtKQ==",
+			"dev": true
+		},
 		"@types/fs-extra": {
 			"version": "9.0.11",
 			"resolved": "https://registry.npmjs.org/@types/fs-extra/-/fs-extra-9.0.11.tgz",

packages/lib/package.json

@@ -16,6 +16,7 @@
     "test-ci": "npm run test"
   },
   "devDependencies": {
+    "@types/css": "^0.0.33",
     "@types/fs-extra": "^9.0.6",
     "@types/jest": "^26.0.15",
     "@types/node": "^14.14.6",

packages/lib/services/synchronizer/syncInfoUtils.ts

@@ -239,10 +239,7 @@ export function setMasterKeyEnabled(mkId: string, enabled: boolean = true) {
 	const idx = s.masterKeys.findIndex(mk => mk.id === mkId);
 	if (idx < 0) throw new Error(`No such master key: ${mkId}`);
 
-	// Disabled for now as it's needed to disable even the main master key when the password has been forgotten
-	// https://discourse.joplinapp.org/t/syncing-error-with-joplin-cloud-and-e2ee-master-key-is-not-loaded/20115/5?u=laurent
-	//
-	// if (mkId === getActiveMasterKeyId() && !enabled) throw new Error('The active master key cannot be disabled');
+	if (mkId === getActiveMasterKeyId() && !enabled) throw new Error('The active master key cannot be disabled');
 
 	s.masterKeys[idx] = {
 		...s.masterKeys[idx],