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

Merge branch 'master' of https://github.com/invertase/react-native-firebase

This commit is contained in:
Chris Bianca 2017-11-23 17:30:12 +00:00
parent ff95c21b9d a95c91e453
commit d9b033f6c7
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
android/src/main/java/io/invertase/firebase/messaging/RNFirebaseMessaging.java
View File

@ -104,7 +104,13 @@ public class RNFirebaseMessaging extends ReactContextBaseJavaModule implements L
@ReactMethod
public void cancelAllLocalNotifications() {
mRNFirebaseLocalMessagingHelper.cancelAllLocalNotifications();
try {
mRNFirebaseLocalMessagingHelper.cancelAllLocalNotifications();
} catch (SecurityException e) {
// In some devices/situations cancelAllLocalNotifications will throw a SecurityException
// We can safely ignore this error for now as the UX impact of this not working is minor.
Log.w(TAG, e.getMessage());
}
}
@ReactMethod

7
lib/modules/database/reference.js
View File

@ -204,8 +204,11 @@ export default class Reference extends ReferenceBase {
return new Promise((resolve, reject) => {
const onCompleteWrapper = (error, committed, snapshotData) => {
if (isFunction(onComplete)) {
if (error) return onComplete(error, committed, null);
return onComplete(null, committed, new Snapshot(this, snapshotData));
if (error) {
onComplete(error, committed, null);
} else {
onComplete(null, committed, new Snapshot(this, snapshotData));
}
}
if (error) return reject(error);