chore: arrow function for coding style

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

.yarn/patches/rn-fetch-blob-npm-0.12.0-cf02e3c544.patch

@@ -0,0 +1,30 @@
+diff --git a/android/src/main/java/com/RNFetchBlob/RNFetchBlobReq.java b/android/src/main/java/com/RNFetchBlob/RNFetchBlobReq.java
+index a8abd71833879201e3438b2fa51d712a311c4551..ffe9c2c6dfa5c703ba76b65d94d5dd6784102c19 100644
+--- a/android/src/main/java/com/RNFetchBlob/RNFetchBlobReq.java
++++ b/android/src/main/java/com/RNFetchBlob/RNFetchBlobReq.java
+@@ -591,7 +591,7 @@ public class RNFetchBlobReq extends BroadcastReceiver implements Runnable {
+ //                    ignored.printStackTrace();
+                 }
+ 
+-                RNFetchBlobFileResp rnFetchBlobFileResp = (RNFetchBlobFileResp) responseBody;
++                RNFetchBlobFileResp rnFetchBlobFileResp = new RNFetchBlobFileResp(responseBody);
+ 
+                 if(rnFetchBlobFileResp != null && !rnFetchBlobFileResp.isDownloadComplete()){
+                     callback.invoke("Download interrupted.", null);
+diff --git a/android/src/main/java/com/RNFetchBlob/Response/RNFetchBlobFileResp.java b/android/src/main/java/com/RNFetchBlob/Response/RNFetchBlobFileResp.java
+index 2470eef612308c15a89dfea5a1f16937469be29f..965f8becc195965907699182c764ec9e51811450 100644
+--- a/android/src/main/java/com/RNFetchBlob/Response/RNFetchBlobFileResp.java
++++ b/android/src/main/java/com/RNFetchBlob/Response/RNFetchBlobFileResp.java
+@@ -35,6 +35,12 @@ public class RNFetchBlobFileResp extends ResponseBody {
+     FileOutputStream ofStream;
+     boolean isEndMarkerReceived;
+ 
++    // ref: https://github.com/joltup/rn-fetch-blob/issues/490#issuecomment-990899440
++    public RNFetchBlobFileResp(ResponseBody body) {
++        super();
++        this.originalBody = body;
++    }
++
+     public RNFetchBlobFileResp(ReactApplicationContext ctx, String taskId, ResponseBody body, String path, boolean overwrite) throws IOException {
+         super();
+         this.rctContext = ctx;

package.json

@@ -95,6 +95,7 @@
   },
   "packageManager": "yarn@3.3.1",
   "resolutions": {
-    "react-native-camera@4.2.1": "patch:react-native-camera@npm%3A4.2.1#./.yarn/patches/react-native-camera-npm-4.2.1-24b2600a7e.patch"
+    "react-native-camera@4.2.1": "patch:react-native-camera@npm%3A4.2.1#./.yarn/patches/react-native-camera-npm-4.2.1-24b2600a7e.patch",
+    "rn-fetch-blob@0.12.0": "patch:rn-fetch-blob@npm%3A0.12.0#./.yarn/patches/rn-fetch-blob-npm-0.12.0-cf02e3c544.patch"
   }
 }

packages/app-desktop/build/defaultPlugins/io.github.jackgruber.backup/7zip-bin/7x.sh

@@ -1,9 +0,0 @@
-#!/usr/bin/env bash
-
-sz_program=${SZA_PATH:-7za}
-sz_type=${SZA_ARCHIVE_TYPE:-xz}
-
-case $1 in
-  -d) "$sz_program" e -si -so -t${sz_type} ;;
-   *) "$sz_program" a f -si -so -t${sz_type} -mx${SZA_COMPRESSION_LEVEL:-9} ;;
-esac 2> /dev/null

packages/app-desktop/build/defaultPlugins/io.github.jackgruber.backup/7zip-bin/LICENSE.txt

@@ -1,22 +0,0 @@
-The MIT License (MIT)
-
-Copyright (c) 2016 Vladimir Krivosheev
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-

packages/app-desktop/build/defaultPlugins/io.github.jackgruber.backup/7zip-bin/README.md

@@ -1 +0,0 @@
-7-Zip precompiled binaries.

packages/app-desktop/build/defaultPlugins/io.github.jackgruber.backup/7zip-bin/index.d.ts

@@ -1,2 +0,0 @@
-export const path7za: string
-export const path7x: string

packages/app-desktop/build/defaultPlugins/io.github.jackgruber.backup/7zip-bin/index.js

@@ -1,22 +0,0 @@
-"use strict"
-
-const path = require("path")
-
-function getPath() {
-  if (process.env.USE_SYSTEM_7ZA === "true") {
-    return "7za"
-  }
-
-  if (process.platform === "darwin") {
-    return path.join(__dirname, "mac", process.arch, "7za")
-  }
-  else if (process.platform === "win32") {
-    return path.join(__dirname, "win", process.arch, "7za.exe")
-  }
-  else {
-    return path.join(__dirname, "linux", process.arch, "7za")
-  }
-}
-
-exports.path7za = getPath()
-exports.path7x = path.join(__dirname, "7x.sh")

packages/app-desktop/build/defaultPlugins/io.github.jackgruber.backup/7zip-bin/linux/x64/build.sh

@@ -1,9 +0,0 @@
-#!/usr/bin/env bash
-set -e
-
-BASEDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-
-rm -rf /tmp/7z-linux
-mkdir /tmp/7z-linux
-cp "$BASEDIR/do-build.sh" /tmp/7z-linux/do-build.sh
-docker run --rm -v /tmp/7z-linux:/project buildpack-deps:xenial /project/do-build.sh

packages/app-desktop/build/defaultPlugins/io.github.jackgruber.backup/7zip-bin/linux/x64/do-build.sh

@@ -1,20 +0,0 @@
-#!/usr/bin/env bash
-set -e
-
-apt-get update -qq
-apt-get upgrade -qq
-
-echo "deb http://apt.llvm.org/xenial/ llvm-toolchain-xenial-5.0 main" > /etc/apt/sources.list.d/llvm.list
-curl -L http://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add -
-apt-get update -qq
-apt-get install -qq bzip2 yasm clang-5.0 lldb-5.0 lld-5.0
-
-ln -s /usr/bin/clang-5.0 /usr/bin/clang
-ln -s /usr/bin/clang++-5.0 /usr/bin/clang++
-
-mkdir -p /tmp/7z
-cd /tmp/7z
-curl -L http://downloads.sourceforge.net/project/p7zip/p7zip/16.02/p7zip_16.02_src_all.tar.bz2 | tar -xj -C . --strip-components 1
-cp makefile.linux_clang_amd64_asm makefile.machine
-make -j4
-mv bin/7za /project/7za

packages/app-desktop/build/defaultPlugins/io.github.jackgruber.backup/7zip-bin/package.json

@@ -1,20 +0,0 @@
-{
-  "name": "7zip-bin",
-  "description": "7-Zip precompiled binaries",
-  "version": "5.1.1",
-  "files": [
-    "*.js",
-    "7x.sh",
-    "index.d.ts",
-    "linux",
-    "mac",
-    "win"
-  ],
-  "license": "MIT",
-  "repository": "develar/7zip-bin",
-  "keywords": [
-    "7zip",
-    "7z",
-    "7za"
-  ]
-}

packages/app-desktop/build/defaultPlugins/io.github.jackgruber.backup/manifest.json

@@ -1,12 +0,0 @@
-{
-  "manifest_version": 1,
-  "id": "io.github.jackgruber.backup",
-  "app_min_version": "2.1.3",
-  "version": "1.1.1",
-  "name": "Simple Backup",
-  "description": "Plugin to create manual and automatic backups.",
-  "author": "JackGruber",
-  "homepage_url": "https://github.com/JackGruber/joplin-plugin-backup/blob/master/README.md",
-  "repository_url": "https://github.com/JackGruber/joplin-plugin-backup",
-  "keywords": ["backup", "jex", "export", "zip", "7zip", "encrypted"]
-}

packages/app-desktop/build/defaultPlugins/io.github.jackgruber.backup/webview.css

@@ -1,15 +0,0 @@
-#joplin-plugin-content {
-  width: fit-content;
-  background-color: var(--joplin-background-color);
-  color: var(--joplin-color);
-}
-
-#backuperror {
-  width: fit-content;
-  display: block;
-  flex-direction: column;
-  min-width: 300px;
-  overflow-wrap: break-word;
-  font-size: var(--joplin-font-size);
-  font-family: var(--joplin-font-family);
-}

packages/app-desktop/build/defaultPlugins/plugin.calebjohn.rich-markdown/manifest.json

@@ -1,17 +0,0 @@
-{
-	"manifest_version": 1,
-	"id": "plugin.calebjohn.rich-markdown",
-	"app_min_version": "2.4",
-	"version": "0.8.3",
-	"name": "Rich Markdown",
-	"description": "Helping you ditch the markdown viewer for good.",
-	"author": "Caleb John",
-	"homepage_url": "https://github.com/CalebJohn/joplin-rich-markdown#readme",
-	"repository_url": "https://github.com/CalebJohn/joplin-rich-markdown",
-	"keywords": [
-		"editor",
-		"visual"
-	],
-	"_publish_hash": "sha256:7059ff05f3fcac2ead5b8f4cb04ec66830be55e02407408a39ab20e536055f5d",
-	"_publish_commit": "main:9816b21068ce09014e8ef8adb0bd31bc20343247"
-}

packages/app-desktop/package.json

@@ -5,7 +5,7 @@
   "main": "main.js",
   "private": true,
   "scripts": {
-    "dist": "yarn run electronRebuild && npx electron-builder",
+    "dist": "yarn run bundleDefaultPlugins && yarn run electronRebuild && npx electron-builder",
     "bundleDefaultPlugins": "cd ../tools && node bundleDefaultPlugins.js",
     "build": "gulp build",
     "postinstall": "yarn run build",

packages/app-mobile/package.json

@@ -54,7 +54,7 @@
     "react-native-image-picker": "5.3.1",
     "react-native-image-resizer": "1.4.5",
     "react-native-modal-datetime-picker": "14.0.1",
-    "react-native-paper": "5.5.0",
+    "react-native-paper": "5.5.2",
     "react-native-popup-menu": "0.16.1",
     "react-native-quick-actions": "0.3.13",
     "react-native-rsa-native": "2.0.5",

packages/tools/bundleDefaultPlugins.ts

@@ -73,6 +73,20 @@ export const downloadPlugins = async (localPluginsVersions: PluginAndVersion, de
 	return downloadedPluginsNames;
 };
 
+// Mac app signing/notarizing fails if the binaries are inside an archive (plugin.jpl)
+// Contents of plugin.jpl are unzipped just for Mac so that binary signing passes through
+// ref: https://github.com/laurent22/joplin/pull/8048, https://github.com/laurent22/joplin/pull/8040
+const extractMacPlugins = async (defaultPluginDir: string, downloadedPluginsNames: PluginIdAndName) => {
+	if (process.platform !== 'darwin') return;
+
+	for (const pluginId in downloadedPluginsNames) {
+		const pluginDirectory = `${defaultPluginDir}/${pluginId}`;
+		const archivePath = `${pluginDirectory}/plugin.jpl`;
+		await execCommand(`tar xzf ${archivePath} --directory ${pluginDirectory}`, { quiet: true, splitCommandOptions: { handleEscape: false } });
+		await remove(archivePath);
+	}
+};
+
 async function start(): Promise<void> {
 	const defaultPluginDir = join(__dirname, '..', '..', 'packages', 'app-desktop', 'build', 'defaultPlugins');
 	const defaultPluginsInfo = getDefaultPluginsInfo();
@@ -84,6 +98,7 @@ async function start(): Promise<void> {
 	const localPluginsVersions = await localPluginsVersion(defaultPluginDir, defaultPluginsInfo);
 	const downloadedPluginNames: PluginIdAndName = await downloadPlugins(localPluginsVersions, defaultPluginsInfo, manifests);
 	await extractPlugins(__dirname, defaultPluginDir, downloadedPluginNames);
+	await extractMacPlugins(defaultPluginDir, downloadedPluginNames);
 }
 
 if (require.main === module) {

readme/cla_signatures.json

@@ -439,6 +439,14 @@
       "created_at": "2023-04-10T02:33:42Z",
       "repoId": 79162682,
       "pullRequestNo": 8036
+    },
+    {
+      "name": "simonla",
+      "id": 14934570,
+      "comment_id": 1503950257,
+      "created_at": "2023-04-11T19:02:23Z",
+      "repoId": 79162682,
+      "pullRequestNo": 8042
     }
   ]
 }

readme/terminal.md

@@ -741,7 +741,7 @@ The following commands are available in [command-line mode](#command-line-mode):
 
 # License
 
-Copyright (c) 2016-2021 Laurent Cozic
+Copyright (c) 2016-2023 Laurent Cozic
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 

yarn.lock

@@ -5047,7 +5047,7 @@ __metadata:
     react-native-image-picker: 5.3.1
     react-native-image-resizer: 1.4.5
     react-native-modal-datetime-picker: 14.0.1
-    react-native-paper: 5.5.0
+    react-native-paper: 5.5.2
     react-native-popup-menu: 0.16.1
     react-native-quick-actions: 0.3.13
     react-native-rsa-native: 2.0.5
@@ -27361,9 +27361,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"react-native-paper@npm:5.5.0":
-  version: 5.5.0
-  resolution: "react-native-paper@npm:5.5.0"
+"react-native-paper@npm:5.5.2":
+  version: 5.5.2
+  resolution: "react-native-paper@npm:5.5.2"
   dependencies:
     "@callstack/react-theme-provider": ^3.0.8
     color: ^3.1.2
@@ -27373,7 +27373,7 @@ __metadata:
     react-native: "*"
     react-native-safe-area-context: "*"
     react-native-vector-icons: "*"
-  checksum: 1d433e5d48462a8a6477d979f7c9ae44278dfaf713d5f57ff218cfbd8d6f6556d42ace6d01cce410a922157242bd61f92bdf87e0cbd84c6231f1ab369af1777b
+  checksum: fd87b64409e51a2a8c64019710c79c17d6dd016ea3744d869e9aa6a891093418ca6a2326f8ab063ef460d781459b8ed676952a030e64acf8312bc4d05a4c50eb
   languageName: node
   linkType: hard
 
@@ -28711,6 +28711,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"rn-fetch-blob@patch:rn-fetch-blob@npm%3A0.12.0#./.yarn/patches/rn-fetch-blob-npm-0.12.0-cf02e3c544.patch::locator=root%40workspace%3A.":
+  version: 0.12.0
+  resolution: "rn-fetch-blob@patch:rn-fetch-blob@npm%3A0.12.0#./.yarn/patches/rn-fetch-blob-npm-0.12.0-cf02e3c544.patch::version=0.12.0&hash=9431c2&locator=root%40workspace%3A."
+  dependencies:
+    base-64: 0.1.0
+    glob: 7.0.6
+  checksum: 6535ee347b3e76733a10c3873c14622b35613caa86242536b68f130b75a3379d9bb060ad5c8832d78e639c88869e321c288e5c8e89373cdb0c14f23253c31c50
+  languageName: node
+  linkType: hard
+
 "roarr@npm:^2.15.3":
   version: 2.15.4
   resolution: "roarr@npm:2.15.4"