Merge branch 'dev' into release-candidate

Author: jpevarnek

Gruntfile.coffee

@@ -108,6 +108,7 @@ taskManager.add 'integration_test', [
 taskManager.add 'everything', [
   'build'
   'test'
+  'integration_test'
 ]
 
 # This is the target run by Travis. Targets in here should run locally
@@ -359,6 +360,8 @@ module.exports = (grunt) ->
               'scripts/background.static.js'
               '!**/*spec*'
 
+              'generic_ui/style/*.css'
+
               # extra components we use
               'generic_ui/fonts/*'
               'generic_ui/icons/*'
@@ -442,6 +445,8 @@ module.exports = (grunt) ->
               '!data/generic_ui/polymer/vulcanized*inline.html'
               '!data/generic_ui/polymer/vulcanized.js' # vulcanized.html uses vulcanized.static.js
 
+              'data/generic_ui/style/*.css'
+
               'data/fonts/*'
               'data/icons/*'
               'data/generic_ui/fonts/*'

README.md

@@ -104,7 +104,8 @@ of uProxy's Grunt commands:
  *  `dist` - Generates distribution files, including the Firefox xpi
  *  `clean` - Cleans up
  *  `test` - Run unit tests
- *  `everything` - 'test', then 'build'
+ *  `integration_test` - Run integration tests
+ *  `everything` - 'build', 'test' and then 'integration_test'
 
 The easiest way to stay current is to pull changes, run `grunt build` to build
 your distribution, and re-run as you make changes to the files.

bower.json

@@ -1,6 +1,6 @@
 {
   "name": "uProxy",
-  "version": "0.8.6",
+  "version": "0.8.7",
   "dependencies": {
     "polymer": "^0.5.6",
     "paper-elements": "Polymer/paper-elements#^0.5.6",

package.json

@@ -1,7 +1,7 @@
 {
   "name": "uProxy",
   "description": "Share your pathway to the Internet",
-  "version": "0.8.6",
+  "version": "0.8.7",
   "repository": {
     "type": "git",
     "url": "https://github.com/uproxy/uproxy"

src/chrome/app/manifest.json

@@ -3,7 +3,7 @@
   "name": "__MSG_appName__",
   "description": "__MSG_appDescription__",
   "minimum_chrome_version": "41.0.2272.63",
-  "version": "0.8.6",
+  "version": "0.8.7",
   "default_locale": "en",
   "icons": {
       "128": "icons/128_online.png"

src/chrome/extension/manifest.json

@@ -1,6 +1,6 @@
 {
   "name": "__MSG_extName__",
-  "version": "0.8.6",
+  "version": "0.8.7",
   "manifest_version": 2,
   "description": "__MSG_extDescription__",
   "minimum_chrome_version": "41.0.2272.63",

src/firefox/package.json

@@ -5,7 +5,7 @@
   "description": "This is the alpha version of uProxy.",
   "author": "uProxy Team <info@uproxy.org>",
   "license": "Apache 2.0",
-  "version": "0.8.6",
+  "version": "0.8.7",
   "permissions": {
     "private-browsing": true
   }

src/generic_core/remote-user.ts

@@ -352,14 +352,10 @@ var log :logging.Log = new logging.Log('remote-user');
           isOnline = true;
         }
       }
-      if (allInstanceIds.length === 0) {
-        // Don't send users to UI if they don't have any instances (i.e. are not
+      if (!this.network.areAllContactsUproxy() && allInstanceIds.length === 0) {
+        // For networks which give us profiles for non-uProxy contacts, don't
+        // send users to the UI unless they have instances (they may not be
         // uProxy users).
-        // TODO: ideally we should not have User objects for users without
-        // instances, but for now we create Users whenever we get a UserProfile
-        // or ClientState from the social provider that isn't
-        // ONLINE_WITH_OTHER_APP.  For now this is necessary because we don't
-        // yet load instances from storage until User objects are created.
         return null;
       }
 
@@ -465,7 +461,7 @@ var log :logging.Log = new logging.Log('remote-user');
           this.instances_[instanceId] = new remote_instance.RemoteInstance(this, instanceId);
           onceLoadedPromises.push(this.instances_[instanceId].onceLoaded);
         }
-        
+
       }
       Promise.all(onceLoadedPromises).then(this.fulfillStorageLoad_);
 

src/generic_core/social.ts

@@ -40,15 +40,18 @@ import ui = ui_connector.connector;
   export var NETWORK_OPTIONS :{[name:string]:social.NetworkOptions} = {
     'Google': {
       isFirebase: false,
-      enableMonitoring: true
+      enableMonitoring: true,
+      areAllContactsUproxy: false
     },
     'Facebook': {
       isFirebase: true,
-      enableMonitoring: true
+      enableMonitoring: true,
+      areAllContactsUproxy: true
     },
     'Google+': {
       isFirebase: true,
-      enableMonitoring: true
+      enableMonitoring: true,
+      areAllContactsUproxy: false
     }
   }
 
@@ -259,6 +262,12 @@ import ui = ui_connector.connector;
       throw new Error('Operation not implemented');
     }
 
+    public areAllContactsUproxy = () : boolean => {
+      // Default to false.
+      var options :social.NetworkOptions = NETWORK_OPTIONS[this.name];
+      return options ? options.areAllContactsUproxy === true : false;
+    }
+
   }  // class AbstractNetwork
 
 

src/generic_ui/index.html

@@ -10,6 +10,7 @@
 
   <link rel='import' href='polymer/vulcanized.html'>
   <link href='fonts/Roboto.css' rel='stylesheet' type='text/css'>
+  <link href='style/global.css' rel='stylesheet' shim-shadowdom>
 
   <style>
     @font-face {