From 90cb4a684211fe5630f209ba61510e8be3129eae Mon Sep 17 00:00:00 2001
From: Maximilian Krambach <maximilian.krambach@intevation.de>
Date: Thu, 16 Aug 2018 17:58:11 +0200
Subject: js: importKey feedback refactor

--
* src/Keyring.js: An empty result should no longer cause an error,
  the import feedback summary has been refactored slightly
* Browsertests to reflect import feedback change
---
 lang/js/src/Keyring.js | 31 +++++++++++++------------------
 1 file changed, 13 insertions(+), 18 deletions(-)

(limited to 'lang/js/src/Keyring.js')

diff --git a/lang/js/src/Keyring.js b/lang/js/src/Keyring.js
index eb4f60f5..a6787986 100644
--- a/lang/js/src/Keyring.js
+++ b/lang/js/src/Keyring.js
@@ -274,6 +274,17 @@ export class GPGME_Keyring {
                 msg.post().then(function(response){
                     let infos = {};
                     let fprs = [];
+                    let summary = {};
+                    for (let i=0; i < feedbackValues.length; i++ ){
+                        summary[feedbackValues[i]] =
+                            response.result[feedbackValues[i]];
+                    }
+                    if (!response.result.hasOwnProperty('imports') ||
+                        response.result.imports.length === 0
+                    ){
+                        resolve({Keys:[],summary: summary});
+                        return;
+                    }
                     for (let res=0; res<response.result.imports.length; res++){
                         let result = response.result.imports[res];
                         let status = '';
@@ -307,15 +318,7 @@ export class GPGME_Keyring {
                                     status: infos[result[i].fingerprint].status
                                 });
                             }
-                            let summary = {};
-                            for (let i=0; i < feedbackValues.length; i++ ){
-                                summary[feedbackValues[i]] =
-                                    response[feedbackValues[i]];
-                            }
-                            resolve({
-                                Keys:resultset,
-                                summary: summary
-                            });
+                            resolve({Keys:resultset,summary: summary});
                         }, function(error){
                             reject(error);
                         });
@@ -327,15 +330,7 @@ export class GPGME_Keyring {
                                 status: infos[fprs[i]].status
                             });
                         }
-                        let summary = {};
-                        for (let i=0; i < feedbackValues.length; i++ ){
-                            summary[feedbackValues[i]] =
-                                response[feedbackValues[i]];
-                        }
-                        resolve({
-                            Keys:resultset,
-                            summary:summary
-                        });
+                        resolve({Keys:resultset,summary:summary});
                     }
 
                 }, function(error){
-- 
cgit v1.2.3