Merge branch 'master' into testing

6 files changed, 13 insertions, 7 deletions

diff --git a/Changelog.md b/Changelog.md
index f2fe29e..59cb2ad 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -1,3 +1,8 @@
+## 2.2.1 - Bugfix Release
+### Fixed
+- Passlink connect fails because autogenerated label is too long
+- Account can not be deleted if server offline
+
 ## 2.2.0 - Feature Release
 ### Added
 - Edit passwords
diff --git a/package.json b/package.json
index 85c3e8a..d03022d 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "passwords-webextension",
-    "version": "2.2.0",
+    "version": "2.2.1",
     "description": "The official browser client of the Passwords app for Nextcloud",
     "private": true,
     "scripts": {
diff --git a/src/js/Controller/PassLink/Connect/Apply.js b/src/js/Controller/PassLink/Connect/Apply.js
index 5b041d4..f45bfdb 100644
--- a/src/js/Controller/PassLink/Connect/Apply.js
+++ b/src/js/Controller/PassLink/Connect/Apply.js
@@ -77,14 +77,15 @@ export default class Analyze extends AbstractController {
         try {
             let theme = await action.getTheme();
             if(theme.hasOwnProperty('label')) {
-                return `${theme.label} - ${login.login}`;
+                let label = `${theme.label} - ${login.login}`;
+                if(label.length <= 48) return label;
             }
         } catch(e) {
             ErrorManager.logError(e);
         }
 
         let host = new URL(action.getParameter('baseUrl')).host;
-        return `${login.login}@${host}`;
+        return `${login.login}@${host}`.substr(0,48);
     }
 
     /**
diff --git a/src/js/Helper/ServerRequirementCheck.js b/src/js/Helper/ServerRequirementCheck.js
index f20e8fb..e1d7f5d 100644
--- a/src/js/Helper/ServerRequirementCheck.js
+++ b/src/js/Helper/ServerRequirementCheck.js
@@ -8,7 +8,7 @@ import ConnectionErrorHelper from '@js/Helper/ConnectionErrorHelper';
 export default class ServerRequirementCheck {
 
     get MINIMUM_APP_VERSION() {
-        return [2020, 3];
+        return [2021, 12];
     }
 
     /**
diff --git a/src/js/Manager/PassLinkManager.js b/src/js/Manager/PassLinkManager.js
index 89d2526..a028382 100644
--- a/src/js/Manager/PassLinkManager.js
+++ b/src/js/Manager/PassLinkManager.js
@@ -16,7 +16,7 @@ export default new class PassLinkManager {
     init() {
         SystemService.getBrowserApi().webRequest.onBeforeRequest.addListener(
             this._beforeRequestListener,
-            {urls: ['https://passlink.mdns.eu/open/*', 'https://link.passwordsapp.org/open/*']},
+            {urls: ['https://link.passwordsapp.org/open/*']},
             ['blocking']
         );
     }
@@ -29,8 +29,7 @@ export default new class PassLinkManager {
      */
     _redirectRequest(requestDetails) {
         let passlinkUrl = SystemService.getBrowserApi().runtime.getURL('html/passlink.html'),
-            eventUrl    = requestDetails.url.replace('https://passlink.mdns.eu/open/', 'ext+passlink:');
-        eventUrl    = eventUrl.replace('https://link.passwordsapp.org/open/', 'ext+passlink:');
+            eventUrl    = requestDetails.url.replace('https://link.passwordsapp.org/open/', 'ext+passlink:');
 
         passlinkUrl += '?link=' + encodeURIComponent(eventUrl);
         SystemService.getBrowserApi().tabs.update(requestDetails.tabId, {url: passlinkUrl});
diff --git a/src/js/Manager/ServerManager.js b/src/js/Manager/ServerManager.js
index c6ccf69..07acb5f 100644
--- a/src/js/Manager/ServerManager.js
+++ b/src/js/Manager/ServerManager.js
@@ -212,6 +212,7 @@ class ServerManager {
      * @private
      */
     _removeAuthItems(serverId) {
+        if(!this._authQueue) return;
         /** @type {AuthorisationItem[]} **/
         let items = this._authQueue.getItems();