chore: use rn-keychain fork to avoid using patch-package, which does not work well with yarn 3

This commit is contained in:
Mo
2022-06-14 11:37:25 -05:00
parent d9ad998e42
commit 13ddf89142
7 changed files with 8 additions and 27 deletions

View File

@@ -6,6 +6,7 @@ on:
jobs:
Build:
if: contains(github.event.head_commit.message, 'chore(release)') == false
runs-on: ubuntu-latest
steps:
- name: Checkout code

Binary file not shown.

View File

@@ -23,7 +23,8 @@
"prepare": "husky install",
"reset": "find . -type dir -name node_modules | xargs rm -rf && rm -rf yarn.lock",
"release:prod": "lerna version --conventional-commits --yes -m \"chore(release): publish\"",
"release:beta": "lerna version --conventional-prerelease --conventional-commits --yes -m \"chore(release): publish\""
"release:beta": "lerna version --conventional-prerelease --conventional-commits --yes -m \"chore(release): publish\"",
"version": "yarn install --no-immutable && git add yarn.lock"
},
"resolutions": {
"@types/styled-components/@types/react": "17.0.2",

View File

@@ -56,7 +56,7 @@
"react-native-fs": "^2.19.0",
"react-native-gesture-handler": "2.3.2",
"react-native-image-picker": "^4.7.3",
"react-native-keychain": "8.0.0",
"react-native-keychain": "standardnotes/react-native-keychain#d277d360494cbd02be4accb4a360772a8e0e97b6",
"react-native-mail": "standardnotes/react-native-mail#fd26119e67a2ffc5eaa95a9c17049743e39ce2d3",
"react-native-privacy-snapshot": "standardnotes/react-native-privacy-snapshot#653e904c90fc6f2b578da59138f2bfe5d7f942fe",
"react-native-reanimated": "^2.8.0",

View File

@@ -1,21 +0,0 @@
Fixes Android on launch performance issue
https://github.com/oblador/react-native-keychain/issues/314#issuecomment-736640077
diff --git a/android/src/main/java/com/oblador/keychain/KeychainModule.java b/android/src/main/java/com/oblador/keychain/KeychainModule.java
index 6ca68cb..a600f38 100644
--- a/android/src/main/java/com/oblador/keychain/KeychainModule.java
+++ b/android/src/main/java/com/oblador/keychain/KeychainModule.java
@@ -140,13 +140,7 @@ public class KeychainModule extends ReactContextBaseJavaModule {
super(reactContext);
prefsStorage = new PrefsStorage(reactContext);
- addCipherStorageToMap(new CipherStorageFacebookConceal(reactContext));
addCipherStorageToMap(new CipherStorageKeystoreAesCbc());
-
- // we have a references to newer api that will fail load of app classes in old androids OS
- if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
- addCipherStorageToMap(new CipherStorageKeystoreRsaEcb());
- }
}
/** Allow initialization in chain. */

View File

@@ -5312,7 +5312,7 @@ __metadata:
react-native-fs: ^2.19.0
react-native-gesture-handler: 2.3.2
react-native-image-picker: ^4.7.3
react-native-keychain: 8.0.0
react-native-keychain: "standardnotes/react-native-keychain#d277d360494cbd02be4accb4a360772a8e0e97b6"
react-native-mail: "standardnotes/react-native-mail#fd26119e67a2ffc5eaa95a9c17049743e39ce2d3"
react-native-monorepo-tools: ^1.1.4
react-native-pager-view: ^5.4.15
@@ -23121,10 +23121,10 @@ __metadata:
languageName: node
linkType: hard
"react-native-keychain@npm:8.0.0":
"react-native-keychain@standardnotes/react-native-keychain#d277d360494cbd02be4accb4a360772a8e0e97b6":
version: 8.0.0
resolution: "react-native-keychain@npm:8.0.0"
checksum: cbab1cef8565743072f919663068727df20fc0ef5edd53b0aa96fac74c11fcd0daa197968b06cabed4f1b3f8e5e5ae73b6db8543ed9adbecc13662c38958c9ce
resolution: "react-native-keychain@https://github.com/standardnotes/react-native-keychain.git#commit=d277d360494cbd02be4accb4a360772a8e0e97b6"
checksum: a8a1484446a24db4f90bc72ba7b22a4637cc4f75421f9b3c30b22bfe753c2c349a165dc848cb0ed4508f64f96e5d2220e41aae57647629d9a70aff933152e8df
languageName: node
linkType: hard