Merge branch '0.36-stable' of github.com:facebook/react-native into 0…

….36-stable

Libraries/Image/RCTImageLoader.m

@@ -444,7 +444,9 @@ - (RCTImageLoaderCancellationBlock)_loadURLRequest:(NSURLRequest *)request
 
   // Download image
   __weak __typeof(self) weakSelf = self;
-  RCTNetworkTask *task = [networking networkTaskWithRequest:request completionBlock:^(NSURLResponse *response, NSData *data, NSError *error) {
+  __block RCTNetworkTask *task =
+  [networking networkTaskWithRequest:request
+                     completionBlock:^(NSURLResponse *response, NSData *data, NSError *error) {
     __typeof(self) strongSelf = weakSelf;
     if (!strongSelf) {
       return;
@@ -488,8 +490,15 @@ - (RCTImageLoaderCancellationBlock)_loadURLRequest:(NSURLRequest *)request
   }
 
   return ^{
-    [task cancel];
-    [weakSelf dequeueTasks];
+    __typeof(self) strongSelf = weakSelf;
+    if (!strongSelf || !task) {
+      return;
+    }
+    dispatch_async(strongSelf->_URLRequestQueue, ^{
+      [task cancel];
+      task = nil;
+    });
+    [strongSelf dequeueTasks];
   };
 }
 
@@ -505,7 +514,7 @@ - (RCTImageLoaderCancellationBlock)loadImageWithURLRequest:(NSURLRequest *)image
   __block volatile uint32_t cancelled = 0;
   __block dispatch_block_t cancelLoad = nil;
   dispatch_block_t cancellationBlock = ^{
-    if (cancelLoad) {
+    if (cancelLoad && !cancelled) {
       cancelLoad();
     }
     OSAtomicOr32Barrier(1, &cancelled);

Libraries/Network/RCTNetworkTask.m

@@ -53,6 +53,7 @@ - (void)invalidate
   _incrementalDataBlock = nil;
   _responseBlock = nil;
   _uploadProgressBlock = nil;
+  _requestToken = nil;
 }
 
 - (void)dispatchCallback:(dispatch_block_t)callback
@@ -66,6 +67,11 @@ - (void)dispatchCallback:(dispatch_block_t)callback
 
 - (void)start
 {
+  if (_status != RCTNetworkTaskPending) {
+    RCTLogError(@"RCTNetworkTask was already started or completed");
+    return;
+  }
+
   if (_requestToken == nil) {
     id token = [_handler sendRequest:_request withDelegate:self];
     if ([self validateRequestToken:token]) {
@@ -77,6 +83,10 @@ - (void)start
 
 - (void)cancel
 {
+  if (_status == RCTNetworkTaskFinished) {
+    return;
+  }
+
   _status = RCTNetworkTaskFinished;
   id token = _requestToken;
   if (token && [_handler respondsToSelector:@selector(cancelRequest:)]) {

React.podspec

@@ -4,7 +4,7 @@ package = JSON.parse(File.read(File.join(__dir__, 'package.json')))
 
 Pod::Spec.new do |s|
   s.name                = "React"
-  s.version             = "0.36.0-rc.0"
+  s.version             = "0.36.0-rc.1"
   s.summary             = package['description']
   s.description         = <<-DESC
                             React Native apps are built using the React JS

ReactAndroid/gradle.properties

@@ -1,4 +1,4 @@
-VERSION_NAME=0.36.0-rc.0
+VERSION_NAME=0.36.0-rc.1
 GROUP=com.facebook.react
 
 POM_NAME=ReactNative

docs/HeadlessJSAndroid.md

@@ -0,0 +1,59 @@
+---
+id: headless-js-android
+title: Headless JS
+layout: docs
+category: Guides (Android)
+permalink: docs/headless-js-android.html
+next: running-on-device-android
+previous: native-components-android
+---
+
+Headless JS is a way to run tasks in JavaScript while your app is in the background. It can be used, for example, to sync fresh data, handle push notifications, or play music.
+
+## The JS API
+
+A task is a simple async function that you register on `AppRegistry`, similar to registering React applications:
+
+```js
+AppRegistry.registerHeadlessTask('SomeTaskName', () => require('SomeTaskName'));
+```
+
+Then, in `SomeTaskName.js`:
+
+```js
+module.exports = async (taskData) => {
+  // do stuff
+}
+```
+
+You can do anything in your task as long as it doesn't touch UI: network requests, timers and so on. Once your task completes (i.e. the promise is resolved), React Native will go into "paused" mode (unless there are other tasks running, or there is a foreground app).
+
+## The Java API
+
+Yes, this does still require some native code, but it's pretty thin. You need to extend `HeadlessJsTaskService` and override `getTaskConfig`, e.g.:
+
+```java
+public class MyTaskService extends FbHeadlessJsTaskService {
+
+  @Override
+  protected @Nullable HeadlessJsTaskConfig getTaskConfig(Intent intent) {
+    Bundle extras = intent.getExtras();
+    if (extras != null) {
+      return new HeadlessJsTaskConfig(
+          "SomeTaskName",
+          Arguments.fromBundle(extras),
+          5000);
+    }
+    return null;
+  }
+}
+```
+
+Now, whenever you [start your service][0], e.g. as a periodic task or in response to some system event / broadcast, JS will spin up, run your task, then spin down.
+
+## Caveats
+
+* By default, your app will crash if you try to run a task while the app is in the foreground. This is to prevent developers from shooting themselves in the foot by doing a lot of work in a task and slowing the UI. There is a way around this.
+* If you start your service from a `BroadcastReceiver`, make sure to call `HeadlessJsTaskService.acquireWakelockNow()` before returning from `onReceive()`.
+
+[0]: https://developer.android.com/reference/android/content/Context.html#startService(android.content.Intent)

docs/NativeComponentsAndroid.md

@@ -4,7 +4,7 @@ title: Native UI Components
 layout: docs
 category: Guides (Android)
 permalink: docs/native-components-android.html
-next: running-on-device-android
+next: headless-js-android
 previous: native-modules-android
 ---
 

docs/RunningOnDeviceAndroid.md

@@ -5,7 +5,7 @@ layout: docs
 category: Guides (Android)
 permalink: docs/running-on-device-android.html
 next: signed-apk-android
-props: native-components-android
+previous: headless-js-android
 ---
 
 ## Prerequisite: USB Debugging

package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native",
-  "version": "0.36.0-rc.0",
+  "version": "0.36.0-rc.1",
   "description": "A framework for building native apps using React",
   "license": "BSD-3-Clause",
   "repository": {