From dd1e8dfe47dc4920f289b9ee93fed540114d50b3 Mon Sep 17 00:00:00 2001
From: blavenie <benoit.lavenier@e-is.pro>
Date: Thu, 3 Aug 2017 23:26:47 +0200
Subject: [PATCH] [fix] fix groups lookup

---
 README.md                                     |   1 +
 doc/fr/development_tutorial-01.md             |   2 +-
 hooks/after_prepare/040_useref.js             |   2 +-
 package.json                                  |   4 +-
 release.sh                                    |   9 +-
 www/index.html                                | 385 +++++++++---------
 www/js/services/crypto-services.js            |   6 +-
 .../es/js/controllers/profile-controllers.js  |   2 +
 8 files changed, 212 insertions(+), 199 deletions(-)

diff --git a/README.md b/README.md
index 1950f283..41e61769 100644
--- a/README.md
+++ b/README.md
@@ -26,6 +26,7 @@ If you don't already use nodejs (v5), please follow [prerequisite steps](https:/
 ```bash
 git clone https://github.com/duniter/cesium.git
 cd cesium
+npm install -g gulp bower@1.8.0 cordova@6.5.0 ionic@1.7.16
 npm install
 npm start
 ```
diff --git a/doc/fr/development_tutorial-01.md b/doc/fr/development_tutorial-01.md
index ed50c0b0..4ea0fc7e 100644
--- a/doc/fr/development_tutorial-01.md
+++ b/doc/fr/development_tutorial-01.md
@@ -132,7 +132,7 @@ npm install -g gulp bower@1.8.0 cordova@6.5.0 ionic@1.7.16
 Puis pour les dépendances non globales :
 
 ```bash
-npm installion
+npm install
 ```
 
 > Le processus d'installation peut prendre plusieurs minutes. En effet, il faut télécharger toutes les dépendances de Cesium et même en compiler certaines.
diff --git a/hooks/after_prepare/040_useref.js b/hooks/after_prepare/040_useref.js
index 848d77e7..caaf67fc 100755
--- a/hooks/after_prepare/040_useref.js
+++ b/hooks/after_prepare/040_useref.js
@@ -36,7 +36,7 @@ if (rootdir && !skip) {
 
     var indexPath = path.join(wwwPath, 'index.html');
 
-    var jsFilter = filter(["**/*.js", '!**/config.js'], { restore: true });
+    var jsFilter = filter(["**/*.js", "!**/vendor/*", '!**/config.js'], { restore: true });
     var cssFilter = filter("**/*.css", { restore: true });
     var revFilesFilter = filter(['**/*', '!**/index.html', '!**/config.js'], { restore: true });
 
diff --git a/package.json b/package.json
index 5f415894..b22ce3e1 100644
--- a/package.json
+++ b/package.json
@@ -8,7 +8,7 @@
     },
     "scripts": {
         "postinstall": "bower install",
-        "install-for-mobile": "ionic state restore",
+        "install-platforms": "ionic state restore",
         "start": "ionic serve"
     },
     "keywords": [
@@ -139,4 +139,4 @@
             "android"
         ]
     }
-}
\ No newline at end of file
+}
diff --git a/release.sh b/release.sh
index 82c2cd28..fba565dc 100755
--- a/release.sh
+++ b/release.sh
@@ -22,10 +22,11 @@ if [[ $2 =~ ^[0-9]+.[0-9]+.[0-9]+((a|b)[0-9]+)?$ && $3 =~ ^[0-9]+$ ]]; then
   echo "new build android version: $3"
   case "$1" in
     rel|pre)
-      # Change the version in package.json and test file
-      sed -i "s/version\": \"$current\"/version\": \"$2\"/g" package.json
-      sed -i "s/ version=\"[^\"]+\"/ version=\"$2\"/g" config.xml
-      sed -i "s/ android-versionCode=\"[^\"]+\"/ android-versionCode=\"$3\"/g" config.xml
+    # Change the version in package.json and test file
+    sed -i "s/version\": \"$current\"/version\": \"$2\"/g" package.json
+      currentConfigXmlVersion=`grep -oP "version=\"\d+.\d+.\d+((a|b)[0-9]+)?\"" config.xml | grep -oP "\d+.\d+.\d+((a|b)[0-9]+)?"`
+    sed -i "s/ version=\"$currentConfigXmlVersion\"/ version=\"$2\"/g" config.xml
+    sed -i "s/ android-versionCode=\"$currentAndroid\"/ android-versionCode=\"$3\"/g" config.xml
 
       # Bump the install.sh
       sed -i "s/echo \"v.*\" #lastest/echo \"v$2\" #lastest/g" install.sh
diff --git a/www/index.html b/www/index.html
index 8774b6e5..ab1c2be5 100644
--- a/www/index.html
+++ b/www/index.html
@@ -22,45 +22,57 @@
   <link rel="stylesheet" type="text/css" href="dist/dist_css/plugins/graph/css/style.css">
   <link rel="stylesheet" type="text/css" href="dist/dist_css/plugins/map/css/style.css">
   <!--endRemoveIf(no-plugin)-->
-
   <!-- endbuild -->
-  <!-- build:js dist_js/vendor.js -->
-  <!-- vendor js -->
-  <script src="js/vendor/moment.min.js"></script>
-  <script src="js/vendor/moment.fr.js"></script>
-  <script src="js/vendor/moment.nl.js"></script>
-  <script src="js/vendor/moment.es.js"></script>
-  <script src="js/vendor/numeral.js"></script>
-  <script src="js/vendor/numeral.fr.js"></script>
-  <script src="js/vendor/numeral.en.js"></script>
-  <script src="js/vendor/numeral.nl.js"></script>
-  <script src="js/vendor/numeral.es.js"></script>
-  <script src="js/vendor/socket-io.js"></script>
-  <script src="js/vendor/underscore.js"></script>
-  <script src="js/vendor/qrcode.min.js"></script>
-  <!--removeIf(ubuntu)--> <!-- FIXME: issue #463 -->
-  <script src="js/vendor/Chart.js"></script>
-  <!--endRemoveIf(ubuntu)-->
-
-  <!-- ionic/angularjs js -->
-  <script src="lib/ionic/js/ionic.bundle.js"></script>
-  <script src="lib/ionic/js/ionic.material.js"></script>
-  <script src="lib/ionic/js/angular/angular-resource.js"></script>
-  <script src="lib/ionic/js/angular/angular-translate.js"></script>
-  <script src="lib/ionic/js/angular/angular-messages.js"></script>
-  <script src="lib/ionic/js/angular/angular-api.js"></script>
-  <script src="lib/ionic/js/angular/angular-cache.js"></script>
-  <script src="lib/ionic/js/angular/angular-screenmatch.min.js"></script>
-  <script src="lib/ionic/js/angular/angular-bind-notifier.min.js"></script>
-  <script src="lib/ionic/js/angular/angular-image-crop.js"></script>
-  <script src="lib/ionic/js/angular/angular-file-saver.bundle.js"></script>
-  <script src="lib/ionic/js/angular/angular-idle.js"></script>
-  <script src="lib/ionic/js/angular/angular-simple-logger.light.js"></script>
-  <script src="lib/ionic/js/angular/ui-leaflet.js"></script>
-
-  <!--removeIf(ubuntu)--> <!-- FIXME: issue #463 -->
-  <script src="lib/ionic/js/angular/angular-chart.min.js"></script>
-  <!--endRemoveIf(ubuntu)-->
+
+</head>
+</head>
+<body ng-app="cesium" id="cesium" ng-strict-di
+      window-exit-unauth
+      ng-class="{'nobackdrop': $root.tour, 'expert-mode': $root.settings.expertMode}">
+<ion-nav-view>
+  <h3 style="text-align: center; margin-top: 44px;">
+    <b>Cesium</b>
+  </h3>
+  <h4 style="text-align: center; margin-top: 10px;">Chargement / Sobreprima / Loading...</h4>
+</ion-nav-view>
+
+<!-- build:js dist_js/vendor.js -->
+<!-- vendor js -->
+<script src="js/vendor/moment.min.js"></script>
+<script src="js/vendor/moment.fr.js"></script>
+<script src="js/vendor/moment.nl.js"></script>
+<script src="js/vendor/moment.es.js"></script>
+<script src="js/vendor/numeral.js"></script>
+<script src="js/vendor/numeral.fr.js"></script>
+<script src="js/vendor/numeral.en.js"></script>
+<script src="js/vendor/numeral.nl.js"></script>
+<script src="js/vendor/numeral.es.js"></script>
+<script src="js/vendor/socket-io.js"></script>
+<script src="js/vendor/underscore.js"></script>
+<script src="js/vendor/qrcode.min.js"></script>
+<!--removeIf(ubuntu)--> <!-- FIXME: issue #463 -->
+<script src="js/vendor/Chart.js"></script>
+<!--endRemoveIf(ubuntu)-->
+
+<!-- ionic/angularjs js -->
+<script src="lib/ionic/js/ionic.bundle.js"></script>
+<script src="lib/ionic/js/ionic.material.js"></script>
+<script src="lib/ionic/js/angular/angular-resource.js"></script>
+<script src="lib/ionic/js/angular/angular-translate.js"></script>
+<script src="lib/ionic/js/angular/angular-messages.js"></script>
+<script src="lib/ionic/js/angular/angular-api.js"></script>
+<script src="lib/ionic/js/angular/angular-cache.js"></script>
+<script src="lib/ionic/js/angular/angular-screenmatch.min.js"></script>
+<script src="lib/ionic/js/angular/angular-bind-notifier.min.js"></script>
+<script src="lib/ionic/js/angular/angular-image-crop.js"></script>
+<script src="lib/ionic/js/angular/angular-file-saver.bundle.js"></script>
+<script src="lib/ionic/js/angular/angular-idle.js"></script>
+<script src="lib/ionic/js/angular/angular-simple-logger.light.js"></script>
+<script src="lib/ionic/js/angular/ui-leaflet.js"></script>
+
+<!--removeIf(ubuntu)--> <!-- FIXME: issue #463 -->
+<script src="lib/ionic/js/angular/angular-chart.min.js"></script>
+<!--endRemoveIf(ubuntu)-->
 
   <script src="js/vendor/base58.js" async></script>
   <!--removeIf(android)-->
@@ -75,156 +87,151 @@
   <script src="js/vendor/ng-cordova.min.js"></script>
   <!--endRemoveIf(no-device)-->
 
-  <!--removeIf(no-plugin)-->
-  <script src="js/vendor/leaflet.js"></script>
-  <script src="js/vendor/leaflet.awesome-markers.min.js"></script>
-  <script src="js/vendor/leaflet.search.min.js"></script>
-  <script src="js/vendor/leaflet.easy-button.js"></script>
-  <script src="js/vendor/leaflet.loading.js"></script>
-  <!--endRemoveIf(no-plugin)-->
-
-  <!-- endbuild -->
-
-  <!--removeIf(no-device)-->
-  <script src="cordova.js"></script>
-  <!--endRemoveIf(no-device)-->
-
-  <!-- build:js dist_js/cesium.js -->
-  <!-- services -->
-  <script src="dist/dist_js/app/services/settings-services.js"></script>
-  <script src="dist/dist_js/app/services/network-services.js"></script>
-  <script src="dist/dist_js/app/services/crypto-services.js"></script>
-  <script src="dist/dist_js/app/services/utils-services.js"></script>
-  <script src="dist/dist_js/app/services/cache-services.js"></script>
-  <script src="dist/dist_js/app/services/modal-services.js"></script>
-  <script src="dist/dist_js/app/services/http-services.js"></script>
-  <script src="dist/dist_js/app/services/storage-services.js"></script>
-  <script src="dist/dist_js/app/services/device-services.js"></script>
-  <script src="dist/dist_js/app/services/currency-services.js"></script>
-  <script src="dist/dist_js/app/services/bma-services.js"></script>
-  <script src="dist/dist_js/app/services/wot-services.js"></script>
-  <script src="dist/dist_js/app/services/tx-services.js"></script>
-  <script src="dist/dist_js/app/services/wallet-services.js"></script>
-  <script src="dist/dist_js/app/services/plugin-services.js"></script>
-  <script src="dist/dist_js/app/services.js"></script>
-
-  <script src="dist/dist_js/app/platform.js"></script>
-  <script src="dist/dist_js/app/filters.js"></script>
-
-  <!-- entities -->
-  <script src="dist/dist_js/app/entities/peer.js"></script>
-  <script src="dist/dist_js/app/entities/block.js"></script>
-
-  <!-- controllers -->
-  <script src="dist/dist_js/app/controllers/app-controllers.js"></script>
-  <script src="dist/dist_js/app/controllers/join-controllers.js"></script>
-  <script src="dist/dist_js/app/controllers/login-controllers.js"></script>
-  <script src="dist/dist_js/app/controllers/help-controllers.js"></script>
-  <script src="dist/dist_js/app/controllers/wallet-controllers.js"></script>
-  <script src="dist/dist_js/app/controllers/wot-controllers.js"></script>
-  <script src="dist/dist_js/app/controllers/network-controllers.js"></script>
-  <script src="dist/dist_js/app/controllers/currency-controllers.js"></script>
-  <script src="dist/dist_js/app/controllers/transfer-controllers.js"></script>
-  <script src="dist/dist_js/app/controllers/settings-controllers.js"></script>
-  <script src="dist/dist_js/app/controllers/blockchain-controllers.js"></script>
-  <script src="dist/dist_js/app/controllers.js"></script>
-
-  <!-- templates -->
-  <script src="dist/dist_js/app/templates.js"></script>
-  <script src="dist/dist_js/app/translations.js"></script>
-
-  <!--removeIf(no-plugin)-->
-  <!-- Plugins -->
-  <script src="dist/dist_js/app/plugins.js"></script>
-  <script src="dist/dist_js/plugins/translations.js"></script>
-  <script src="dist/dist_js/plugins/templates.js"></script>
-
-  <!-- ES plugin -->
-  <script src="dist/dist_js/plugins/es/js/plugin.js"></script>
-  <script src="dist/dist_js/plugins/es/js/entities/notification.js"></script>
-  <script src="dist/dist_js/plugins/es/js/entities/comment.js"></script>
-  <script src="dist/dist_js/plugins/es/js/entities/invitation.js"></script>
-  <script src="dist/dist_js/plugins/es/js/services.js"></script>
-  <script src="dist/dist_js/plugins/es/js/services/comment-services.js"></script>
-  <script src="dist/dist_js/plugins/es/js/services/http-services.js"></script>
-  <script src="dist/dist_js/plugins/es/js/services/settings-services.js"></script>
-  <script src="dist/dist_js/plugins/es/js/services/registry-services.js"></script>
-  <script src="dist/dist_js/plugins/es/js/services/social-services.js"></script>
-  <script src="dist/dist_js/plugins/es/js/services/crypto-services.js"></script>
-  <script src="dist/dist_js/plugins/es/js/services/profile-services.js"></script>
-  <script src="dist/dist_js/plugins/es/js/services/notification-services.js"></script>
-  <script src="dist/dist_js/plugins/es/js/services/message-services.js"></script>
-  <script src="dist/dist_js/plugins/es/js/services/modal-services.js"></script>
-  <script src="dist/dist_js/plugins/es/js/services/blockchain-services.js"></script>
-  <script src="dist/dist_js/plugins/es/js/services/group-services.js"></script>
-  <script src="dist/dist_js/plugins/es/js/services/invitation-services.js"></script>
-  <script src="dist/dist_js/plugins/es/js/services/subscription-services.js"></script>
-  <script src="dist/dist_js/plugins/es/js/services/wallet-services.js"></script>
-  <script src="dist/dist_js/plugins/es/js/services/geo-services.js"></script>
-  <script src="dist/dist_js/plugins/es/js/controllers/common-controllers.js"></script>
-  <script src="dist/dist_js/plugins/es/js/controllers/app-controllers.js"></script>
-  <script src="dist/dist_js/plugins/es/js/controllers/settings-controllers.js"></script>
-  <script src="dist/dist_js/plugins/es/js/controllers/currency-controllers.js"></script>
-  <script src="dist/dist_js/plugins/es/js/controllers/wallet-controllers.js"></script>
-  <script src="dist/dist_js/plugins/es/js/controllers/wot-controllers.js"></script>
-  <script src="dist/dist_js/plugins/es/js/controllers/registry-controllers.js"></script>
-  <script src="dist/dist_js/plugins/es/js/controllers/profile-controllers.js"></script>
-  <script src="dist/dist_js/plugins/es/js/controllers/message-controllers.js"></script>
-  <script src="dist/dist_js/plugins/es/js/controllers/notification-controllers.js"></script>
-  <script src="dist/dist_js/plugins/es/js/controllers/blockchain-controllers.js"></script>
-  <script src="dist/dist_js/plugins/es/js/controllers/network-controllers.js"></script>
-  <script src="dist/dist_js/plugins/es/js/controllers/group-controllers.js"></script>
-  <script src="dist/dist_js/plugins/es/js/controllers/invitation-controllers.js"></script>
-  <script src="dist/dist_js/plugins/es/js/controllers/subscription-controllers.js"></script>
-
-  <!-- Graph plugin -->
-  <!--removeIf(ubuntu)--> <!-- FIXME: issue #463 -->
-  <script src="dist/dist_js/plugins/graph/js/plugin.js"></script>
-  <script src="dist/dist_js/plugins/graph/js/services.js"></script>
-  <script src="dist/dist_js/plugins/graph/js/services/data-services.js"></script>
-  <script src="dist/dist_js/plugins/graph/js/services/color-services.js"></script>
-  <script src="dist/dist_js/plugins/graph/js/controllers/common-controllers.js"></script>
-  <script src="dist/dist_js/plugins/graph/js/controllers/blockchain-controllers.js"></script>
-  <script src="dist/dist_js/plugins/graph/js/controllers/network-controllers.js"></script>
-  <script src="dist/dist_js/plugins/graph/js/controllers/currency-controllers.js"></script>
-  <script src="dist/dist_js/plugins/graph/js/controllers/account-controllers.js"></script>
-  <!--endRemoveIf(ubuntu)-->
-
-  <!-- Map plugin -->
-  <script src="dist/dist_js/plugins/map/js/plugin.js"></script>
-  <script src="dist/dist_js/plugins/map/js/services.js"></script>
-  <script src="dist/dist_js/plugins/map/js/services/wot-services.js"></script>
-  <script src="dist/dist_js/plugins/map/js/services/utils-services.js"></script>
-  <script src="dist/dist_js/plugins/map/js/controllers/wot-controllers.js"></script>
-  <script src="dist/dist_js/plugins/map/js/controllers/network-controllers.js"></script>
-  <script src="dist/dist_js/plugins/map/js/controllers/user-controllers.js"></script>
-  <script src="dist/dist_js/plugins/map/js/controllers/settings-controllers.js"></script>
-
-  <!-- RML9 plugin -->
-  <!--<script src="dist/dist_js/plugins/rml9/plugin-01-add_button.js"></script>-->
-  <!--<script src="dist/dist_js/plugins/rml9/plugin-02-add_view.js"></script>-->
-  <!--<script src="dist/dist_js/plugins/rml9/plugin-03-file_export.js"></script>-->
-  <!--<script src="dist/dist_js/plugins/rml9/plugin-04-chart.js"></script>-->
-  <!--<script src="dist/dist_js/plugins/rml9/plugin-05-service_api.js"></script>-->
-  <!--<script src="dist/dist_js/plugins/rml9/plugin-06-settings.js"></script>-->
-  <!--<script src="dist/dist_js/plugins/rml9/plugin-07-add_map.js"></script>-->
-  <!--<script src="dist/dist_js/plugins/rml9/plugin-final.js"></script>-->
-
-  <!--endRemoveIf(no-plugin)-->
-
-  <!-- App -->
-  <script src="dist/dist_js/app/app.js"></script>
-  <script src="dist/dist_js/app/components.js"></script>
-  <script src="dist/dist_js/app/directives.js"></script>
-  <!-- endbuild -->
-  <!-- build:js config.js -->
-  <!-- config  -->
-  <script src="dist/dist_js/app/config.js"></script>
-  <!-- endbuild -->
-</head>
-<body ng-app="cesium" id="cesium" ng-strict-di
-      window-exit-unauth
-      ng-class="{'nobackdrop': $root.tour, 'expert-mode': $root.settings.expertMode}">
-  <ion-nav-view></ion-nav-view>
+<!--removeIf(no-plugin)-->
+<script src="js/vendor/leaflet.js"></script>
+<script src="js/vendor/leaflet.awesome-markers.min.js"></script>
+<script src="js/vendor/leaflet.search.min.js"></script>
+<script src="js/vendor/leaflet.easy-button.js"></script>
+<script src="js/vendor/leaflet.loading.js"></script>
+<!--endRemoveIf(no-plugin)-->
+
+<!-- endbuild -->
+
+<!--removeIf(no-device)-->
+<script src="cordova.js"></script>
+<!--endRemoveIf(no-device)-->
+
+<!-- build:js dist_js/cesium.js -->
+<!-- services -->
+<script src="dist/dist_js/app/services/settings-services.js"></script>
+<script src="dist/dist_js/app/services/network-services.js"></script>
+<script src="dist/dist_js/app/services/crypto-services.js"></script>
+<script src="dist/dist_js/app/services/utils-services.js"></script>
+<script src="dist/dist_js/app/services/cache-services.js"></script>
+<script src="dist/dist_js/app/services/modal-services.js"></script>
+<script src="dist/dist_js/app/services/http-services.js"></script>
+<script src="dist/dist_js/app/services/storage-services.js"></script>
+<script src="dist/dist_js/app/services/device-services.js"></script>
+<script src="dist/dist_js/app/services/currency-services.js"></script>
+<script src="dist/dist_js/app/services/bma-services.js"></script>
+<script src="dist/dist_js/app/services/wot-services.js"></script>
+<script src="dist/dist_js/app/services/tx-services.js"></script>
+<script src="dist/dist_js/app/services/wallet-services.js"></script>
+<script src="dist/dist_js/app/services/plugin-services.js"></script>
+<script src="dist/dist_js/app/services.js"></script>
+
+<!-- entities -->
+<script src="dist/dist_js/app/entities/peer.js"></script>
+<script src="dist/dist_js/app/entities/block.js"></script>
+
+<!-- controllers -->
+<script src="dist/dist_js/app/controllers/app-controllers.js"></script>
+<script src="dist/dist_js/app/controllers/join-controllers.js"></script>
+<script src="dist/dist_js/app/controllers/login-controllers.js"></script>
+<script src="dist/dist_js/app/controllers/help-controllers.js"></script>
+<script src="dist/dist_js/app/controllers/wallet-controllers.js"></script>
+<script src="dist/dist_js/app/controllers/wot-controllers.js"></script>
+<script src="dist/dist_js/app/controllers/network-controllers.js"></script>
+<script src="dist/dist_js/app/controllers/currency-controllers.js"></script>
+<script src="dist/dist_js/app/controllers/transfer-controllers.js"></script>
+<script src="dist/dist_js/app/controllers/settings-controllers.js"></script>
+<script src="dist/dist_js/app/controllers/blockchain-controllers.js"></script>
+<script src="dist/dist_js/app/controllers.js"></script>
+
+<!-- templates -->
+<script src="dist/dist_js/app/templates.js"></script>
+<script src="dist/dist_js/app/translations.js"></script>
+
+<!--removeIf(no-plugin)-->
+<!-- Plugins -->
+<script src="dist/dist_js/app/plugins.js"></script>
+<script src="dist/dist_js/plugins/translations.js"></script>
+<script src="dist/dist_js/plugins/templates.js"></script>
+
+<!-- ES plugin -->
+<script src="dist/dist_js/plugins/es/js/plugin.js"></script>
+<script src="dist/dist_js/plugins/es/js/entities/notification.js"></script>
+<script src="dist/dist_js/plugins/es/js/entities/comment.js"></script>
+<script src="dist/dist_js/plugins/es/js/entities/invitation.js"></script>
+<script src="dist/dist_js/plugins/es/js/services.js"></script>
+<script src="dist/dist_js/plugins/es/js/services/comment-services.js"></script>
+<script src="dist/dist_js/plugins/es/js/services/http-services.js"></script>
+<script src="dist/dist_js/plugins/es/js/services/settings-services.js"></script>
+<script src="dist/dist_js/plugins/es/js/services/registry-services.js"></script>
+<script src="dist/dist_js/plugins/es/js/services/social-services.js"></script>
+<script src="dist/dist_js/plugins/es/js/services/crypto-services.js"></script>
+<script src="dist/dist_js/plugins/es/js/services/profile-services.js"></script>
+<script src="dist/dist_js/plugins/es/js/services/notification-services.js"></script>
+<script src="dist/dist_js/plugins/es/js/services/message-services.js"></script>
+<script src="dist/dist_js/plugins/es/js/services/modal-services.js"></script>
+<script src="dist/dist_js/plugins/es/js/services/blockchain-services.js"></script>
+<script src="dist/dist_js/plugins/es/js/services/group-services.js"></script>
+<script src="dist/dist_js/plugins/es/js/services/invitation-services.js"></script>
+<script src="dist/dist_js/plugins/es/js/services/subscription-services.js"></script>
+<script src="dist/dist_js/plugins/es/js/services/wallet-services.js"></script>
+<script src="dist/dist_js/plugins/es/js/services/geo-services.js"></script>
+<script src="dist/dist_js/plugins/es/js/controllers/common-controllers.js"></script>
+<script src="dist/dist_js/plugins/es/js/controllers/app-controllers.js"></script>
+<script src="dist/dist_js/plugins/es/js/controllers/settings-controllers.js"></script>
+<script src="dist/dist_js/plugins/es/js/controllers/currency-controllers.js"></script>
+<script src="dist/dist_js/plugins/es/js/controllers/wallet-controllers.js"></script>
+<script src="dist/dist_js/plugins/es/js/controllers/wot-controllers.js"></script>
+<script src="dist/dist_js/plugins/es/js/controllers/registry-controllers.js"></script>
+<script src="dist/dist_js/plugins/es/js/controllers/profile-controllers.js"></script>
+<script src="dist/dist_js/plugins/es/js/controllers/message-controllers.js"></script>
+<script src="dist/dist_js/plugins/es/js/controllers/notification-controllers.js"></script>
+<script src="dist/dist_js/plugins/es/js/controllers/blockchain-controllers.js"></script>
+<script src="dist/dist_js/plugins/es/js/controllers/network-controllers.js"></script>
+<script src="dist/dist_js/plugins/es/js/controllers/group-controllers.js"></script>
+<script src="dist/dist_js/plugins/es/js/controllers/invitation-controllers.js"></script>
+<script src="dist/dist_js/plugins/es/js/controllers/subscription-controllers.js"></script>
+
+<!-- Graph plugin -->
+<!--removeIf(ubuntu)--> <!-- FIXME: issue #463 -->
+<script src="dist/dist_js/plugins/graph/js/plugin.js"></script>
+<script src="dist/dist_js/plugins/graph/js/services.js"></script>
+<script src="dist/dist_js/plugins/graph/js/services/data-services.js"></script>
+<script src="dist/dist_js/plugins/graph/js/services/color-services.js"></script>
+<script src="dist/dist_js/plugins/graph/js/controllers/common-controllers.js"></script>
+<script src="dist/dist_js/plugins/graph/js/controllers/blockchain-controllers.js"></script>
+<script src="dist/dist_js/plugins/graph/js/controllers/network-controllers.js"></script>
+<script src="dist/dist_js/plugins/graph/js/controllers/currency-controllers.js"></script>
+<script src="dist/dist_js/plugins/graph/js/controllers/account-controllers.js"></script>
+<!--endRemoveIf(ubuntu)-->
+
+<!-- Map plugin -->
+<script src="dist/dist_js/plugins/map/js/plugin.js"></script>
+<script src="dist/dist_js/plugins/map/js/services.js"></script>
+<script src="dist/dist_js/plugins/map/js/services/wot-services.js"></script>
+<script src="dist/dist_js/plugins/map/js/services/utils-services.js"></script>
+<script src="dist/dist_js/plugins/map/js/controllers/wot-controllers.js"></script>
+<script src="dist/dist_js/plugins/map/js/controllers/network-controllers.js"></script>
+<script src="dist/dist_js/plugins/map/js/controllers/user-controllers.js"></script>
+<script src="dist/dist_js/plugins/map/js/controllers/settings-controllers.js"></script>
+
+<!-- RML9 plugin -->
+<!--<script src="dist/dist_js/plugins/rml9/plugin-01-add_button.js"></script>-->
+<!--<script src="dist/dist_js/plugins/rml9/plugin-02-add_view.js"></script>-->
+<!--<script src="dist/dist_js/plugins/rml9/plugin-03-file_export.js"></script>-->
+<!--<script src="dist/dist_js/plugins/rml9/plugin-04-chart.js"></script>-->
+<!--<script src="dist/dist_js/plugins/rml9/plugin-05-service_api.js"></script>-->
+<!--<script src="dist/dist_js/plugins/rml9/plugin-06-settings.js"></script>-->
+<!--<script src="dist/dist_js/plugins/rml9/plugin-07-add_map.js"></script>-->
+<!--<script src="dist/dist_js/plugins/rml9/plugin-final.js"></script>-->
+
+<!--endRemoveIf(no-plugin)-->
+
+<!-- App -->
+<script src="dist/dist_js/app/app.js"></script>
+<script src="dist/dist_js/app/components.js"></script>
+<script src="dist/dist_js/app/directives.js"></script>
+<script src="dist/dist_js/app/filters.js"></script>
+<script src="dist/dist_js/app/platform.js"></script>
+<!-- endbuild -->
+
+<!-- build:js config.js -->
+<!-- config  -->
+<script src="dist/dist_js/app/config.js"></script>
+<!-- endbuild -->
 </body>
 </html>
diff --git a/www/js/services/crypto-services.js b/www/js/services/crypto-services.js
index 5fcfb9c6..c2f5a41a 100644
--- a/www/js/services/crypto-services.js
+++ b/www/js/services/crypto-services.js
@@ -798,9 +798,11 @@ angular.module('cesium.crypto.services', ['cesium.utils.services'])
     var service = new CryptoAbstractService();
 
     var isDevice = true;
-    // removeIf(device)
+    // removeIf(android)
+    // removeIf(ios)
     isDevice = false;
-    // endRemoveIf(device)
+    // endRemoveIf(ios)
+    // endRemoveIf(android)
 
     //console.debug("[crypto] Created CryptotUtils service. device=" + isDevice);
 
diff --git a/www/plugins/es/js/controllers/profile-controllers.js b/www/plugins/es/js/controllers/profile-controllers.js
index 71bdb63d..af5743f3 100644
--- a/www/plugins/es/js/controllers/profile-controllers.js
+++ b/www/plugins/es/js/controllers/profile-controllers.js
@@ -279,7 +279,9 @@ function ESViewEditProfileController($scope, $rootScope, $q, $timeout, $state, $
     if (Device.camera.enable) {
       return Device.camera.getPicture()
         .then(function(imageData) {
+          if (!imageData) return;
           $scope.avatar = {src: "data:image/png;base64," + imageData};
+          $scope.avatarStyle={'background-image':'url("'+imageData+'")'};
           $scope.dirty = true;
         })
         .catch(UIUtils.onError('ERROR.TAKE_PICTURE_FAILED'));
-- 
GitLab