Fix the public key using the wrong domain in settings

www/common/common-hash.js

@@ -34,8 +34,8 @@ define([
     var getFileHashFromKeys = Hash.getFileHashFromKeys = function (fileKey, cryptKey) {
         return '/1/' + hexToBase64(fileKey) + '/' + Crypto.b64RemoveSlashes(cryptKey) + '/';
     };
-    Hash.getUserHrefFromKeys = function (username, pubkey) {
-        return window.location.origin + '/user/#/1/' + username + '/' + pubkey.replace(/\//g, '-');
+    Hash.getUserHrefFromKeys = function (origin, username, pubkey) {
+        return origin + '/user/#/1/' + username + '/' + pubkey.replace(/\//g, '-');
     };
 
     var fixDuplicateSlashes = function (s) {

www/settings/inner.js

@@ -68,7 +68,7 @@ define([
         var publicKey = privateData.edPublic;
         if (publicKey) {
             var $key = $('<div>', {'class': 'cp-sidebarlayout-element'}).appendTo($div);
-            var userHref = Hash.getUserHrefFromKeys(accountName, publicKey);
+            var userHref = Hash.getUserHrefFromKeys(privateData.origin, accountName, publicKey);
             var $pubLabel = $('<span>', {'class': 'label'})
                 .text(Messages.settings_publicSigningKey);
             $key.append($pubLabel).append(UI.dialog.selectable(userHref));