Skip to content

Conversation

@ovitrif
Copy link
Collaborator

@ovitrif ovitrif commented Nov 5, 2024

Fixes synonymdev/bitkit#2332
Fixes synonymdev/bitkit#1916

Merge latest changes from updated PR which was replayed on top of the latest version of the original library, i.e. 1.9.0

Additional fixes were added:

  • an issue with concurrent cipher operations -- which appeared after the original library got migrated to kotlin and adopted coroutines -- and was highlighted by the datastore implementation which also uses coroutines now.
  • Proper usage of coroutineScope to fix hot-reloading in React Native development
  • Replay changes on package.json from PR

Changes

It may seem a lot but actual changes from our side, needing review are:

  • fix: React Methods region 5039e01
  • refactor: Convert PrefsStorageBase to Kotlin & use DataStorePrefsStorage c8ebf54
  • fix: Use module coroutineScope in prefs data store bf81351
  • chore: Update datastore-preferences & clean diff 7873ddd
  • Remove shared preferences e096a73
  • fix: Use Mutex to ensure no concurrent encryption operations eb6df3b
  • fix: rename package to @synonymdev/react-native-keychain 9d19100

Tests I did

  1. Update on top of a Bitkit app that was using the published version of the package
    • ✅ wallet keys were read from keychain
  2. Set pin on wallet after update & use pin afterwards
    • ✅ had to fix the concurrent issue with a mutex, worked afterwards

thiagobrez and others added 30 commits March 25, 2024 12:02
chore(docs): fix test badge
DorianMazur and others added 18 commits October 20, 2024 18:11
…blador#669)

* refactor: remove duplicated code and add hasCredentialsWithSecClass

* fix: ios build
* fix: improve strongbox detection

* ci: add gradle build workflow

* ci: change java to 17

* chore: cleanup
* test: add new e2e test scenarios

* ci: fix e2e workflow

* ci: fix workflow

* ci: move enrollFingerprint to workflow

* ci: fix workflow

* ci: fix worflow sleep command

* typo: sleep command
# Conflicts:
#	KeychainExample/android/build.gradle
#	README.md
#	android/build.gradle
#	android/src/main/java/com/oblador/keychain/KeychainModule.java
#	android/src/test/java/com/oblador/keychain/KeychainModuleTests.java
#	build.gradle.kts
Reimplement data store refactoring on version 9.1.0
# Conflicts:
#	README.md
#	android/build.gradle
#	android/src/main/java/com/oblador/keychain/DataStorePrefsStorage.kt
#	android/src/main/java/com/oblador/keychain/KeychainModule.java
#	android/src/test/java/com/oblador/keychain/KeychainModuleTests.java
#	build.gradle.kts
#	package.json
#	typings/react-native-keychain.d.ts
@ovitrif ovitrif marked this pull request as ready for review November 5, 2024 18:41
@ovitrif ovitrif requested a review from limpbrains November 5, 2024 18:41
@ovitrif
Copy link
Collaborator Author

ovitrif commented Nov 5, 2024

@limpbrains Please have a look if this works correctly, I've did what I thought needed to align it with your former changes so it's importable with @synonymdev/react-native-keychain.

I will check myself as well.

This PR aligns our internal fork with the updates I added to my PR for the original library

@ovitrif
Copy link
Collaborator Author

ovitrif commented Nov 5, 2024

Worked after I fixed a merge issue in a7edfe4 🎉

@pwltr
Copy link

pwltr commented Nov 5, 2024

Tested LGTM!

@ovitrif ovitrif merged commit d18241f into master Nov 7, 2024
@ovitrif ovitrif deleted the refactor/android-data-store branch November 7, 2024 12:46
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

react-native-keychain fork update [Bug]: Hot reloading on Android broken

9 participants