diff --git a/src/js/controller/login-initial.js b/src/js/controller/login-initial.js
index ae720d1..12245f0 100644
--- a/src/js/controller/login-initial.js
+++ b/src/js/controller/login-initial.js
@@ -101,42 +101,12 @@ define(function(require) {
return;
}
- $scope.setState(states.DONE);
+ $location.path('/desktop');
$scope.$apply();
});
}, 500);
};
- $scope.exportKeypair = function() {
- // export keys from keychain
- emailDao._crypto.exportKeys(function(err, keys) {
- if (err) {
- $scope.onError(err);
- return;
- }
-
- var id = keys.keyId.substring(8, keys.keyId.length);
- dl.createDownload({
- content: keys.publicKeyArmored + keys.privateKeyArmored,
- filename: 'whiteout_mail_' + emailDao._account.emailAddress + '_' + id + '.asc',
- contentType: 'text/plain'
- }, onSave);
- });
-
- function onSave(err) {
- if (err) {
- $scope.onError(err);
- return;
- }
- $scope.proceed();
- $scope.$apply();
- }
- };
-
- $scope.proceed = function() {
- $location.path('/desktop');
- };
-
$scope.setState = function(state) {
$scope.state.ui = state;
};
diff --git a/src/tpl/login-initial.html b/src/tpl/login-initial.html
index 18d9e6a..2efa93a 100644
--- a/src/tpl/login-initial.html
+++ b/src/tpl/login-initial.html
@@ -6,7 +6,7 @@
-
Generate PGP key. You can set a passphrase to protect your key on disk. But you will have to enter it everytime you open the app. If not just press continue.
Alternatively you can also import an existing PGP key.
+
Generate PGP key. You can set a passphrase to protect your key on disk. This must be entered everytime you start the app. For no passphrase just press continue.
Alternatively you can also import an existing PGP key.