From bca825ee50d6ca343ce704086dff5841312a7f8b Mon Sep 17 00:00:00 2001
From: Jiajie Zhu <zhujj04@fb.com>
Date: Fri, 28 Jul 2017 09:30:40 -0700
Subject: [PATCH] deprecate some usage of NetInfo

Reviewed By: wwjholmes

Differential Revision: D5493891

fbshipit-source-id: f86f034294f3fd07a535d2856ca6c7d4e2eb7824
---
 Libraries/Network/NetInfo.js | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/Libraries/Network/NetInfo.js b/Libraries/Network/NetInfo.js
index 92f0a1fde..864929e09 100644
--- a/Libraries/Network/NetInfo.js
+++ b/Libraries/Network/NetInfo.js
@@ -59,21 +59,25 @@ type ConnectivityStateAndroid = $Enum<{
 
 const _subscriptions = new Map();
 
-let _isConnected;
+let _isConnectedDeprecated;
 if (Platform.OS === 'ios') {
-  _isConnected = function(
+  _isConnectedDeprecated = function(
     reachability: ReachabilityStateIOS,
   ): bool {
     return reachability !== 'none' && reachability !== 'unknown';
   };
 } else if (Platform.OS === 'android') {
-  _isConnected = function(
+  _isConnectedDeprecated = function(
       connectionType: ConnectivityStateAndroid,
     ): bool {
     return connectionType !== 'NONE' && connectionType !== 'UNKNOWN';
   };
 }
 
+function _isConnected(connection) {
+  return connection.type !== 'none' && connection.type !== 'unknown';
+}
+
 const _isConnectedSubscriptions = new Map();
 
 /**
@@ -290,7 +294,11 @@ const NetInfo = {
       handler: Function
     ): {remove: () => void} {
       const listener = (connection) => {
-        handler(_isConnected(connection));
+        if (eventName === 'change') {
+          handler(_isConnectedDeprecated(connection));
+        } else if (eventName === 'connectionChange') {
+          handler(_isConnected(connection));
+        }
       };
       _isConnectedSubscriptions.set(handler, listener);
       NetInfo.addEventListener(
@@ -318,9 +326,7 @@ const NetInfo = {
     },
 
     fetch(): Promise<any> {
-      return NetInfo.fetch().then(
-        (connection) => _isConnected(connection)
-      );
+      return NetInfo.getConnectionInfo().then(_isConnected);
     },
   },