Merge remote-tracking branch 'origin/master' into android-configure-via-json

BlooJeans · BlooJeans · commit bb57110971ec · 2016-10-14T11:29:49.000-04:00
diff --git a/ios/Firestack.xcodeproj/project.pbxproj b/ios/Firestack.xcodeproj/project.pbxproj
@@ -244,6 +244,7 @@
 		58B511F01A9E6C8500147676 /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = YES;
 				DEFINES_MODULE = NO;
 				EMBEDDED_CONTENT_CONTAINS_SWIFT = NO;
 				ENABLE_BITCODE = YES;
@@ -272,6 +273,7 @@
 		58B511F11A9E6C8500147676 /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = YES;
 				DEFINES_MODULE = NO;
 				EMBEDDED_CONTENT_CONTAINS_SWIFT = NO;
 				ENABLE_BITCODE = YES;
diff --git a/ios/Firestack/Firestack.m b/ios/Firestack/Firestack.m
@@ -7,7 +7,7 @@
 #import "Firestack.h"
 #import "FirestackErrors.h"
 #import "FirestackEvents.h"
-#import "FirestackAnalytics.h"
+// #import "FirestackAnalytics.h"
 // #import "FirestackCloudMessaging.h"
 
 static Firestack *_sharedInstance = nil;
diff --git a/ios/Firestack/FirestackAnalytics.h b/ios/Firestack/FirestackAnalytics.h
@@ -9,7 +9,6 @@
 #ifndef FirestackAnalytics_h
 #define FirestackAnalytics_h
 
-#import "FirebaseAnalytics.h"
 #import "RCTBridgeModule.h"
 
 @interface FirestackAnalytics : NSObject <RCTBridgeModule> {
diff --git a/ios/Firestack/FirestackAnalytics.m b/ios/Firestack/FirestackAnalytics.m
@@ -10,6 +10,8 @@
 #import "FirestackEvents.h"
 #import "FirestackAnalytics.h"
 
+@import FirebaseAnalytics;
+
 @implementation FirestackAnalytics
 
 - (void)dealloc
diff --git a/ios/Firestack/FirestackCloudMessaging.h b/ios/Firestack/FirestackCloudMessaging.h
@@ -10,7 +10,6 @@
 #define FirestackCloudMessaging_h
 
 #import "Firebase.h"
-#import "FirebaseMessaging.h"
 #import "RCTEventEmitter.h"
 #import "RCTBridgeModule.h"
 #import "RCTUtils.h"
diff --git a/ios/Firestack/FirestackCloudMessaging.m b/ios/Firestack/FirestackCloudMessaging.m
@@ -14,7 +14,6 @@
 #import "FirestackCloudMessaging.h"
 #import "FirestackEvents.h"
 #import "RCTConvert.h"
-#import "FirestackCloudMessaging.h"
 
 // https://github.com/facebook/react-native/blob/master/Libraries/PushNotificationIOS/RCTPushNotificationManager.m
 @implementation RCTConvert (UILocalNotification)
diff --git a/ios/Firestack/FirestackDatabase.h b/ios/Firestack/FirestackDatabase.h
@@ -10,7 +10,6 @@
 #define FirestackDatabase_h
 
 #import "Firebase.h"
-#import "FirebaseDatabase.h"
 #import "RCTEventEmitter.h"
 #import "RCTBridgeModule.h"
 
diff --git a/ios/Firestack/FirestackDatabase.m b/ios/Firestack/FirestackDatabase.m
@@ -358,7 +358,8 @@ @implementation FirestackDatabase
             NSDictionary *props =
             [self snapshotToDict:snapshot];
             [self
-             sendJSEvent:eventName
+             sendJSEvent:DATABASE_DATA_EVENT
+             title:eventName
              props: @{
                       @"eventName": eventName,
                       @"path": path,
@@ -676,6 +677,7 @@ - (NSDictionary *) getAndSendDatabaseError:(NSError *) error
                           };
     [self
      sendJSEvent:DATABASE_ERROR_EVENT
+     title:DATABASE_ERROR_EVENT
      props: evt];
     
     return evt;
@@ -686,11 +688,12 @@ - (NSDictionary *) getAndSendDatabaseError:(NSError *) error
     return @[DATABASE_DATA_EVENT, DATABASE_ERROR_EVENT];
 }
 
-- (void) sendJSEvent:(NSString *)title
+- (void) sendJSEvent:(NSString *)type
+               title:(NSString *)title
                props:(NSDictionary *)props
 {
     @try {
-        [self sendEventWithName:DATABASE_DATA_EVENT
+        [self sendEventWithName:type
                            body:@{
                             @"eventName": title,
                             @"body": props
diff --git a/ios/Firestack/FirestackErrors.h b/ios/Firestack/FirestackErrors.h
@@ -11,7 +11,6 @@
 
 #import "RCTBridgeModule.h"
 #import "Firebase.h"
-#import "FirebaseAuth.h"
 
 @interface FirestackErrors : NSObject <RCTBridgeModule> {
     
diff --git a/ios/Firestack/FirestackStorage.h b/ios/Firestack/FirestackStorage.h
@@ -10,7 +10,6 @@
 #define FirestackStorage_h
 
 #import "Firebase.h"
-#import "FirebaseStorage.h"
 #import "RCTBridgeModule.h"
 #import "RCTEventEmitter.h"
 
diff --git a/ios/Firestack/FirestackStorage.m b/ios/Firestack/FirestackStorage.m
@@ -9,6 +9,8 @@
 #import "FirestackStorage.h"
 #import "FirestackEvents.h"
 
+#import <Photos/Photos.h>
+
 @implementation FirestackStorage
 
 RCT_EXPORT_MODULE(FirestackStorage);
@@ -51,15 +53,45 @@ @implementation FirestackStorage
         return callback(@[err]);
     }
     
+    if ([path hasPrefix:@"assets-library://"]) {
+        NSURL *localFile = [[NSURL alloc] initWithString:path];
+        PHFetchResult* assets = [PHAsset fetchAssetsWithALAssetURLs:@[localFile] options:nil];
+        PHAsset *asset = [assets firstObject];
+        [asset requestContentEditingInputWithOptions:nil
+                                   completionHandler:^(PHContentEditingInput *contentEditingInput, NSDictionary *info) {
+                                       NSURL *imageFile = contentEditingInput.fullSizeImageURL;
+                                       
+                                       [self performUpload:urlStr
+                                                      name:name
+                                                      file:imageFile
+                                                  metadata:nil
+                                                  callback:callback];
+                                   }];
+    } else {
+        NSURL *localFile = [NSURL fileURLWithPath:path];
+        FIRStorageMetadata *firmetadata = [[FIRStorageMetadata alloc] initWithDictionary:metadata];
+        
+        [self performUpload:urlStr
+                       name:name
+                       file:localFile
+                   metadata:firmetadata
+                   callback:callback];
+    }
+    
+}
+
+- (void) performUpload:(NSString *) urlStr
+                  name:(NSString *) name
+                  file:(NSURL *) imageFile
+              metadata:(FIRStorageMetadata *) firmetadata
+              callback:(RCTResponseSenderBlock) callback
+{
     FIRStorageReference *storageRef = [[FIRStorage storage] referenceForURL:urlStr];
     FIRStorageReference *uploadRef = [storageRef child:name];
     
-    NSURL *localFile = [NSURL fileURLWithPath:path];
-    
-    FIRStorageMetadata *firmetadata = [[FIRStorageMetadata alloc] initWithDictionary:metadata];
-    
-    FIRStorageUploadTask *uploadTask = [uploadRef putFile:localFile
+    FIRStorageUploadTask *uploadTask = [uploadRef putFile:imageFile
                                                  metadata:firmetadata];
+    
     // Listen for state changes, errors, and completion of the upload.
     [uploadTask observeStatus:FIRStorageTaskStatusResume handler:^(FIRStorageTaskSnapshot *snapshot) {
         // Upload resumed, also fires when the upload starts
