Desktop: Resolves #8380: Always show reencrypt button

[personalizedrefrigerator]

Summary

Shows the re-encryption button under "Encryption" settings always, not just when the encryption.shouldReencrypt setting has value Setting.SHOULD_REENCRYPT_YES.

The re-encryption button is now shown under "Advanced".

Fixes #8380.

To-do

While this pull request could be merged as is, it may be helpful to have the following:

• Wait for sync to finish before allowing users to press "reencrypt all"
  • I am no longer convinced that this is necessary. Because reencryptAll works by calling BaseItem.forceSyncAll();, then reg.waitForSyncFinishedThenSync();, any unsynchronized items should remain queued to be synchronized.

Testing

0. Ensure Joplin has several notes/folders.
1. Ensure Joplin is connected to a sync target and can sync successfully.
2. Do a full sync.
3. Close Joplin
4. Add a new encryption method to EncryptionService.ts

Example Diff

diff --git a/packages/lib/services/e2ee/EncryptionService.ts b/packages/lib/services/e2ee/EncryptionService.ts
index 3e835a753..b4ce6d41d 100644
--- a/packages/lib/services/e2ee/EncryptionService.ts
+++ b/packages/lib/services/e2ee/EncryptionService.ts
@@ -39,6 +39,7 @@ export enum EncryptionMethod {
 	SJCL1a = 5,
 	Custom = 6,
 	SJCL1b = 7,
+	SJCL1c = 8,
 }
 
 export interface EncryptOptions {
@@ -70,7 +71,7 @@ export default class EncryptionService {
 	// changed easily since the chunk size is incorporated into the encrypted data.
 	private chunkSize_ = 5000;
 	private decryptedMasterKeys_: Record<string, DecryptedMasterKey> = {};
-	public defaultEncryptionMethod_ = EncryptionMethod.SJCL1b; // public because used in tests
+	public defaultEncryptionMethod_ = EncryptionMethod.SJCL1c; // public because used in tests
 	private defaultMasterKeyEncryptionMethod_ = EncryptionMethod.SJCL4;
 
 	private headerTemplates_ = {
@@ -332,6 +333,26 @@ export default class EncryptionService {
 				}
 			},
 
+			// Test: DO NOT COMMIT
+			[EncryptionMethod.SJCL1c]: () => {
+				try {
+					// We need to escape the data because SJCL uses encodeURIComponent to process the data and it only
+					// accepts UTF-8 data, or else it throws an error. And the notes might occasionally contain
+					// invalid UTF-8 data. Fixes https://github.com/laurent22/joplin/issues/2591
+					return sjcl.json.encrypt(key, escape(plainText), {
+						v: 1, // version
+						iter: 2000, // Since the master key already uses key derivations and is secure, additional iteration here aren't necessary, which will make decryption faster. SJCL enforces an iter strictly greater than 100
+						ks: 512, // Key size - "256-bit is the golden standard that we should follow."
+						ts: 64, // ???
+						mode: 'ccm', //  The cipher mode is a standard for how to use AES and other algorithms to encrypt and authenticate your message. OCB2 mode is slightly faster and has more features, but CCM mode has wider support because it is not patented.
+						// "adata":"", // Associated Data - not needed?
+						cipher: 'aes',
+					});
+				} catch (error) {
+					throw this.wrapSjclError(error);
+				}
+			},
+
 			// 2020-01-23: Deprecated - see above.
 			// Was used to encrypt master keys
 			[EncryptionMethod.SJCL2]: () => {
@@ -404,7 +425,7 @@ export default class EncryptionService {
 		try {
 			const output = sjcl.json.decrypt(key, cipherText);
 
-			if (method === EncryptionMethod.SJCL1a || method === EncryptionMethod.SJCL1b) {
+			if (method === EncryptionMethod.SJCL1a || method === EncryptionMethod.SJCL1b || method === EncryptionMethod.SJCL1c) {
 				return unescape(output);
 			} else {
 				return output;
@@ -655,7 +676,7 @@ export default class EncryptionService {
 	}
 
 	public isValidEncryptionMethod(method: EncryptionMethod) {
-		return [EncryptionMethod.SJCL, EncryptionMethod.SJCL1a, EncryptionMethod.SJCL1b, EncryptionMethod.SJCL2, EncryptionMethod.SJCL3, EncryptionMethod.SJCL4].indexOf(method) >= 0;
+		return [EncryptionMethod.SJCL, EncryptionMethod.SJCL1a, EncryptionMethod.SJCL1b, EncryptionMethod.SJCL1c, EncryptionMethod.SJCL2, EncryptionMethod.SJCL3, EncryptionMethod.SJCL4].indexOf(method) >= 0;
 	}
 
 	public async itemIsEncrypted(item: any) {

5. Re-build and re-launch Joplin
6. Open settings > encryption > advanced
7. Click "Re-encrypt data"
8. Wait for sync to finish
9. Quit Joplin
10. Reset EncryptionService.ts to what it was before step 4
11. Open Joplin and click "delete local data and re-downlad from sync target"
12. Verify that none of the downloaded notes can be decrypted.