commit cd376e74fc80946b21765c0d9b212aaeb57918d2
author Jeff Thompson <jeff@thefirst.org> Sun Mar 17 21:34:36 2013 -0700
committer Jeff Thompson <jeff@thefirst.org> Sun Mar 17 21:34:36 2013 -0700
tree 51a470baeb23c6b7e6a26a3955de9a3b69bd9f80
parent edaccfb50f808a102d684c20fc933011160ed270

Added Android menu to show the connected hub.

ndnProtocol/modules/NdnProtocolInfo.jsm

diff --git a/ndnProtocol/modules/NdnProtocolInfo.jsm b/ndnProtocol/modules/NdnProtocolInfo.jsm
index b47948f..2a0b384 100644
--- a/ndnProtocol/modules/NdnProtocolInfo.jsm
+++ b/ndnProtocol/modules/NdnProtocolInfo.jsm
@@ -157,9 +157,12 @@
     return;
 
   // Add to Firefox for Android menu.
-  ndnGetVersionMenuId = window.NativeWindow.menu.add("NDN Get Version...", null, function() {
+  window.NativeWindow.menu.add("NDN Get Version...", null, function() {
     ndnGetVersionClick(window);
   });
+  window.NativeWindow.menu.add("NDN Hub...", null, function() {
+    ndnHubClick(window);
+  });
 }
  
 function ndnGetVersionClick(window) {
@@ -195,6 +198,21 @@
   window.NativeWindow.doorhanger.show("NDN Get Version", "ndn-get-version", buttons, 
      window.BrowserApp.selectedTab.id, { persistence: 1 });
 }
+ 
+function ndnHubClick(window) {
+  var alertFunction = function(message) { window.NativeWindow.toast.show(message, "short"); };
+  
+  var buttons = [
+    {
+      label: "OK",
+      callback: function () {
+      }
+    }
+  ];
+ 
+  window.NativeWindow.doorhanger.show(androidHubMessage, "ndn-hub", buttons, 
+     window.BrowserApp.selectedTab.id, { persistence: 1 });
+}
 
 var windowListener = {
   onOpenWindow: function(aWindow) {
@@ -224,6 +242,15 @@
   wm.addListener(windowListener);
 }
 
-// startup() will only succeed on Android.
+var androidHubMessage = "Hub: not connected";
+
+function androidOnNdnHubChanged(host, port) {
+  androidHubMessage = "Hub: " + host + ":" + port;
+}
+
 // Do this here instead of using bootstrap.js since we don't want to set bootstrap true in install.rdf.
-try { androidStartup(); } catch (ex) {}
+try { 
+  // startup() will only succeed on Android.
+  androidStartup(); 
+  NdnProtocolInfo.addNdnHubChangedListener(androidOnNdnHubChanged);
+} catch (ex) {}