status-im
/
react-native-firebase
mirror of
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/firestore-transactions' into firestore-transactions

This commit is contained in:
Salakar 2018-02-24 08:57:30 +00:00
parent 952ed34256 80e9e99789
commit c792cd9146
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
android/src/main/java/io/invertase/firebase/firestore/RNFirebaseFirestore.java
View File

@ -263,7 +263,7 @@ public class RNFirebaseFirestore extends ReactContextBaseJavaModule {
.runTransaction(new Transaction.Function<Void>() { .runTransaction(new Transaction.Function<Void>() {
@Override @Override
public Void apply(@NonNull Transaction transaction) throws FirebaseFirestoreException { public Void apply(@NonNull Transaction transaction) throws FirebaseFirestoreException {
transactionHandler.setFirestoreTransaction(transaction); transactionHandler.resetState(transaction);
// emit the update cycle to JS land using an async task // emit the update cycle to JS land using an async task
// otherwise it gets blocked by the pending lock await // otherwise it gets blocked by the pending lock await

5
android/src/main/java/io/invertase/firebase/firestore/RNFirebaseFirestoreTransactionHandler.java
View File

@ -51,11 +51,12 @@ class RNFirebaseFirestoreTransactionHandler {
} }
/** /**
* Keep a ref to the Transaction instance. * Reset handler state - clears command buffer + updates to new Transaction instance
* *
* @param firestoreTransaction * @param firestoreTransaction
*/ */
void setFirestoreTransaction(Transaction firestoreTransaction) { void resetState(Transaction firestoreTransaction) {
this.commandBuffer = null;
this.firestoreTransaction = firestoreTransaction; this.firestoreTransaction = firestoreTransaction;
} }