Skip to content
This repository was archived by the owner on Apr 4, 2023. It is now read-only.

Commit e35bb86

Browse files
No error thrown when write fails #455
1 parent b3c22d0 commit e35bb86

File tree

1 file changed

+33
-25
lines changed

1 file changed

+33
-25
lines changed

src/firebase.android.ts

Lines changed: 33 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1704,13 +1704,14 @@ firebase.push = (path, val) => {
17041704

17051705
const pushInstance = firebase.instance.child(path).push();
17061706

1707-
const onCompletionListener = new com.google.firebase.database.DatabaseReference.CompletionListener({
1708-
onComplete: (error: any /* com.google.firebase.database.DatabaseError */, dbRef: any /* com.google.firebase.database.DatabaseReference */) => {
1709-
error ? reject(error.getMessage()) : resolve({ key: pushInstance.getKey() });
1710-
}
1711-
});
1707+
pushInstance.setValue(firebase.toValue(val))
1708+
.addOnSuccessListener(new com.google.android.gms.tasks.OnSuccessListener({
1709+
onSuccess: () => resolve({key: pushInstance.getKey()})
1710+
}))
1711+
.addOnFailureListener(new com.google.android.gms.tasks.OnFailureListener({
1712+
onFailure: exception => reject(exception.getMessage())
1713+
}));
17121714

1713-
pushInstance.setValue(firebase.toValue(val), onCompletionListener);
17141715
} catch (ex) {
17151716
console.log("Error in firebase.push: " + ex);
17161717
reject(ex);
@@ -1726,13 +1727,14 @@ firebase.setValue = (path, val) => {
17261727
return;
17271728
}
17281729

1729-
const onCompletionListener = new com.google.firebase.database.DatabaseReference.CompletionListener({
1730-
onComplete: (error: any /* com.google.firebase.database.DatabaseError */, dbRef: any /* com.google.firebase.database.DatabaseReference */) => {
1731-
error ? reject(error.getMessage()) : resolve();
1732-
}
1733-
});
1730+
firebase.instance.child(path).setValue(firebase.toValue(val))
1731+
.addOnSuccessListener(new com.google.android.gms.tasks.OnSuccessListener({
1732+
onSuccess: () => resolve()
1733+
}))
1734+
.addOnFailureListener(new com.google.android.gms.tasks.OnFailureListener({
1735+
onFailure: exception => reject(exception.getMessage())
1736+
}));
17341737

1735-
firebase.instance.child(path).setValue(firebase.toValue(val), onCompletionListener);
17361738
} catch (ex) {
17371739
console.log("Error in firebase.setValue: " + ex);
17381740
reject(ex);
@@ -1748,20 +1750,26 @@ firebase.update = (path, val) => {
17481750
return;
17491751
}
17501752

1751-
const onCompletionListener = new com.google.firebase.database.DatabaseReference.CompletionListener({
1752-
onComplete: (error: any /* com.google.firebase.database.DatabaseError */, dbRef: any /* com.google.firebase.database.DatabaseReference */) => {
1753-
error ? reject(error.getMessage()) : resolve();
1754-
}
1753+
const onSuccessListener = new com.google.android.gms.tasks.OnSuccessListener({
1754+
onSuccess: () => resolve()
1755+
});
1756+
1757+
const onFailureListener = new com.google.android.gms.tasks.OnFailureListener({
1758+
onFailure: exception => reject(exception.getMessage())
17551759
});
17561760

17571761
if (typeof val === "object") {
1758-
firebase.instance.child(path).updateChildren(firebase.toHashMap(val), onCompletionListener);
1762+
firebase.instance.child(path).updateChildren(firebase.toHashMap(val))
1763+
.addOnSuccessListener(onSuccessListener)
1764+
.addOnFailureListener(onFailureListener);
17591765
} else {
17601766
const lastPartOfPath = path.lastIndexOf("/");
17611767
const pathPrefix = path.substring(0, lastPartOfPath);
17621768
const pathSuffix = path.substring(lastPartOfPath + 1);
17631769
const updateObject = '{"' + pathSuffix + '" : "' + val + '"}';
1764-
firebase.instance.child(pathPrefix).updateChildren(firebase.toHashMap(JSON.parse(updateObject)), onCompletionListener);
1770+
firebase.instance.child(pathPrefix).updateChildren(firebase.toHashMap(JSON.parse(updateObject)))
1771+
.addOnSuccessListener(onSuccessListener)
1772+
.addOnFailureListener(onFailureListener);
17651773
}
17661774
} catch (ex) {
17671775
console.log("Error in firebase.update: " + ex);
@@ -1894,13 +1902,13 @@ firebase.remove = path => {
18941902
return;
18951903
}
18961904

1897-
const onCompletionListener = new com.google.firebase.database.DatabaseReference.CompletionListener({
1898-
onComplete: (error: any /* com.google.firebase.database.DatabaseError */, dbRef: any /* com.google.firebase.database.DatabaseReference */) => {
1899-
error ? reject(error.getMessage()) : resolve();
1900-
}
1901-
});
1902-
1903-
firebase.instance.child(path).setValue(null, onCompletionListener);
1905+
firebase.instance.child(path).setValue(null)
1906+
.addOnSuccessListener(new com.google.android.gms.tasks.OnSuccessListener({
1907+
onSuccess: () => resolve()
1908+
}))
1909+
.addOnFailureListener(new com.google.android.gms.tasks.OnFailureListener({
1910+
onFailure: exception => reject(exception.getMessage())
1911+
}));
19041912
} catch (ex) {
19051913
console.log("Error in firebase.remove: " + ex);
19061914
reject(ex);

0 commit comments

Comments
 (0)