From ea09cacc95ac2cbddf18d83ff08ded4ea2413320 Mon Sep 17 00:00:00 2001 From: Radek Czemerys Date: Mon, 9 Nov 2020 19:21:58 +0100 Subject: [PATCH 1/4] fix: reset pending on invalid value --- src/screens/Authenticate/Authenticate.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/screens/Authenticate/Authenticate.tsx b/src/screens/Authenticate/Authenticate.tsx index ba4ed78e..7188d5c6 100644 --- a/src/screens/Authenticate/Authenticate.tsx +++ b/src/screens/Authenticate/Authenticate.tsx @@ -398,7 +398,7 @@ export const Authenticate = ({ ); const onInvalidValue = (value: ChallengeValue) => { - setPending(true); + setPending(false); dispatch({ type: 'setState', id: value.prompt.id.toString(), From 270dd2ccbf771188b45f034ffa488454e1bc49f1 Mon Sep 17 00:00:00 2001 From: Radek Czemerys Date: Mon, 9 Nov 2020 21:24:17 +0100 Subject: [PATCH 2/4] fix: keychain failures recovery --- ios/Podfile.lock | 4 ++-- package.json | 8 +++---- src/lib/keychain.ts | 7 +----- yarn.lock | 56 +++++++++++++++++++-------------------------- 4 files changed, 31 insertions(+), 44 deletions(-) diff --git a/ios/Podfile.lock b/ios/Podfile.lock index ed73b95d..3fba0e21 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -1,6 +1,6 @@ PODS: - boost-for-react-native (1.63.0) - - BugsnagReactNative (7.5.1): + - BugsnagReactNative (7.5.2): - React - CocoaAsyncSocket (7.6.4) - CocoaLibEvent (1.0.0) @@ -523,7 +523,7 @@ EXTERNAL SOURCES: SPEC CHECKSUMS: boost-for-react-native: 39c7adb57c4e60d6c5479dd8623128eb5b3f0f2c - BugsnagReactNative: 153f9a475c537cd4097aef28229da9b590a69833 + BugsnagReactNative: 3cd02fe1b483dcbbfe41cc3bdef9056afca1e2ef CocoaAsyncSocket: 694058e7c0ed05a9e217d1b3c7ded962f4180845 CocoaLibEvent: 2fab71b8bd46dd33ddb959f7928ec5909f838e3f DoubleConversion: 5805e889d232975c086db112ece9ed034df7a0b2 diff --git a/package.json b/package.json index ec8d7285..615bdb9e 100644 --- a/package.json +++ b/package.json @@ -19,13 +19,13 @@ "postinstall": "patch-package" }, "dependencies": { - "@bugsnag/react-native": "^7.5.1", + "@bugsnag/react-native": "^7.5.2", "@expo/react-native-action-sheet": "^3.8.0", "@react-native-community/async-storage": "1.12.1", "@react-native-community/masked-view": "^0.1.10", "@react-native-community/segmented-control": "^2.2.1", - "@react-navigation/native": "^5.8.4", - "@react-navigation/stack": "^5.12.1", + "@react-navigation/native": "^5.8.8", + "@react-navigation/stack": "^5.12.5", "js-base64": "^3.5.2", "moment": "^2.29.1", "react": "16.11.0", @@ -55,7 +55,7 @@ "react-navigation-header-buttons": "^6.0.0", "sn-textview": "standardnotes/sn-textview#440dbd60eedef4397b6272735e68d4579bb41ac8", "sncrypto": "standardnotes/sncrypto#5f8cd36", - "snjs": "standardnotes/snjs#d6556503aae3d1ac6ca4c8f2c116430fe8f1a91b", + "snjs": "standardnotes/snjs#e99c63b766c2666de5a2201f4749fcc6a723e252", "standard-notes-rn": "standardnotes/standard-notes-rn#996b016", "styled-components": "^5.2.1" }, diff --git a/src/lib/keychain.ts b/src/lib/keychain.ts index 9f1a71dd..ad8882ba 100644 --- a/src/lib/keychain.ts +++ b/src/lib/keychain.ts @@ -1,4 +1,3 @@ -import { Alert } from 'react-native'; import * as RCTKeychain from 'react-native-keychain'; type KeychainValue = Record; @@ -30,14 +29,10 @@ export default class Keychain { } }) .catch(function (error) { - console.log( + console.error( "Keychain couldn't be accessed! Maybe no value set?", error ); - Alert.alert( - 'Keychain failure', - 'Reading data from Keychain failed. Please try again and contact support if the problem persists.' - ); return undefined; }); } diff --git a/yarn.lock b/yarn.lock index 9c727a23..1b57e029 100644 --- a/yarn.lock +++ b/yarn.lock @@ -905,10 +905,10 @@ resolved "https://registry.yarnpkg.com/@bugsnag/plugin-react/-/plugin-react-7.3.5.tgz#0bdb462c274fdbe02cf43698aca4ae0035dbf2e3" integrity sha512-y9J9hRJXwuQ+IqoURtbYpW4WRcku2PPE1JYyRFzKEN9YEPXEkG6ZPTBfa+MydoIF+hey1rsJ10OLukJZlFv3BQ== -"@bugsnag/react-native@^7.5.1": - version "7.5.1" - resolved "https://registry.yarnpkg.com/@bugsnag/react-native/-/react-native-7.5.1.tgz#211e7ce4544cd1abf23ce60642ffdd5fc05b6a76" - integrity sha512-T2UBX6ruNyQ7BfOodF637IYwhq36ErfwzI2NJH+fthr7/p3otKSIufsGG9NqJ1nf2uOu+vMCZR9ino20a/92NQ== +"@bugsnag/react-native@^7.5.2": + version "7.5.2" + resolved "https://registry.yarnpkg.com/@bugsnag/react-native/-/react-native-7.5.2.tgz#99d1ba983bd30374984e4b016c1cd7081af29314" + integrity sha512-qxTjkCaKXpwzzn9E/ZMeBpB8ll8q5YKMB0cldAL5UntYtCZGQBAinxlxN5GL6QijU7SCBucbFMHpuhS+O2otVQ== dependencies: "@bugsnag/core" "^7.3.5" "@bugsnag/delivery-react-native" "^7.4.0" @@ -1519,38 +1519,37 @@ resolved "https://registry.yarnpkg.com/@react-native-community/segmented-control/-/segmented-control-2.2.1.tgz#5ca418d78c5f6051353c9586918458713b88a83c" integrity sha512-BzxFbI9Iqv+31yVqEvCTzJYmwb8jOMTf/UPuC4Hj176tmEPqBpuDaGH+rkAFg1miOco3/43RQxiAZO+mkY40Fg== -"@react-navigation/core@^5.13.4": - version "5.13.4" - resolved "https://registry.yarnpkg.com/@react-navigation/core/-/core-5.13.4.tgz#0d3e6be7cd4a3502831bfe31be2d5b9c46675274" - integrity sha512-9mFPAPWUQcT9bQ9vcW+vFuCNqT/WyA1qOY3vCaRel+XNRfkuJBTBcV/0Z0FNntzc/0PgJ93saENB/XQV8iiNRw== +"@react-navigation/core@^5.14.2": + version "5.14.2" + resolved "https://registry.yarnpkg.com/@react-navigation/core/-/core-5.14.2.tgz#973c4d63b934bf4eb5b0a933dc73b79298d0ce6b" + integrity sha512-gmEGo6Fr0ktg+4Ao5ogRAVWtSrCm2qQkn7GlQSe3hxDaTLVrlS3K30SAQHs88j11I7qtaFaMiFD0VN7F1gWXCw== dependencies: - "@react-navigation/routers" "^5.5.1" + "@react-navigation/routers" "^5.6.2" escape-string-regexp "^4.0.0" nanoid "^3.1.15" query-string "^6.13.6" react-is "^16.13.0" - use-subscription "^1.5.0" -"@react-navigation/native@^5.8.4": - version "5.8.4" - resolved "https://registry.yarnpkg.com/@react-navigation/native/-/native-5.8.4.tgz#51d782e776abb629900c1d1424e2d382999c9263" - integrity sha512-npj833rXwrjMPO/2LzEPmeSmDZs83G/OS6B+bmkKe+iXK33ym/1iyci7QwaWX0UJ3C2mLWY04yRbDsYOJF64gg== +"@react-navigation/native@^5.8.8": + version "5.8.8" + resolved "https://registry.yarnpkg.com/@react-navigation/native/-/native-5.8.8.tgz#55216b0f95dcd6971198c9d3717b7d7af6a5faee" + integrity sha512-l3cMrAJ9NR4F4oZqWRzeok0NJpJF8u2Dl/EKpMG/T54Xpt5mUzylBVolCvmgkCCATJYOx1dSu8r50Reh31csFA== dependencies: - "@react-navigation/core" "^5.13.4" + "@react-navigation/core" "^5.14.2" escape-string-regexp "^4.0.0" nanoid "^3.1.15" -"@react-navigation/routers@^5.5.1": - version "5.5.1" - resolved "https://registry.yarnpkg.com/@react-navigation/routers/-/routers-5.5.1.tgz#ece34180e0734e453a7f30dbeeaf3856f25afa00" - integrity sha512-Unn2T5+xnolyGzEhiuFnHEGfgvh7+1OJ5KzBY7T65e4gHWT7E1CO8unRbDxRI0KYkXflmRPCfuDjobVTj5xepw== +"@react-navigation/routers@^5.6.2": + version "5.6.2" + resolved "https://registry.yarnpkg.com/@react-navigation/routers/-/routers-5.6.2.tgz#accc008c3b777f74d998e16cb2ea8e4c1fe8d9aa" + integrity sha512-XBcDKXS5s4MaHFufN44LtbXqFDH/nUHfHjbwG85fP3k772oRyPRgbnUb2mbw5MFGqORla9T7uymR6Gh6uwIwVw== dependencies: nanoid "^3.1.15" -"@react-navigation/stack@^5.12.1": - version "5.12.1" - resolved "https://registry.yarnpkg.com/@react-navigation/stack/-/stack-5.12.1.tgz#391a49ed8b14f12cea4bab2e920cdce41ef7c090" - integrity sha512-kfsVxPY5IHc7PgM3uWU0aB4sI8E0O9J4YVDRoDulZidbsU3pBgG1Y5K0Prt2900gYcFuVj6LgR0bB6SjsGD1Rg== +"@react-navigation/stack@^5.12.5": + version "5.12.5" + resolved "https://registry.yarnpkg.com/@react-navigation/stack/-/stack-5.12.5.tgz#fc782629976a6375597d9daa78b996fea12ebd6b" + integrity sha512-QzTXJjJg0jIyivjhaQLMRwRL3mXPFgjn8K0YVtSdMy3m0N9nJCT+YxVFJst89ygrAqn7sbavsTuKr8xZciNhmg== dependencies: color "^3.1.3" react-native-iphone-x-helper "^1.3.0" @@ -7988,9 +7987,9 @@ sncrypto@standardnotes/sncrypto#5f8cd36: version "1.2.0" resolved "https://codeload.github.com/standardnotes/sncrypto/tar.gz/5f8cd369773cec7f342c23ecaa659d932b35cd31" -snjs@standardnotes/snjs#d6556503aae3d1ac6ca4c8f2c116430fe8f1a91b: +snjs@standardnotes/snjs#e99c63b766c2666de5a2201f4749fcc6a723e252: version "1.0.5" - resolved "https://codeload.github.com/standardnotes/snjs/tar.gz/d6556503aae3d1ac6ca4c8f2c116430fe8f1a91b" + resolved "https://codeload.github.com/standardnotes/snjs/tar.gz/e99c63b766c2666de5a2201f4749fcc6a723e252" source-map-resolve@^0.5.0: version "0.5.3" @@ -8727,13 +8726,6 @@ use-subscription@^1.0.0: dependencies: object-assign "^4.1.1" -use-subscription@^1.5.0: - version "1.5.0" - resolved "https://registry.yarnpkg.com/use-subscription/-/use-subscription-1.5.0.tgz#0df66fdf97b9a340147ad72f76fac1db6f56d240" - integrity sha512-/FVRiB2I7NDjzWoNBYPt6YkkvleMm/lFtxj1hH6nX2TVrJ/5UTbovw9OE1efv2Zl0HoAYuTjM7zHd9OsABn5sg== - dependencies: - object-assign "^4.1.1" - use@^3.1.0: version "3.1.1" resolved "https://registry.yarnpkg.com/use/-/use-3.1.1.tgz#d50c8cac79a19fbc20f2911f56eb973f4e10070f" From c95cb735e1ccc394e0b2e33dc02774c3d36edb00 Mon Sep 17 00:00:00 2001 From: Radek Czemerys Date: Mon, 9 Nov 2020 21:26:10 +0100 Subject: [PATCH 3/4] 3.5.4 --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 615bdb9e..6bc82348 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "StandardNotes", - "version": "3.5.3", - "user-version": "3.5.3", + "version": "3.5.4", + "user-version": "3.5.4", "private": true, "license": "AGPL-3.0-or-later", "scripts": { From 2a29659c99171576a8ac7def2ef608f996141891 Mon Sep 17 00:00:00 2001 From: Radek Czemerys Date: Mon, 9 Nov 2020 21:29:59 +0100 Subject: [PATCH 4/4] chore: bump snjs --- package.json | 2 +- yarn.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index 6bc82348..3891239a 100644 --- a/package.json +++ b/package.json @@ -55,7 +55,7 @@ "react-navigation-header-buttons": "^6.0.0", "sn-textview": "standardnotes/sn-textview#440dbd60eedef4397b6272735e68d4579bb41ac8", "sncrypto": "standardnotes/sncrypto#5f8cd36", - "snjs": "standardnotes/snjs#e99c63b766c2666de5a2201f4749fcc6a723e252", + "snjs": "standardnotes/snjs#6388e30976c05a004a6c289b14d99058e349c018", "standard-notes-rn": "standardnotes/standard-notes-rn#996b016", "styled-components": "^5.2.1" }, diff --git a/yarn.lock b/yarn.lock index 1b57e029..61446bc5 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7987,9 +7987,9 @@ sncrypto@standardnotes/sncrypto#5f8cd36: version "1.2.0" resolved "https://codeload.github.com/standardnotes/sncrypto/tar.gz/5f8cd369773cec7f342c23ecaa659d932b35cd31" -snjs@standardnotes/snjs#e99c63b766c2666de5a2201f4749fcc6a723e252: +snjs@standardnotes/snjs#6388e30976c05a004a6c289b14d99058e349c018: version "1.0.5" - resolved "https://codeload.github.com/standardnotes/snjs/tar.gz/e99c63b766c2666de5a2201f4749fcc6a723e252" + resolved "https://codeload.github.com/standardnotes/snjs/tar.gz/6388e30976c05a004a6c289b14d99058e349c018" source-map-resolve@^0.5.0: version "0.5.3"