Skip to content
Snippets Groups Projects
Commit 48a5f87d authored by Benoit Lavenier's avatar Benoit Lavenier
Browse files

Add debug log. Remove bower

parent 4399483a
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
README.md
+ 11
− 11
View file @ 48a5f87d
...@@ -115,24 +115,24 @@ This software is distributed under [GNU GPLv3](https://raw.github.com/duniter/ce ...@@ -115,24 +115,24 @@ This software is distributed under [GNU GPLv3](https://raw.github.com/duniter/ce
To build Cesium, you will have to: To build Cesium, you will have to:
- Installing build tools:
```
sudo apt-get install build-essential
```
- Installing [nvm](https://github.com/creationix/nvm) - Installing [nvm](https://github.com/creationix/nvm)
``` ```
wget -qO- https://raw.githubusercontent.com/creationix/nvm/v0.31.0/install.sh | bash wget -qO- https://raw.githubusercontent.com/creationix/nvm/v0.31.0/install.sh | bash
``` ```
- Configure NodeJS to use a version 5: - Configure NodeJS to use a version 8:
``` ```
nvm install 5 nvm install 7
``` ```
- Installing nodejs build tools: - Installing node.js build tools:
``` ```
npm install -g bower gulp ionic@1.7.16 cordova npm install -g gulp ionic@1.7.16 cordova
```
- Installing other build dependencies:
```
sudo apt-get install build-essential
``` ```
### Source code ### Source code
...@@ -142,13 +142,13 @@ To build Cesium, you will have to: ...@@ -142,13 +142,13 @@ To build Cesium, you will have to:
git clone https://github.com/duniter/cesium.git git clone https://github.com/duniter/cesium.git
cd cesium cd cesium
npm install npm install
bower install
``` ```
- Installing Cordova plugins - Installing Cordova plugins (need for platforms specific builds)
``` ```
ionic state restore ionic state restore
``` ```
### Build environment ### Build environment
- To configure your build environment : - To configure your build environment :
......
bower.json deleted 100644 → 0
+ 0
− 26
View file @ 4399483a
{
"name": "cesium",
"private": "true",
"devDependencies": {
"ionic": "driftyco/ionic-bower#1.3.2",
"ionic-material": "0.4.2"
},
"dependencies": {
"angular-messages": "1.3.13",
"robotodraft": "1.1.0",
"angular-moment": "^0.10.3",
"angular-animate": "1.4.3",
"angular-sanitize": "1.5.3",
"angular": "1.5.3",
"angular-bind-notifier": "^1.1.7",
"angular-image-crop": "^2.0.0",
"ng-idle": "^1.3.2",
"chart.js": "chartjs#^2.6.0"
},
"resolutions": {
"angular-sanitize": "1.5.3",
"angular-animate": "1.5.3",
"angular": "1.5.3",
"ionic": "1.3.2"
}
}
config.xml
+ 102
− 91
View file @ 48a5f87d
<?xml version='1.0' encoding='utf-8'?> <?xml version='1.0' encoding='utf-8'?>
<widget <widget android-versionCode="12700" id="fr.duniter.cesium" version="0.12.7" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
xmlns="http://www.w3.org/ns/widgets" <name>Cesium</name>
xmlns:cdv="http://cordova.apache.org/ns/1.0" <description>
id="fr.duniter.cesium"
version="0.12.7"
android-versionCode="12700"
>
<name>Cesium</name>
<description>
An simple App for Duniter wallet An simple App for Duniter wallet
</description> </description>
<author email="contact@e-is.pro"> <author email="contact@e-is.pro">
E-IS PRO E-IS PRO
</author> </author>
<content src="index.html" /> <content src="index.html" />
<access origin="*" /> <access origin="*" />
<allow-intent href="http://*/*" /> <allow-intent href="http://*/*" />
<allow-intent href="https://*/*" /> <allow-intent href="https://*/*" />
<allow-intent href="tel:*" /> <allow-intent href="tel:*" />
<allow-intent href="sms:*" /> <allow-intent href="sms:*" />
<allow-intent href="mailto:*" /> <allow-intent href="mailto:*" />
<allow-intent href="geo:*" /> <allow-intent href="geo:*" />
<allow-navigation href="http://*/*" /> <allow-navigation href="http://*/*" />
<allow-navigation href="https://*/*" /> <allow-navigation href="https://*/*" />
<allow-navigation href="data:*" /> <allow-navigation href="data:*" />
<icon src="www/img/logo_96px.png" /> <icon src="www/img/logo_96px.png" />
<preference name="webviewbounce" value="false" /> <preference name="webviewbounce" value="false" />
<preference name="UIWebViewBounce" value="false" /> <preference name="UIWebViewBounce" value="false" />
<preference name="DisallowOverscroll" value="true" /> <preference name="DisallowOverscroll" value="true" />
<preference name="SplashScreen" value="screen" /> <preference name="SplashScreen" value="screen" />
<preference name="SplashScreenDelay" value="4000" /> <preference name="SplashScreenDelay" value="4000" />
<preference name="xwalkVersion" value="19" /> <preference name="xwalkVersion" value="19" />
<preference name="xwalkMultipleApk" value="false"/> <preference name="xwalkMultipleApk" value="false" />
<preference name="android-minSdkVersion" value="16" /> <preference name="android-minSdkVersion" value="16" />
<preference name="android-targetSdkVersion" value="23"/> <preference name="android-targetSdkVersion" value="25" />
<allow-navigation href="*" /> <allow-navigation href="*" />
<feature name="StatusBar"> <feature name="StatusBar">
<param name="ios-package" onload="true" value="CDVStatusBar" /> <param name="ios-package" onload="true" value="CDVStatusBar" />
</feature> </feature>
<platform name="android"> <platform name="android">
<icon density="ldpi" src="resources/android/icon/drawable-ldpi-icon.png" /> <icon density="ldpi" src="resources/android/icon/drawable-ldpi-icon.png" />
<icon density="mdpi" src="resources/android/icon/drawable-mdpi-icon.png" /> <icon density="mdpi" src="resources/android/icon/drawable-mdpi-icon.png" />
<icon density="hdpi" src="resources/android/icon/drawable-hdpi-icon.png" /> <icon density="hdpi" src="resources/android/icon/drawable-hdpi-icon.png" />
<icon density="xhdpi" src="resources/android/icon/drawable-xhdpi-icon.png" /> <icon density="xhdpi" src="resources/android/icon/drawable-xhdpi-icon.png" />
<icon density="xxhdpi" src="resources/android/icon/drawable-xxhdpi-icon.png" /> <icon density="xxhdpi" src="resources/android/icon/drawable-xxhdpi-icon.png" />
<icon density="xxxhdpi" src="resources/android/icon/drawable-xxxhdpi-icon.png" /> <icon density="xxxhdpi" src="resources/android/icon/drawable-xxxhdpi-icon.png" />
<splash density="land-ldpi" src="resources/android/splash/drawable-land-ldpi-screen.png" /> <splash density="land-ldpi" src="resources/android/splash/drawable-land-ldpi-screen.png" />
<splash density="land-mdpi" src="resources/android/splash/drawable-land-mdpi-screen.png" /> <splash density="land-mdpi" src="resources/android/splash/drawable-land-mdpi-screen.png" />
<splash density="land-hdpi" src="resources/android/splash/drawable-land-hdpi-screen.png" /> <splash density="land-hdpi" src="resources/android/splash/drawable-land-hdpi-screen.png" />
<splash density="land-xhdpi" src="resources/android/splash/drawable-land-xhdpi-screen.png" /> <splash density="land-xhdpi" src="resources/android/splash/drawable-land-xhdpi-screen.png" />
<splash density="land-xxhdpi" src="resources/android/splash/drawable-land-xxhdpi-screen.png" /> <splash density="land-xxhdpi" src="resources/android/splash/drawable-land-xxhdpi-screen.png" />
<splash density="land-xxxhdpi" src="resources/android/splash/drawable-land-xxxhdpi-screen.png" /> <splash density="land-xxxhdpi" src="resources/android/splash/drawable-land-xxxhdpi-screen.png" />
<splash density="port-ldpi" src="resources/android/splash/drawable-port-ldpi-screen.png" /> <splash density="port-ldpi" src="resources/android/splash/drawable-port-ldpi-screen.png" />
<splash density="port-mdpi" src="resources/android/splash/drawable-port-mdpi-screen.png" /> <splash density="port-mdpi" src="resources/android/splash/drawable-port-mdpi-screen.png" />
<splash density="port-hdpi" src="resources/android/splash/drawable-port-hdpi-screen.png" /> <splash density="port-hdpi" src="resources/android/splash/drawable-port-hdpi-screen.png" />
<splash density="port-xhdpi" src="resources/android/splash/drawable-port-xhdpi-screen.png" /> <splash density="port-xhdpi" src="resources/android/splash/drawable-port-xhdpi-screen.png" />
<splash density="port-xxhdpi" src="resources/android/splash/drawable-port-xxhdpi-screen.png" /> <splash density="port-xxhdpi" src="resources/android/splash/drawable-port-xxhdpi-screen.png" />
<splash density="port-xxxhdpi" src="resources/android/splash/drawable-port-xxxhdpi-screen.png" /> <splash density="port-xxxhdpi" src="resources/android/splash/drawable-port-xxxhdpi-screen.png" />
</platform> </platform>
<platform name="ios"> <platform name="ios">
<preference name="BackupWebStorage" value="local" /> <preference name="BackupWebStorage" value="local" />
<icon height="57" src="resources/ios/icon/icon.png" width="57" /> <icon height="57" src="resources/ios/icon/icon.png" width="57" />
<icon height="114" src="resources/ios/icon/icon@2x.png" width="114" /> <icon height="114" src="resources/ios/icon/icon@2x.png" width="114" />
<icon height="40" src="resources/ios/icon/icon-40.png" width="40" /> <icon height="40" src="resources/ios/icon/icon-40.png" width="40" />
<icon height="80" src="resources/ios/icon/icon-40@2x.png" width="80" /> <icon height="80" src="resources/ios/icon/icon-40@2x.png" width="80" />
<icon height="50" src="resources/ios/icon/icon-50.png" width="50" /> <icon height="50" src="resources/ios/icon/icon-50.png" width="50" />
<icon height="100" src="resources/ios/icon/icon-50@2x.png" width="100" /> <icon height="100" src="resources/ios/icon/icon-50@2x.png" width="100" />
<icon height="60" src="resources/ios/icon/icon-60.png" width="60" /> <icon height="60" src="resources/ios/icon/icon-60.png" width="60" />
<icon height="120" src="resources/ios/icon/icon-60@2x.png" width="120" /> <icon height="120" src="resources/ios/icon/icon-60@2x.png" width="120" />
<icon height="180" src="resources/ios/icon/icon-60@3x.png" width="180" /> <icon height="180" src="resources/ios/icon/icon-60@3x.png" width="180" />
<icon height="72" src="resources/ios/icon/icon-72.png" width="72" /> <icon height="72" src="resources/ios/icon/icon-72.png" width="72" />
<icon height="144" src="resources/ios/icon/icon-72@2x.png" width="144" /> <icon height="144" src="resources/ios/icon/icon-72@2x.png" width="144" />
<icon height="76" src="resources/ios/icon/icon-76.png" width="76" /> <icon height="76" src="resources/ios/icon/icon-76.png" width="76" />
<icon height="152" src="resources/ios/icon/icon-76@2x.png" width="152" /> <icon height="152" src="resources/ios/icon/icon-76@2x.png" width="152" />
<icon height="29" src="resources/ios/icon/icon-small.png" width="29" /> <icon height="29" src="resources/ios/icon/icon-small.png" width="29" />
<icon height="58" src="resources/ios/icon/icon-small@2x.png" width="58" /> <icon height="58" src="resources/ios/icon/icon-small@2x.png" width="58" />
<icon height="87" src="resources/ios/icon/icon-small@3x.png" width="87" /> <icon height="87" src="resources/ios/icon/icon-small@3x.png" width="87" />
<splash height="1136" src="resources/ios/splash/Default-568h@2x~iphone.png" width="640" /> <splash height="1136" src="resources/ios/splash/Default-568h@2x~iphone.png" width="640" />
<splash height="1334" src="resources/ios/splash/Default-667h.png" width="750" /> <splash height="1334" src="resources/ios/splash/Default-667h.png" width="750" />
<splash height="2208" src="resources/ios/splash/Default-736h.png" width="1242" /> <splash height="2208" src="resources/ios/splash/Default-736h.png" width="1242" />
<splash height="1242" src="resources/ios/splash/Default-Landscape-736h.png" width="2208" /> <splash height="1242" src="resources/ios/splash/Default-Landscape-736h.png" width="2208" />
<splash height="1536" src="resources/ios/splash/Default-Landscape@2x~ipad.png" width="2048" /> <splash height="1536" src="resources/ios/splash/Default-Landscape@2x~ipad.png" width="2048" />
<splash height="768" src="resources/ios/splash/Default-Landscape~ipad.png" width="1024" /> <splash height="768" src="resources/ios/splash/Default-Landscape~ipad.png" width="1024" />
<splash height="2048" src="resources/ios/splash/Default-Portrait@2x~ipad.png" width="1536" /> <splash height="2048" src="resources/ios/splash/Default-Portrait@2x~ipad.png" width="1536" />
<splash height="1024" src="resources/ios/splash/Default-Portrait~ipad.png" width="768" /> <splash height="1024" src="resources/ios/splash/Default-Portrait~ipad.png" width="768" />
<splash height="960" src="resources/ios/splash/Default@2x~iphone.png" width="640" /> <splash height="960" src="resources/ios/splash/Default@2x~iphone.png" width="640" />
<splash height="480" src="resources/ios/splash/Default~iphone.png" width="320" /> <splash height="480" src="resources/ios/splash/Default~iphone.png" width="320" />
</platform> </platform>
<platform name="firefoxos"> <platform name="firefoxos">
<icon height="128" src="www/img/logo_128px.png" width="128" /> <icon height="128" src="www/img/logo_128px.png" width="128" />
<icon height="60" src="www/img/logo_60px.png" width="60" /> <icon height="60" src="www/img/logo_60px.png" width="60" />
</platform> </platform>
<platform name="ubuntu"> <platform name="ubuntu">
<icon height="57" src="www/img/logo_57px.png" width="57"/> <icon height="57" src="www/img/logo_57px.png" width="57" />
</platform> </platform>
<plugin name="cordova-plugin-camera" spec="~2.2.0" />
<plugin name="cordova-plugin-console" spec="~1.0.3" />
<plugin name="cordova-plugin-device" spec="~1.1.2" />
<plugin name="cordova-plugin-dialogs" spec="~1.2.1" />
<plugin name="cordova-plugin-inappbrowser" spec="~1.6.1" />
<plugin name="cordova-plugin-secure-storage" spec="~2.6.3" />
<plugin name="cordova-plugin-splashscreen" spec="~3.2.2" />
<plugin name="cordova-plugin-statusbar" spec="~2.1.3" />
<plugin name="cordova-plugin-vibration" spec="~2.1.1" />
<plugin name="cordova-plugin-websocket" spec="~0.12.0" />
<plugin name="cordova-plugin-whitelist" spec="~1.2.2" />
<plugin name="cordova-plugin-x-toast" spec="~2.6.0" />
<plugin name="ionic-plugin-keyboard" spec="~2.2.1" />
<plugin name="phonegap-plugin-barcodescanner" spec="git+https://github.com/phonegap/phonegap-plugin-barcodescanner.git">
<variable name="CAMERA_USAGE_DESCRIPTION" value=" " />
</plugin>
<plugin name="cordova-plugin-minisodium" spec="~1.0.0" />
</widget> </widget>
hooks/after_prepare/060_prepare_android_manifest.js
+ 1
− 1
View file @ 48a5f87d
...@@ -31,7 +31,7 @@ if (rootdir) { ...@@ -31,7 +31,7 @@ if (rootdir) {
.pipe(replace(/(<uses-sdk [^>]+>)(:?[\n\r\s\t ]*<uses-sdk [^>]+>)+/mg, '$1')) .pipe(replace(/(<uses-sdk [^>]+>)(:?[\n\r\s\t ]*<uses-sdk [^>]+>)+/mg, '$1'))
// <uses-sdk> : Replace 'targetSdkversion' and add tools:overrideLibrary // <uses-sdk> : Replace 'targetSdkversion' and add tools:overrideLibrary
.pipe(replace(/android:targetSdkVersion="[^"]+"\s*\/>/g, 'android:targetSdkVersion="23" tools:overrideLibrary="org.kaliumjni.lib" />')) .pipe(replace(/android:targetSdkVersion="[^"]+"\s*\/>/g, 'android:targetSdkVersion="25" tools:overrideLibrary="org.kaliumjni.lib" />'))
.pipe(gulp.dest(platformPath)); .pipe(gulp.dest(platformPath));
......
package.json
+ 46
− 13
View file @ 48a5f87d
...@@ -7,7 +7,6 @@ ...@@ -7,7 +7,6 @@
"url": "git@github.com:duniter/cesium.git" "url": "git@github.com:duniter/cesium.git"
}, },
"scripts": { "scripts": {
"postinstall": "bower install",
"install-for-mobile": "ionic state restore", "install-for-mobile": "ionic state restore",
"start": "ionic serve" "start": "ionic serve"
}, },
...@@ -20,28 +19,38 @@ ...@@ -20,28 +19,38 @@
"crypto-currency" "crypto-currency"
], ],
"author": "Duniter team", "author": "Duniter team",
"license": "GPLv3", "license": "GPL-3.0",
"readmeFilename": "README.md", "readmeFilename": "README.md",
"bugs": { "bugs": {
"url": "https://github.com/duniter/cesium/issues", "url": "https://github.com/duniter/cesium/issues",
"new": "https://github.com/duniter/cesium/issues/new?labels=bug" "new": "https://github.com/duniter/cesium/issues/new?labels=bug"
}, },
"dependencies": { "dependencies": {
"delete-empty": "^0.1.3", "angular": "1.5.3",
"gulp": "^3.9.1", "angular-animate": "1.4.3",
"bower": "^1.7.3", "angular-bind-notifier": "^1.1.7",
"angular-image-crop": "https://github.com/andyshora/angular-image-crop/archive/v2.0.0.tar.gz",
"angular-messages": "1.3.13",
"angular-moment": "^0.10.3",
"angular-sanitize": "1.5.3",
"chart.js": "^2.6.0",
"ionic": "^1.7.16", "ionic": "^1.7.16",
"gulp-bump": "^2.1.0", "ionic-material": "https://github.com/zachfitz/Ionic-Material/archive/v0.4.2.tar.gz",
"gulp-concat": "^2.2.0", "moment": "^2.10.6",
"gulp-rename": "^1.2.0", "ng-idle": "^1.3.2",
"gulp-sass": "^2.2.0", "robotodraft": "https://github.com/FontFaceKit/robotodraft/tarball/gh-pages"
"node-sass": "^3.3.3"
}, },
"devDependencies": { "devDependencies": {
"cordova-uglify": "^0.2.3", "cordova-uglify": "^0.2.3",
"del": "^2.2.0", "del": "^2.2.0",
"fs": "0.0.2",
"gulp": "^3.9.1", "gulp": "^3.9.1",
"gulp-bump": "^2.1.0",
"gulp-concat": "^2.2.0",
"gulp-rename": "^1.2.0",
"gulp-sass": "^2.2.0",
"vinyl-fs": "^3.9.2",
"graceful-fs": "^4.0.0",
"fs": "^0.0.2",
"gulp-angular-templatecache": "^1.8.0", "gulp-angular-templatecache": "^1.8.0",
"gulp-angular-translate": "^0.1.4", "gulp-angular-translate": "^0.1.4",
"gulp-base64": "^0.1.3", "gulp-base64": "^0.1.3",
...@@ -70,7 +79,10 @@ ...@@ -70,7 +79,10 @@
"mv": "^2.1.1", "mv": "^2.1.1",
"playup": "^1.0.2", "playup": "^1.0.2",
"shelljs": "^0.3.0", "shelljs": "^0.3.0",
"yargs": "^4.3.1" "yargs": "^4.3.1",
"minimatch": "^3.0.2",
"delete-empty": "^0.1.3",
"node-sass": "^4.5.3"
}, },
"cordovaPlugins": [ "cordovaPlugins": [
"cordova-plugin-whitelist", "cordova-plugin-whitelist",
...@@ -96,5 +108,26 @@ ...@@ -96,5 +108,26 @@
"ios", "ios",
"android", "android",
"firefoxos" "firefoxos"
] ],
"cordova": {
"plugins": {
"cordova-plugin-whitelist": {},
"cordova-plugin-splashscreen": {},
"cordova-plugin-console": {},
"ionic-plugin-keyboard": {},
"cordova-plugin-device": {},
"cordova-plugin-statusbar": {},
"cordova-plugin-camera": {},
"cordova-plugin-websocket": {},
"cordova-plugin-vibration": {},
"cordova-plugin-dialogs": {},
"cordova-plugin-minisodium": {},
"cordova-plugin-secure-storage": {},
"phonegap-plugin-barcodescanner": {
"CAMERA_USAGE_DESCRIPTION": " "
},
"cordova-plugin-inappbrowser": {},
"cordova-plugin-x-toast": {}
}
}
} }
www/js/app.js
+ 6
− 3
View file @ 48a5f87d
...@@ -375,7 +375,7 @@ angular.module('cesium', ['ionic', 'ionic-material', 'ngMessages', 'pascalprecht ...@@ -375,7 +375,7 @@ angular.module('cesium', ['ionic', 'ionic-material', 'ngMessages', 'pascalprecht
IdleProvider.timeout(csConfig.logoutTimeout||15); // display warning during 15s IdleProvider.timeout(csConfig.logoutTimeout||15); // display warning during 15s
}) })
.run(function($rootScope, $translate, $state, $window, ionicReady, Device, UIUtils, $ionicConfig, PluginService, csWallet, csSettings, csConfig, csCurrency) { .run(function($rootScope, $translate, $state, $window, ionicReady, localStorage, Device, UIUtils, $ionicConfig, PluginService, csWallet, csSettings, csConfig, csCurrency) {
'ngInject'; 'ngInject';
$rootScope.config = csConfig; $rootScope.config = csConfig;
...@@ -485,10 +485,13 @@ angular.module('cesium', ['ionic', 'ionic-material', 'ngMessages', 'pascalprecht ...@@ -485,10 +485,13 @@ angular.module('cesium', ['ionic', 'ionic-material', 'ngMessages', 'pascalprecht
StatusBar.styleDefault(); StatusBar.styleDefault();
} }
// Force to start settings // Start local storage
return csSettings.ready(); return localStorage.ready();
}) })
// Force to start settings
.then(csSettings.ready)
// Load currency // Load currency
.then(csCurrency.get) .then(csCurrency.get)
.then(function(currency){ .then(function(currency){
......
www/js/services/crypto-services.js
+ 1
− 0
View file @ 48a5f87d
...@@ -630,6 +630,7 @@ angular.module('cesium.crypto.services', ['ngResource', 'cesium.device.services' ...@@ -630,6 +630,7 @@ angular.module('cesium.crypto.services', ['ngResource', 'cesium.device.services'
// endRemoveIf(device) // endRemoveIf(device)
ionicReady().then(function() { ionicReady().then(function() {
console.debug('[crypto] Starting...');
var now = new Date().getTime(); var now = new Date().getTime();
var serviceImpl; var serviceImpl;
......
www/js/services/storage-services.js
+ 20
− 20
View file @ 48a5f87d
angular.module('cesium.storage.services', ['ngResource', 'ngResource', 'ngApi', 'cesium.config']) angular.module('cesium.storage.services', ['ngResource', 'ngApi', 'cesium.config'])
.factory('localStorage', function($window, $q, $rootScope, $timeout, ionicReady, csConfig, Api) { .factory('localStorage', function($window, $q, $rootScope, $timeout, csConfig, Api) {
'ngInject'; 'ngInject';
var var
...@@ -114,26 +114,24 @@ angular.module('cesium.storage.services', ['ngResource', 'ngResource', 'ngApi', ...@@ -114,26 +114,24 @@ angular.module('cesium.storage.services', ['ngResource', 'ngResource', 'ngApi',
exports[key] = exports.secure[key]; exports[key] = exports.secure[key];
}); });
var deferred = $q.defer();
ionicReady().then(function() { // No secure storage plugin: fall back to standard storage
// No secure storage plugin: fall back to standard storage if (!cordova.plugins || !cordova.plugins.SecureStorage) {
if (!cordova.plugins || !cordova.plugins.SecureStorage) { console.debug('[storage] No cordova plugin. Will use standard....');
console.debug('[storage] No cordova plugin. Will use standard....'); return initStandardStorage();
deferred.resolve(initStandardStorage()); }
return;
}
exports.secure.storage = new cordova.plugins.SecureStorage(
function () {
deferred.resolve();
},
function (err) {
console.error('[storage] Could not use secure storage. Will use standard.', err);
deferred.resolve(initStandardStorage());
},
appName);
});
var deferred = $q.defer();
exports.secure.storage = new cordova.plugins.SecureStorage(
function () {
deferred.resolve();
},
function (err) {
console.error('[storage] Could not use secure storage. Will use standard.', err);
deferred.promise.then(initStandardStorage);
deferred.resolve();
},
appName);
return deferred.promise; return deferred.promise;
} }
...@@ -142,6 +140,7 @@ angular.module('cesium.storage.services', ['ngResource', 'ngResource', 'ngApi', ...@@ -142,6 +140,7 @@ angular.module('cesium.storage.services', ['ngResource', 'ngResource', 'ngApi',
}; };
exports.ready = function() { exports.ready = function() {
console.debug("[storage] Calling ready()");
if (started) return $q.when(); if (started) return $q.when();
return startPromise || start(); return startPromise || start();
}; };
...@@ -153,6 +152,7 @@ angular.module('cesium.storage.services', ['ngResource', 'ngResource', 'ngApi', ...@@ -153,6 +152,7 @@ angular.module('cesium.storage.services', ['ngResource', 'ngResource', 'ngApi',
// Use Cordova secure storage plugin // Use Cordova secure storage plugin
if (isDevice) { if (isDevice) {
console.debug("[storage] Staring secure storage...");
startPromise = initSecureStorage(); startPromise = initSecureStorage();
} }
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment