Merge branch 'release-candidate' into release

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 {

src/generic_ui/polymer/app-bar.html

@@ -1,5 +1,4 @@
 <link rel='import' href='../../bower/polymer/polymer.html'>
-<link rel='import' href='../../bower/paper-button/paper-button.html'>
 
 <polymer-element name='uproxy-app-bar' attributes='disableback' center horizontal layout>
   <template>

src/generic_ui/polymer/bubble.html

@@ -62,7 +62,7 @@
     #actions {
       text-align: right;
     }
-    #done {
+    paper-button#done {
       background-color: #222;
     }
 

src/generic_ui/polymer/contact.html

@@ -79,8 +79,6 @@
       opacity: 0.5;
     }
     paper-button {
-      background: rgb(221, 221, 221);
-      color: rgb(112, 112, 112);
       font-size: 1em;
       margin: 14px 5px 5px 2px;
       padding-left: 1em;
@@ -98,10 +96,6 @@
     core-icon[icon=check] {
       color: #009688;
     }
-    .highlightedButton {
-      background: #009688;  /* dark green */
-      color: white;
-    }
     p.preButtonDetailedText {
       margin: 18px 0px 0px 0px;
       font-size: 12px;
@@ -175,22 +169,22 @@
           </p>
         </div>
         <p class='preButtonDetailedText'>You will be able to get access when {{ contact.name }} accepts.</p>
-        <paper-button raised on-tap='{{ cancelRequest }}'>Cancel Request</paper-button>
+        <paper-button class='grey' raised on-tap='{{ cancelRequest }}'>Cancel Request</paper-button>
       </div>
 
       <div hidden?='{{ contact.gettingConsentState != GettingConsentState.REMOTE_OFFERED_LOCAL_NO_ACTION }}'>
         <p class='preButtonText'>They've offered you access.</p>
-        <paper-button class='highlightedButton' raised on-tap='{{ request }}'>Accept Offer</paper-button>
-        <paper-button class='highlightedButton' raised on-tap='{{ ignoreOffer }}'>Ignore</paper-button>
+        <paper-button raised on-tap='{{ request }}'>Accept Offer</paper-button>
+        <paper-button raised on-tap='{{ ignoreOffer }}'>Ignore</paper-button>
       </div>
 
       <div hidden?='{{ contact.gettingConsentState != GettingConsentState.REMOTE_OFFERED_LOCAL_IGNORED }}'>
         <p class='preButtonText'>They've offered you access.</p>
-        <paper-button raised on-tap='{{ unignoreOffer }}'>Stop ignoring offers</paper-button>
+        <paper-button class='grey' raised on-tap='{{ unignoreOffer }}'>Stop ignoring offers</paper-button>
       </div>
 
       <div hidden?='{{ contact.gettingConsentState != GettingConsentState.NO_OFFER_OR_REQUEST }}'>
-        <paper-button raised class='highlightedButton' on-tap='{{ request }}'>
+        <paper-button raised on-tap='{{ request }}'>
           Ask for access
         </paper-button>
       </div>
@@ -203,11 +197,11 @@
 
       <div hidden?='{{ contact.sharingConsentState != SharingConsentState.LOCAL_OFFERED_REMOTE_ACCEPTED }}'>
         <p class='preButtonText'>You've given them access.</p>
-        <paper-button raised on-tap='{{ cancelOffer }}'>Revoke Access</paper-button>
+        <paper-button class='grey' raised on-tap='{{ cancelOffer }}'>Revoke Access</paper-button>
       </div>
 
       <div hidden?='{{ contact.sharingConsentState != SharingConsentState.LOCAL_OFFERED_REMOTE_NO_ACTION }}'>
-        <paper-button raised on-tap='{{ cancelOffer }}'>Cancel Offer</paper-button>
+        <paper-button class='grey' raised on-tap='{{ cancelOffer }}'>Cancel Offer</paper-button>
       </div>
 
       <div hidden?='{{ contact.sharingConsentState != SharingConsentState.REMOTE_REQUESTED_LOCAL_NO_ACTION }}'>
@@ -217,18 +211,18 @@
             {{ contact.name }} requests access from you.
           </p>
         </div>
-        <paper-button raised class='highlightedButton' on-tap='{{ offer }}'>Grant</paper-button>
-        <paper-button raised class='highlightedButton' on-tap='{{ ignoreRequest }}'>Ignore</paper-button>
+        <paper-button raised on-tap='{{ offer }}'>Grant</paper-button>
+        <paper-button raised on-tap='{{ ignoreRequest }}'>Ignore</paper-button>
       </div>
 
       <div hidden?='{{ contact.sharingConsentState != SharingConsentState.REMOTE_REQUESTED_LOCAL_IGNORED }}'>
         <p class='preButtonText'>They requested access through you.</p>
-        <paper-button raised on-tap='{{ unignoreRequest }}'>Stop ignoring requests</paper-button>
+        <paper-button class='grey' raised on-tap='{{ unignoreRequest }}'>Stop ignoring requests</paper-button>
       </div>
 
       <div hidden?='{{ contact.sharingConsentState != SharingConsentState.NO_OFFER_OR_REQUEST }}'>
         <p class='preButtonText'>You have not granted them access.</p>
-        <paper-button raised class='highlightedButton' on-tap='{{ offer }}'>Offer Access</paper-button>
+        <paper-button raised on-tap='{{ offer }}'>Offer Access</paper-button>
       </div>
     </core-collapse> <!-- end of shareControls -->
 

src/generic_ui/polymer/copypaste.html

@@ -20,14 +20,8 @@
       height: 10em;
     }
     paper-button {
-      background: #009688;  /* dark green */
-      color: white;
       margin-bottom: 24px;
     }
-    paper-button.stop {
-      background: rgb(221, 221, 221);
-      color: rgb(112, 112, 112);
-    }
     #getting, #sharing, #nothing {
       margin: 24px;
     }
@@ -107,7 +101,7 @@
           Start getting access
         </paper-button>
 
-        <paper-button raised class='stop' on-tap='{{ stopGetting }}'
+        <paper-button raised class='grey' on-tap='{{ stopGetting }}'
             hidden?='{{ ui.copyPastePendingEndpoint !== null }}'>
           Stop getting access
         </paper-button>
@@ -158,7 +152,7 @@
       <div class='connected' hidden?='{{ ui.copyPasteSharingState !== SharingState.SHARING_ACCESS }}'>
         <p>Success!  A one-time connection has been established.</p>
 
-        <paper-button raised class='stop' on-tap='{{ stopSharing }}'>Stop sharing access</paper-button>
+        <paper-button raised class='grey' on-tap='{{ stopSharing }}'>Stop sharing access</paper-button>
 
         <uproxy-bubble active='{{ ui.copyPasteError === ui_constants.CopyPasteError.UNEXPECTED }}' on-closed='{{ dismissError }}' class='error'>
           <p>You are currently sharing access.</p>

src/generic_ui/polymer/description.html

@@ -18,8 +18,6 @@
         color: rgb(112, 112, 112);
       }
       paper-button {
-        background: #009688;  /* dark green */
-        color: white;
         width: 70px;
         margin-left: 0px;
         margin-right: 5px;

src/generic_ui/polymer/feedback.html

@@ -1,5 +1,4 @@
 <link rel='import' href='../../bower/polymer/polymer.html'>
-<link rel='import' href='../../bower/paper-button/paper-button.html'>
 <link rel='import' href='../../bower/paper-checkbox/paper-checkbox.html'>
 <link rel='import' href='../../bower/paper-input/paper-input-decorator.html'>
 <link rel='import' href='../../bower/paper-input/paper-autogrow-textarea.html'>
@@ -85,11 +84,6 @@
          tooltip, it appears off center. */
       left: -64px !important;
     }
-    paper-button {
-      background-color: #009688; /* teal */
-      color: white;
-      margin-bottom: 3px;
-    }
     paper-input-decorator[id=emailDecorator] /deep/ .unfocused-underline,
     paper-input-decorator[id=emailDecorator] /deep/ .focused-underline,
     paper-input-decorator /deep/ .cursor {
@@ -121,9 +115,6 @@
       text-align: center;
       font-size: 16px;
     }
-    paper-progress::shadow #activeProgress {
-      background-color: #009688;
-    }
     #feedbackDecorator {
       height: 190px;
     }

src/generic_ui/polymer/instance.html

@@ -9,17 +9,11 @@
       opacity: 0.5;
     }
     paper-button {
-      background: rgb(221, 221, 221);
-      color: rgb(112, 112, 112);
       font-size: 1em;
       margin: 14px 5px 5px 2px;
       padding-left: 1em;
       padding-right: 1em;
     }
-    .highlightedButton {
-      background: #009688;  /* dark green */
-      color: white;
-    }
     .preButtonText {
       margin: 0;
       font-size: 14px;
@@ -50,21 +44,21 @@
 
       <!-- not getting or trying to get access -->
       <div hidden?='{{ instance.localGettingFromRemote != GettingState.NONE }}'>
-        <paper-button class='highlightedButton' raised on-tap='{{ start }}'>
+        <paper-button raised on-tap='{{ start }}'>
           Start getting access
         </paper-button>
       </div>
 
       <!-- trying to get access -->
       <div hidden?='{{ instance.localGettingFromRemote != GettingState.TRYING_TO_GET_ACCESS }}'>
-        <paper-button raised on-tap='{{ stop }}'>
+        <paper-button class='grey' raised on-tap='{{ stop }}'>
           Cancel
         </paper-button>
       </div>
 
       <!-- currently getting access -->
       <div hidden?='{{ instance.localGettingFromRemote != GettingState.GETTING_ACCESS }}'>
-        <paper-button raised on-tap='{{ stop }}'>
+        <paper-button class='grey' raised on-tap='{{ stop }}'>
           Stop getting access
         </paper-button>
       </div>

src/generic_ui/polymer/network.html

@@ -9,9 +9,7 @@
         box-sizing: border-box;
       }
       paper-button {
-        color: white;
         width: 150px;
-        background: #009688;  /* default to dark green */
       }
       paper-button.Google {
         background: #dd4b39;

src/generic_ui/polymer/reconnect.html

@@ -11,8 +11,6 @@
       font-color: #009688;  /* dark green */
     }
     paper-button {
-      background-color: #009688; /* teal */
-      color: white;
       margin: 10px 2px 3px 2px;
       font-size: 12px;
     }
@@ -21,9 +19,6 @@
       min-width: 305px;
       z-index: 1002; /* Must be greater than core-overlay-backdrop */
     }
-    paper-progress::shadow #activeProgress {
-      background-color: #009688;
-    }
     paper-progress {
       margin-bottom: 1em;
     }