Backed out changeset 13a4ea1d64ce

astreet · Facebook Github Bot 1 · commit ede99eeaddea · 2016-03-29T03:42:18.000-07:00
Reviewed By: ericvicenti

Differential Revision: D3093064

fb-gh-sync-id: c9b68c8c5ab8ddaf77570d2cf8024e36925e5e76
fbshipit-source-id: c9b68c8c5ab8ddaf77570d2cf8024e36925e5e76
diff --git a/Examples/UIExplorer/BackAndroidExample.js b/Examples/UIExplorer/BackAndroidExample.js
diff --git a/Examples/UIExplorer/UIExplorerList.android.js b/Examples/UIExplorer/UIExplorerList.android.js
@@ -102,10 +102,6 @@ const APIExamples = [
     key: 'AppStateExample',
     module: require('./AppStateExample'),
   },
-  {
-    key: 'BackAndroidExample',
-    module: require('./BackAndroidExample'),
-  },
   {
     key: 'BorderExample',
     module: require('./BorderExample'),
diff --git a/Libraries/Utilities/BackAndroid.android.js b/Libraries/Utilities/BackAndroid.android.js
@@ -20,19 +20,17 @@ type BackPressEventName = $Enum<{
   backPress: string;
 }>;
 
-var _backPressSubscriptions = [];
+var _backPressSubscriptions = new Set();
 
 RCTDeviceEventEmitter.addListener(DEVICE_BACK_EVENT, function() {
-  var propagate = true;
-  for (var i = _backPressSubscriptions.length - 1; i >= 0; i--) {
-    var subscription = _backPressSubscriptions[i];
+  var backPressSubscriptions = new Set(_backPressSubscriptions);
+  var invokeDefault = true;
+  backPressSubscriptions.forEach((subscription) => {
     if (subscription()) {
-      propagate = false;
-      break;
+      invokeDefault = false;
     }
-  }
-
-  if (propagate) {
+  });
+  if (invokeDefault) {
     BackAndroid.exitApp();
   }
 });
@@ -62,18 +60,18 @@ var BackAndroid = {
   addEventListener: function (
     eventName: BackPressEventName,
     handler: Function
-  ): void {
-    _backPressSubscriptions.push(handler);
+  ): {remove: () => void} {
+    _backPressSubscriptions.add(handler);
+    return {
+      remove: () => BackAndroid.removeEventListener(eventName, handler),
+    };
   },
 
   removeEventListener: function(
     eventName: BackPressEventName,
     handler: Function
   ): void {
-    var index = _backPressSubscriptions.indexOf(handler);
-    if (index !== -1) {
-      _backPressSubscriptions.splice(index, 1);
-    }
+    _backPressSubscriptions.delete(handler);
   },
 
 };
