Small code de-duplication

roundcube · Dec 2, 2017 · 489ad88 · 489ad88
1 parent 758044d
commit 489ad88
Showing 1 changed file with 7 additions and 9 deletions.
diff --git a/program/js/app.js b/program/js/app.js
@@ -3573,17 +3573,15 @@ function rcube_webmail()
     if (this.env.browser_capabilities)
       this.env.browser_capabilities['pgpmime'] = 1;
 
-    var keyring = this.env.user_id;
-
-    mailvelope.getKeyring(keyring).then(function(kr) {
-      ref.mailvelope_keyring = kr;
-      ref.mailvelope_init(action, kr);
-    }, function(err) {
-      // attempt to create a new keyring for this app/user
-      mailvelope.createKeyring(keyring).then(function(kr) {
+    var keyring = this.env.user_id,
+      fn = function(kr) {
         ref.mailvelope_keyring = kr;
         ref.mailvelope_init(action, kr);
-      }, function(err) {
+      };
+
+    mailvelope.getKeyring(keyring).then(fn, function(err) {
+      // attempt to create a new keyring for this app/user
+      mailvelope.createKeyring(keyring).then(fn, function(err) {
         console.error(err);
       });
     });