From 5120bc8b46f86c5d949c1ce7754008156daf9b01 Mon Sep 17 00:00:00 2001 From: Chris Bianca Date: Mon, 22 May 2017 15:25:35 +0100 Subject: [PATCH 1/3] [ios][storage] Better support uploading files with a file:// prefix --- ios/RNFirebase/RNFirebaseStorage.m | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ios/RNFirebase/RNFirebaseStorage.m b/ios/RNFirebase/RNFirebaseStorage.m index 3a66d396..8765d9ce 100644 --- a/ios/RNFirebase/RNFirebaseStorage.m +++ b/ios/RNFirebase/RNFirebaseStorage.m @@ -302,8 +302,8 @@ RCT_EXPORT_METHOD(putFile:(NSString *) path localPath:(NSString *)localPath meta }]; } } else { - NSURL *fileUrl = [NSURL fileURLWithPath:localPath]; - [self uploadFile:fileUrl metadata:metadata path:path resolver:resolve rejecter:reject]; + NSData *data = [[NSFileManager defaultManager] contentsAtPath:localPath]; + [self uploadData:data metadata:metadata path:path resolver:resolve rejecter:reject]; } } From 0eb14edfd8e1424c0d29f8a81843f8b1f40a96dc Mon Sep 17 00:00:00 2001 From: Felix Clack Date: Tue, 23 May 2017 16:15:45 +1000 Subject: [PATCH 2/3] Bump the Firebase version There are more recent versions of the Firebase SDKs available, so this provides a simple version bump. To make this easier in future, I extracted the number to a variable. --- android/build.gradle | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/android/build.gradle b/android/build.gradle index 460a890b..b43e5c82 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -2,6 +2,8 @@ // YES, jcenter is required twice - it somehow tricks studio into compiling deps below // doesn't break anything anywhere else and projects using this lib work as normal buildscript { + ext.firebaseVersion = '10.2.6' + repositories { jcenter() } @@ -46,13 +48,13 @@ dependencies { compile fileTree(include: ['*.jar'], dir: 'libs') compile 'com.facebook.react:react-native:+' compile 'me.leolin:ShortcutBadger:1.1.10@aar' - compile 'com.google.android.gms:play-services-base:10.2.0' - compile 'com.google.firebase:firebase-core:10.2.0' - compile 'com.google.firebase:firebase-config:10.2.0' - compile 'com.google.firebase:firebase-auth:10.2.0' - compile 'com.google.firebase:firebase-analytics:10.2.0' - compile 'com.google.firebase:firebase-database:10.2.0' - compile 'com.google.firebase:firebase-storage:10.2.0' - compile 'com.google.firebase:firebase-messaging:10.2.0' - compile 'com.google.firebase:firebase-crash:10.2.0' + compile "com.google.android.gms:play-services-base:$firebaseVersion" + compile "com.google.firebase:firebase-core:$firebaseVersion" + compile "com.google.firebase:firebase-config:$firebaseVersion" + compile "com.google.firebase:firebase-auth:$firebaseVersion" + compile "com.google.firebase:firebase-analytics:$firebaseVersion" + compile "com.google.firebase:firebase-database:$firebaseVersion" + compile "com.google.firebase:firebase-storage:$firebaseVersion" + compile "com.google.firebase:firebase-messaging:$firebaseVersion" + compile "com.google.firebase:firebase-crash:$firebaseVersion" } From cd93bbb3102b2c9515b8c5f1fbb8f90fda1ff5e4 Mon Sep 17 00:00:00 2001 From: chrisbianca Date: Tue, 23 May 2017 10:30:06 +0100 Subject: [PATCH 3/3] [docs] Add information about Google Play Services --- docs/usage.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docs/usage.md b/docs/usage.md index 117ad9d7..0723f177 100644 --- a/docs/usage.md +++ b/docs/usage.md @@ -20,6 +20,8 @@ const firebase = RNFirebase.initializeApp({ |----------------|----------|-------------------------|----------------------------------------| | debug | bool | false | When set to true, RNFirebase will log messages to the console and fire `debug` events we can listen to in `js` | | persistence | bool | false | When set to true, database persistence will be enabled. | +| errorOnMissingPlayServices | bool | true | (Android only) When set to true, will throw an error if Google Play Services isn't installed. | +| promptOnMissingPlayServices | bool | true | (Android only) When set to true, will prompt the user to install Google Play Services if it isn't installed. This takes precedence over `errorOnMissingPlayServices`.| For instance: