From 36807b3bdbbf5d6fa763a8c861e5d1fbadd593cc Mon Sep 17 00:00:00 2001 From: Johnny A <5891646+johnny243@users.noreply.github.com> Date: Mon, 21 Jun 2021 14:37:30 -0400 Subject: [PATCH 1/3] fix: import file on iOS (#449) * fix: decode selected file uri on iOS * fix: remove exception from alert Co-authored-by: Johnny Almonte --- src/screens/Settings/Sections/OptionsSection.tsx | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/screens/Settings/Sections/OptionsSection.tsx b/src/screens/Settings/Sections/OptionsSection.tsx index 07e966bb..2591ea28 100644 --- a/src/screens/Settings/Sections/OptionsSection.tsx +++ b/src/screens/Settings/Sections/OptionsSection.tsx @@ -12,6 +12,7 @@ import { SCREEN_MANAGE_SESSIONS, SCREEN_SETTINGS } from '@Screens/screens'; import { ButtonType } from '@standardnotes/snjs'; import moment from 'moment'; import React, { useCallback, useContext, useMemo, useState } from 'react'; +import { Platform } from 'react-native'; import DocumentPicker from 'react-native-document-picker'; import RNFS from 'react-native-fs'; @@ -139,7 +140,11 @@ export const OptionsSection = ({ title, encryptionAvailable }: Props) => { const selectedFile = await DocumentPicker.pick({ type: [DocumentPicker.types.plainText], }); - const data = await readImportFile(selectedFile.uri); + const selectedFileURI = + Platform.OS === 'ios' + ? decodeURIComponent(selectedFile.uri) + : selectedFile.uri; + const data = await readImportFile(selectedFileURI); if (!data) { return; } From 155255c67670c78f7d86562a243b1aad33b8889d Mon Sep 17 00:00:00 2001 From: Antonella Sgarlatta Date: Mon, 21 Jun 2021 16:33:15 -0300 Subject: [PATCH 2/3] chore(version-snjs): 2.7.4 --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 31728ba4..3c416331 100644 --- a/package.json +++ b/package.json @@ -26,7 +26,7 @@ "@react-navigation/native": "^5.9.3", "@react-navigation/stack": "^5.14.3", "@standardnotes/sncrypto-common": "1.2.9", - "@standardnotes/snjs": "2.7.3", + "@standardnotes/snjs": "2.7.4", "js-base64": "^3.5.2", "moment": "^2.29.1", "react": "17.0.1", diff --git a/yarn.lock b/yarn.lock index c991ad73..b17ea982 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1630,10 +1630,10 @@ resolved "https://registry.yarnpkg.com/@standardnotes/sncrypto-common/-/sncrypto-common-1.2.9.tgz#5212a959e4ec563584e42480bfd39ef129c3cbdf" integrity sha512-xJ5IUGOZztjSgNP/6XL+Ut5+q9UgSTv6xMtKkcQC5aJxCOkJy9u6RamPLdF00WQgwibxx2tu0e43bKUjTgzMig== -"@standardnotes/snjs@2.7.3": - version "2.7.3" - resolved "https://registry.yarnpkg.com/@standardnotes/snjs/-/snjs-2.7.3.tgz#3b8d4bbcb0d841e02726193c4540d1b11d772249" - integrity sha512-YzD9/lxUS4nn922gR03/UHL9shqsyqikx+4Ud9v4IqtGEwKpusny4ecKPtvdbot/nedqEKpMZzrqT7xeNiRKqQ== +"@standardnotes/snjs@2.7.4": + version "2.7.4" + resolved "https://registry.yarnpkg.com/@standardnotes/snjs/-/snjs-2.7.4.tgz#0da670ab2cb76918fb6e75d57e5c00dfe82da196" + integrity sha512-UUNcXEdjX63YU0yBezwVVlvJ5HTic8l/CLqgjWrbsVAfPPJ8WC8FmGcv3yBOc+d56qgp+Tg1LMySYaOs67JRCw== dependencies: "@standardnotes/auth" "^2.0.0" "@standardnotes/sncrypto-common" "^1.2.9" From b7243b0e05ff3b948d90c6b48e64d9041b1c8146 Mon Sep 17 00:00:00 2001 From: Antonella Sgarlatta Date: Mon, 21 Jun 2021 18:00:08 -0300 Subject: [PATCH 3/3] chore(version): 3.6.13 --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 3c416331..74a25dbb 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "StandardNotes", - "version": "3.6.12", - "user-version": "3.6.12", + "version": "3.6.13", + "user-version": "3.6.13", "private": true, "license": "AGPL-3.0-or-later", "scripts": {