Merge pull request #159 from flo-mic/patch-username

Introduce "Show username next to title" option

6 files changed, 40 insertions, 4 deletions

diff --git a/src/js/App/Popup.js b/src/js/App/Popup.js
index d8435d6..2b8e38e 100644
--- a/src/js/App/Popup.js
+++ b/src/js/App/Popup.js
@@ -10,6 +10,7 @@ import ThemeService from '@js/Services/ThemeService';
 import SettingsService from '@js/Services/SettingsService';
 import ClientSettingsProvider from '@js/Settings/ClientSettingsProvider';
 import LocalisationService from "@js/Services/LocalisationService";
+import PasswordSettingsManager from '@js/Manager/PasswordSettingsManager';
 
 class Popup {
 
@@ -44,6 +45,7 @@ class Popup {
             await MessageService.init(true, 'background');
             ConverterManager.init();
             SettingsService.init(ClientSettingsProvider);
+            await PasswordSettingsManager.init();
             this._authClient = new AuthorisationClient();
 
             await ThemeService.apply();
diff --git a/src/js/Controller/Setting/Get.js b/src/js/Controller/Setting/Get.js
index 269693e..8563469 100644
--- a/src/js/Controller/Setting/Get.js
+++ b/src/js/Controller/Setting/Get.js
@@ -24,7 +24,8 @@ export default class Get extends AbstractController {
             'clipboard.clear.delay',
             'clipboard.clear.passwords',
             'search.recommendation.mode',
-            'search.recommendation.maxRows'
+            'search.recommendation.maxRows',
+            'password.list.show.user'
         ];
     }
 
diff --git a/src/js/Controller/Setting/Reset.js b/src/js/Controller/Setting/Reset.js
index ce66856..b45e6a0 100644
--- a/src/js/Controller/Setting/Reset.js
+++ b/src/js/Controller/Setting/Reset.js
@@ -21,7 +21,8 @@ export default class Reset extends AbstractController {
             'search.recommendation.mode',
             'search.recommendation.maxRows',
             'clipboard.clear.passwords',
-            'clipboard.clear.delay'
+            'clipboard.clear.delay',
+            'password.list.show.user'
         ];
     }
 
diff --git a/src/js/Controller/Setting/Set.js b/src/js/Controller/Setting/Set.js
index 8afeeb3..6369a09 100644
--- a/src/js/Controller/Setting/Set.js
+++ b/src/js/Controller/Setting/Set.js
@@ -17,7 +17,8 @@ export default class Set extends AbstractController {
             'notification.password.new',
             'notification.password.update',
             'debug.localisation.enabled',
-            'clipboard.clear.passwords'
+            'clipboard.clear.passwords',
+            'password.list.show.user'
         ];
     }
 
diff --git a/src/js/Manager/PasswordSettingsManager.js b/src/js/Manager/PasswordSettingsManager.js
new file mode 100644
index 0000000..e96319f
--- /dev/null
+++ b/src/js/Manager/PasswordSettingsManager.js
@@ -0,0 +1,26 @@
+import SettingsService from '@js/Services/SettingsService';
+
+export default new class PasswordSettingsManager {
+
+    /**
+     *
+     */
+    constructor() {
+        this._showUsernameInList = null;
+    }
+
+    /**
+     *
+     */
+    async init() {
+        this._showUsernameInList = await SettingsService.get('password.list.show.user')
+    }
+
+    /**
+     *
+     */
+    getShowUserInList() {
+        return this._showUsernameInList.getValue();
+    }
+    
+}
diff --git a/src/js/Settings/MasterSettingsProvider.js b/src/js/Settings/MasterSettingsProvider.js
index e424864..5d4e7d2 100644
--- a/src/js/Settings/MasterSettingsProvider.js
+++ b/src/js/Settings/MasterSettingsProvider.js
@@ -92,6 +92,10 @@ class MasterSettingsProvider {
             'clipboard.clear.delay' : [
                 'sync.clipboard.clear.delay',
                 'local.clipboard.clear.delay',
+            ],
+            'password.list.show.user' : [
+                'sync.password.list.show.user',
+                'local.password.list.show.user',
             ]
         };
         this._defaults = {
@@ -111,7 +115,8 @@ class MasterSettingsProvider {
             'search.recommendation.mode'   : 'host',
             'search.recommendation.maxRows': 8,
             'clipboard.clear.passwords'    : false,
-            'clipboard.clear.delay'        : 60
+            'clipboard.clear.delay'        : 60,
+            'password.list.show.user'      : false,
         };
     }