From aac8d9a91710ca2bbdfac47704238f00aa2f9c04 Mon Sep 17 00:00:00 2001
From: "Carsten \"Tomcat\" Book" <cbook@mozilla.com>
Date: Wed, 28 May 2014 10:26:49 +0200
Subject: [PATCH] Backed out changeset 8473f191f232 (bug 1014594) for gaia ui
 test failures on a CLOSED TREE

---
 dom/apps/src/InterAppCommService.jsm | 113 ++++++++-------------------
 1 file changed, 32 insertions(+), 81 deletions(-)

diff --git a/dom/apps/src/InterAppCommService.jsm b/dom/apps/src/InterAppCommService.jsm
index 9aa722d49d15..c460f7e80c25 100644
--- a/dom/apps/src/InterAppCommService.jsm
+++ b/dom/apps/src/InterAppCommService.jsm
@@ -465,67 +465,6 @@ this.InterAppCommService = {
                                oid: aOuterWindowID, requestID: aRequestID });
   },
 
-  /**
-   * Fetch the subscribers that are currently allowed to connect.
-   *
-   * @param aKeyword           The connection's keyword.
-   * @param aPubAppManifestURL The manifest URL of the publisher.
-   *
-   * @param return an array of manifest URLs of the subscribers.
-   */
-  _getAllowedSubAppManifestURLs: function(aKeyword, aPubAppManifestURL) {
-    let allowedPubAppManifestURLs = this._allowedConnections[aKeyword];
-    if (!allowedPubAppManifestURLs) {
-      return [];
-    }
-
-    let allowedSubAppManifestURLs =
-      allowedPubAppManifestURLs[aPubAppManifestURL];
-    if (!allowedSubAppManifestURLs) {
-      return [];
-    }
-
-    return allowedSubAppManifestURLs;
-  },
-
-  /**
-   * Add the newly selected apps into the allowed connections and return the
-   * aggregated allowed connections.
-   *
-   * @param aKeyword           The connection's keyword.
-   * @param aPubAppManifestURL The manifest URL of the publisher.
-   * @param aSelectedApps      An array of the subscribers' information.
-   *
-   * @param return an array of manifest URLs of the subscribers.
-   */
-  _addSelectedApps: function(aKeyword, aPubAppManifestURL, aSelectedApps) {
-    let allowedPubAppManifestURLs = this._allowedConnections[aKeyword];
-
-    // Add a new entry for |aKeyword|.
-    if (!allowedPubAppManifestURLs) {
-      allowedPubAppManifestURLs = this._allowedConnections[aKeyword] = {};
-    }
-
-    let allowedSubAppManifestURLs =
-      allowedPubAppManifestURLs[aPubAppManifestURL];
-
-    // Add a new entry for |aPubAppManifestURL|.
-    if (!allowedSubAppManifestURLs) {
-      allowedSubAppManifestURLs =
-        allowedPubAppManifestURLs[aPubAppManifestURL] = [];
-    }
-
-    // Add the selected apps into the existing set of allowed connections.
-    aSelectedApps.forEach(function(aSelectedApp) {
-      let allowedSubAppManifestURL = aSelectedApp.manifestURL;
-      if (allowedSubAppManifestURLs.indexOf(allowedSubAppManifestURL) == -1) {
-        allowedSubAppManifestURLs.push(allowedSubAppManifestURL);
-      }
-    });
-
-    return allowedSubAppManifestURLs;
-  },
-
   _connect: function(aMessage, aTarget) {
     let keyword = aMessage.keyword;
     let pubRules = aMessage.rules;
@@ -543,11 +482,15 @@ this.InterAppCommService = {
       return;
     }
 
-    // Fetch the apps that are currently allowed to connect, so that users
-    // don't need to select/allow them again, which means we only pop up the
-    // prompt UI for the *new* connections.
-    let allowedSubAppManifestURLs =
-      this._getAllowedSubAppManifestURLs(keyword, pubAppManifestURL);
+    // Fetch the apps that used to be allowed to connect before, so that
+    // users don't need to select/allow them again. That is, we only pop up
+    // the prompt UI for the *new* connections.
+    let allowedSubAppManifestURLs = [];
+    let allowedPubAppManifestURLs = this._allowedConnections[keyword];
+    if (allowedPubAppManifestURLs &&
+        allowedPubAppManifestURLs[pubAppManifestURL]) {
+      allowedSubAppManifestURLs = allowedPubAppManifestURLs[pubAppManifestURL];
+    }
 
     // Check rules to see if a subscribed app is allowed to connect.
     let appsToSelect = [];
@@ -856,27 +799,35 @@ this.InterAppCommService = {
     let requestID = caller.requestID;
     let target = caller.target;
 
-    let pubAppManifestURL = aData.manifestURL;
+    let manifestURL = aData.manifestURL;
     let keyword = aData.keyword;
     let selectedApps = aData.selectedApps;
 
-    let allowedSubAppManifestURLs;
     if (selectedApps.length == 0) {
-      // Only do the connections for the existing allowed subscribers because
-      // no new apps are selected to connect.
-      if (DEBUG) debug("No new apps are selected to connect.")
-
-      allowedSubAppManifestURLs =
-        this._getAllowedSubAppManifestURLs(keyword, pubAppManifestURL);
-    } else {
-      // Do connections for for the existing allowed subscribers and the newly
-      // selected subscribers.
-      if (DEBUG) debug("Some new apps are selected to connect.")
-
-      allowedSubAppManifestURLs =
-        this._addSelectedApps(keyword, pubAppManifestURL, selectedApps);
+      if (DEBUG) debug("No apps are selected to connect.")
+      this._dispatchMessagePorts(keyword, manifestURL, [],
+                                 target, outerWindowID, requestID);
+      return;
     }
 
+    // Find the entry of allowed connections to add the selected apps.
+    let allowedPubAppManifestURLs = this._allowedConnections[keyword];
+    if (!allowedPubAppManifestURLs) {
+      allowedPubAppManifestURLs = this._allowedConnections[keyword] = {};
+    }
+    let allowedSubAppManifestURLs = allowedPubAppManifestURLs[manifestURL];
+    if (!allowedSubAppManifestURLs) {
+      allowedSubAppManifestURLs = allowedPubAppManifestURLs[manifestURL] = [];
+    }
+
+    // Add the selected app into the existing set of allowed connections.
+    selectedApps.forEach(function(aSelectedApp) {
+      let allowedSubAppManifestURL = aSelectedApp.manifestURL;
+      if (allowedSubAppManifestURLs.indexOf(allowedSubAppManifestURL) == -1) {
+        allowedSubAppManifestURLs.push(allowedSubAppManifestURL);
+      }
+    });
+
     // Finally, dispatch the message ports for the allowed connections,
     // including the old connections and the newly selected connection.
     this._dispatchMessagePorts(keyword, manifestURL, allowedSubAppManifestURLs,