Restructuring FBReactKit project: Part 1

nicklockwood · nicklockwood · commit 648c2b48c2ec · 2015-06-25T02:14:33.000-08:00
diff --git a/Libraries/AdSupport/RCTAdSupport.h b/Libraries/AdSupport/RCTAdSupport.h
@@ -7,8 +7,6 @@
  * of patent rights can be found in the PATENTS file in the same directory.
  */
 
-#import <AdSupport/ASIdentifierManager.h>
-
 #import "RCTBridgeModule.h"
 
 @interface RCTAdSupport : NSObject <RCTBridgeModule>
diff --git a/Libraries/AdSupport/RCTAdSupport.m b/Libraries/AdSupport/RCTAdSupport.m
@@ -7,6 +7,8 @@
  * of patent rights can be found in the PATENTS file in the same directory.
  */
 
+#import <AdSupport/ASIdentifierManager.h>
+
 #import "RCTAdSupport.h"
 
 @implementation RCTAdSupport
diff --git a/Libraries/Network/RCTNetworking.m b/Libraries/Network/RCTNetworking.m
@@ -285,7 +285,7 @@ - (void)buildRequest:(NSDictionary *)query
   }];
   id<RCTURLRequestHandler> handler = [handlers lastObject];
   if (!handler) {
-    RCTLogError(@"No suitable request handler found for %@", request);
+    RCTLogError(@"No suitable request handler found for %@", request.URL);
   }
   return handler;
 }
@@ -322,6 +322,9 @@ - (void)processDataForHTTPQuery:(NSDictionary *)query callback:(void (^)(NSError
   NSURLRequest *request = [RCTConvert NSURLRequest:query[@"uri"]];
   if (request) {
     id<RCTURLRequestHandler> handler = [self handlerForRequest:request];
+    if (!handler) {
+      return;
+    }
     (void)[[RCTDataLoader alloc] initWithRequest:request handler:handler callback:^(NSData *data, NSString *MIMEType, NSError *error) {
       if (data) {
         callback(nil, @{@"body": data, @"contentType": MIMEType});
