From e19083b73fdec2c8f774c9fdc50d4e717fe408cf Mon Sep 17 00:00:00 2001 From: Radek Czemerys Date: Wed, 11 Nov 2020 19:36:11 +0100 Subject: [PATCH 1/5] test failed session --- src/lib/application.ts | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/src/lib/application.ts b/src/lib/application.ts index 06f67f21..ae54457b 100644 --- a/src/lib/application.ts +++ b/src/lib/application.ts @@ -1,3 +1,5 @@ +import Bugsnag from '@bugsnag/react-native'; +import AsyncStorage from '@react-native-community/async-storage'; import { SCREEN_AUTHENTICATE } from '@Screens/screens'; import { Platform } from 'react-native'; import VersionInfo from 'react-native-version-info'; @@ -17,6 +19,7 @@ import { ComponentManager } from './component_manager'; import { EditorGroup } from './editor_group'; import { InstallationService } from './installation_service'; import { MobileDeviceInterface } from './interface'; +import Keychain from './keychain'; import { push } from './navigation_service'; import { PreferencesManager } from './preferences_manager'; import { SNReactNativeCrypto } from './react_native_crypto'; @@ -60,6 +63,24 @@ export class MobileApplication extends SNApplication { this.Uuid = Math.random().toString(); this.editorGroup = new EditorGroup(this); this.componentGroup = new ComponentGroup(this); + setTimeout(() => { + this.logState(); + }, 1000); + + setTimeout(() => { + this.logState(); + }, 5000); + } + + async logState() { + const storageKeys = (await AsyncStorage.getAllKeys()).filter( + key => !key.startsWith('Item-') + ); + const keychain = await Keychain.getKeys(); + const values = await AsyncStorage.multiGet(storageKeys); + Bugsnag.leaveBreadcrumb('Storage values: ' + values); + Bugsnag.leaveBreadcrumb('keychain: ' + keychain); + console.log('storage values:', values, 'keychain', keychain); } /** @override */ From 836414375b44edf16777b4aa8989be2b0e077bd6 Mon Sep 17 00:00:00 2001 From: Radek Czemerys Date: Wed, 11 Nov 2020 20:11:50 +0100 Subject: [PATCH 2/5] Revert "chore: bump snjs" This reverts commit 4447ad9cdd43365facf45bf94c4d8bb306acca53. --- package.json | 2 +- yarn.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index 586f1348..588ff3bb 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#941e8ec0893f187541b5da39883edb7c0c2a4009", + "snjs": "standardnotes/snjs#def68479f53238c81096bc872a6823cd249d084d", "standard-notes-rn": "standardnotes/standard-notes-rn#996b016", "styled-components": "^5.2.1" }, diff --git a/yarn.lock b/yarn.lock index 01e887e7..b46b8dd3 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#941e8ec0893f187541b5da39883edb7c0c2a4009: +snjs@standardnotes/snjs#def68479f53238c81096bc872a6823cd249d084d: version "1.0.5" - resolved "https://codeload.github.com/standardnotes/snjs/tar.gz/941e8ec0893f187541b5da39883edb7c0c2a4009" + resolved "https://codeload.github.com/standardnotes/snjs/tar.gz/def68479f53238c81096bc872a6823cd249d084d" source-map-resolve@^0.5.0: version "0.5.3" From 87a7d8c3696ced84cfeaefae19a5b1a5c678ad5b Mon Sep 17 00:00:00 2001 From: Radek Czemerys Date: Wed, 11 Nov 2020 21:17:01 +0100 Subject: [PATCH 3/5] Revert "test failed session" This reverts commit e19083b73fdec2c8f774c9fdc50d4e717fe408cf. --- src/lib/application.ts | 21 --------------------- 1 file changed, 21 deletions(-) diff --git a/src/lib/application.ts b/src/lib/application.ts index ae54457b..06f67f21 100644 --- a/src/lib/application.ts +++ b/src/lib/application.ts @@ -1,5 +1,3 @@ -import Bugsnag from '@bugsnag/react-native'; -import AsyncStorage from '@react-native-community/async-storage'; import { SCREEN_AUTHENTICATE } from '@Screens/screens'; import { Platform } from 'react-native'; import VersionInfo from 'react-native-version-info'; @@ -19,7 +17,6 @@ import { ComponentManager } from './component_manager'; import { EditorGroup } from './editor_group'; import { InstallationService } from './installation_service'; import { MobileDeviceInterface } from './interface'; -import Keychain from './keychain'; import { push } from './navigation_service'; import { PreferencesManager } from './preferences_manager'; import { SNReactNativeCrypto } from './react_native_crypto'; @@ -63,24 +60,6 @@ export class MobileApplication extends SNApplication { this.Uuid = Math.random().toString(); this.editorGroup = new EditorGroup(this); this.componentGroup = new ComponentGroup(this); - setTimeout(() => { - this.logState(); - }, 1000); - - setTimeout(() => { - this.logState(); - }, 5000); - } - - async logState() { - const storageKeys = (await AsyncStorage.getAllKeys()).filter( - key => !key.startsWith('Item-') - ); - const keychain = await Keychain.getKeys(); - const values = await AsyncStorage.multiGet(storageKeys); - Bugsnag.leaveBreadcrumb('Storage values: ' + values); - Bugsnag.leaveBreadcrumb('keychain: ' + keychain); - console.log('storage values:', values, 'keychain', keychain); } /** @override */ From f45a224a408df2458153d3fa74cc34dc435d70c7 Mon Sep 17 00:00:00 2001 From: Radek Czemerys Date: Wed, 11 Nov 2020 21:21:14 +0100 Subject: [PATCH 4/5] fix: no warning for not decrypted users --- ios/Podfile.lock | 4 ++-- package.json | 10 +++++----- yarn.lock | 38 +++++++++++++++++++------------------- 3 files changed, 26 insertions(+), 26 deletions(-) diff --git a/ios/Podfile.lock b/ios/Podfile.lock index ff303621..8e8595cd 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -241,7 +241,7 @@ PODS: - React-Core - react-native-mail (4.1.0): - React-Core - - react-native-safe-area-context (3.1.8): + - react-native-safe-area-context (3.1.9): - React-Core - react-native-segmented-control (2.2.1): - React-Core @@ -551,7 +551,7 @@ SPEC CHECKSUMS: react-native-aes: a13199300208e4eda1df14506a276415561e02bd react-native-fingerprint-scanner: be63e626b31fb951780a5fac5328b065a61a3d6e react-native-mail: 5fe7239a5b5c1e858d425501c03d1ab977434122 - react-native-safe-area-context: 79fea126c6830c85f65947c223a5e3058a666937 + react-native-safe-area-context: b6e0e284002381d2ff29fa4fff42b4d8282e3c94 react-native-segmented-control: eb9e25fbfbce226ecf66d643428fbe97601e691a react-native-sodium: dd3c708254bb924d96f2d80768f114fa4bfe1c3f react-native-version-info: 36490da17d2c6b5cc21321c70e433784dee7ed0b diff --git a/package.json b/package.json index 588ff3bb..72465cd7 100644 --- a/package.json +++ b/package.json @@ -10,7 +10,7 @@ "ios-dev": "react-native run-ios --scheme StandardNotesDev", "ios-prod": "react-native run-ios --scheme StandardNotes", "clear-cache": "watchman watch-del-all && rm -rf $TMPDIR/react-native-packager-cache-* && rm -rf $TMPDIR/metro-bundler-cache-*", - "init": "yarn && npx pod-install ios", + "init": "yarn cache clean snjs && yarn && npx pod-install ios", "lint": "npm-run-all --parallel lint:*", "lint:eslint": "yarn eslint . --ext .ts,.tsx --fix", "lint:ts": "tsc --noEmit", @@ -24,8 +24,8 @@ "@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.8", - "@react-navigation/stack": "^5.12.5", + "@react-navigation/native": "^5.8.9", + "@react-navigation/stack": "^5.12.6", "js-base64": "^3.5.2", "moment": "^2.29.1", "react": "16.11.0", @@ -42,7 +42,7 @@ "react-native-mail": "standardnotes/react-native-mail#f7f74be", "react-native-privacy-snapshot": "standardnotes/react-native-privacy-snapshot#653e904", "react-native-reanimated": "^1.13.1", - "react-native-safe-area-context": "^3.1.8", + "react-native-safe-area-context": "^3.1.9", "react-native-screens": "^2.12.0", "react-native-search-bar": "standardnotes/react-native-search-bar#7d2139d", "react-native-search-box": "standardnotes/react-native-search-box#c43b477943e99aa41e5b20711959c00c87286604", @@ -55,7 +55,7 @@ "react-navigation-header-buttons": "^6.0.0", "sn-textview": "standardnotes/sn-textview#440dbd60eedef4397b6272735e68d4579bb41ac8", "sncrypto": "standardnotes/sncrypto#5f8cd36", - "snjs": "standardnotes/snjs#def68479f53238c81096bc872a6823cd249d084d", + "snjs": "standardnotes/snjs#6636a267b0a0cf3f725e752db5919193fbfd3bf0", "standard-notes-rn": "standardnotes/standard-notes-rn#996b016", "styled-components": "^5.2.1" }, diff --git a/yarn.lock b/yarn.lock index b46b8dd3..570089aa 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1519,10 +1519,10 @@ 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.14.2": - version "5.14.2" - resolved "https://registry.yarnpkg.com/@react-navigation/core/-/core-5.14.2.tgz#973c4d63b934bf4eb5b0a933dc73b79298d0ce6b" - integrity sha512-gmEGo6Fr0ktg+4Ao5ogRAVWtSrCm2qQkn7GlQSe3hxDaTLVrlS3K30SAQHs88j11I7qtaFaMiFD0VN7F1gWXCw== +"@react-navigation/core@^5.14.3": + version "5.14.3" + resolved "https://registry.yarnpkg.com/@react-navigation/core/-/core-5.14.3.tgz#6bbbfe1fb90aa64068fdb69bbb6c55120b7b24f1" + integrity sha512-l4zCfIfPC4DYuDcluiisaWKg7GO5yAjBrIL0pzEw8bIBj+R6vnZnyG9AWgnwo5fl241DX+1sfgzGEUQgpIJNew== dependencies: "@react-navigation/routers" "^5.6.2" escape-string-regexp "^4.0.0" @@ -1530,12 +1530,12 @@ query-string "^6.13.6" react-is "^16.13.0" -"@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== +"@react-navigation/native@^5.8.9": + version "5.8.9" + resolved "https://registry.yarnpkg.com/@react-navigation/native/-/native-5.8.9.tgz#67ee2afef6af6ef40c425e02264bd25d1530b361" + integrity sha512-d1oihLxp9UDVsZyvHNcwJfj+LKsEo0m8vEBBV6jhLJAXs1d2DEBzBXGeP907uG+877TK7luh2h79Or4w7/+p+g== dependencies: - "@react-navigation/core" "^5.14.2" + "@react-navigation/core" "^5.14.3" escape-string-regexp "^4.0.0" nanoid "^3.1.15" @@ -1546,10 +1546,10 @@ dependencies: nanoid "^3.1.15" -"@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== +"@react-navigation/stack@^5.12.6": + version "5.12.6" + resolved "https://registry.yarnpkg.com/@react-navigation/stack/-/stack-5.12.6.tgz#a6f2caf66da78ad2afa80f7a960c36db6b83bcff" + integrity sha512-pf9AigAIVtCQuCpZAZqBux4kNqQwj98ngvd6JEryFrqTQ1CYsUH6jfpQE7SKyHggVRFSQVMf24aCgwtRixBvjw== dependencies: color "^3.1.3" react-native-iphone-x-helper "^1.3.0" @@ -7174,10 +7174,10 @@ react-native-reanimated@^1.13.1: dependencies: fbjs "^1.0.0" -react-native-safe-area-context@^3.1.8: - version "3.1.8" - resolved "https://registry.yarnpkg.com/react-native-safe-area-context/-/react-native-safe-area-context-3.1.8.tgz#7a9883aa0f38f9c77d4bef2b89e4e285bc1024a3" - integrity sha512-9gUlsDZ96QwT9AKzA6aVWM/NX5rlJgauZ9HgCDVzKbe29UQYT1740QJnnaI2GExmkFGp6o7ZLNhCXZW95eYVFA== +react-native-safe-area-context@^3.1.9: + version "3.1.9" + resolved "https://registry.yarnpkg.com/react-native-safe-area-context/-/react-native-safe-area-context-3.1.9.tgz#48864ea976b0fa57142a2cc523e1fd3314e7247e" + integrity sha512-wmcGbdyE/vBSL5IjDPReoJUEqxkZsywZw5gPwsVUV1NBpw5eTIdnL6Y0uNKHE25Z661moxPHQz6kwAkYQyorxA== react-native-screens@^2.12.0: version "2.12.0" @@ -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#def68479f53238c81096bc872a6823cd249d084d: +snjs@standardnotes/snjs#6636a267b0a0cf3f725e752db5919193fbfd3bf0: version "1.0.5" - resolved "https://codeload.github.com/standardnotes/snjs/tar.gz/def68479f53238c81096bc872a6823cd249d084d" + resolved "https://codeload.github.com/standardnotes/snjs/tar.gz/6636a267b0a0cf3f725e752db5919193fbfd3bf0" source-map-resolve@^0.5.0: version "0.5.3" From 17568bf4d85ed882ee366bb4e9f08485409f2fc2 Mon Sep 17 00:00:00 2001 From: Radek Czemerys Date: Wed, 11 Nov 2020 21:21:35 +0100 Subject: [PATCH 5/5] 3.5.7 --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 72465cd7..c10fdff6 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "StandardNotes", - "version": "3.5.6", - "user-version": "3.5.6", + "version": "3.5.7", + "user-version": "3.5.7", "private": true, "license": "AGPL-3.0-or-later", "scripts": {