From 7ff9f0c04caefa50bead12c5cb80d1406612677f Mon Sep 17 00:00:00 2001
From: Tamara Steinwender <tamara.steinwender@tugraz.at>
Date: Mon, 8 Nov 2021 15:38:06 +0100
Subject: [PATCH] Change log out to disconnect in nextcloud filepicker

---
 .../file-handling/src/i18n/de/translation.json    |  5 ++++-
 .../file-handling/src/i18n/en/translation.json    |  5 ++++-
 .../file-handling/src/nextcloud-file-picker.js    | 15 ++++-----------
 3 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/packages/file-handling/src/i18n/de/translation.json b/packages/file-handling/src/i18n/de/translation.json
index 514568dc..e8b9a224 100644
--- a/packages/file-handling/src/i18n/de/translation.json
+++ b/packages/file-handling/src/i18n/de/translation.json
@@ -76,7 +76,10 @@
     "error-save-to-favorites": "Speichern in Favoriten nicht möglich! Bitte wählen Sie einen Ordner innerhalb der Favoriten aus.",
     "error-save-to-recent": "Speichern in den neuesten Dateien nicht möglich! Bitte wählen Sie einen Ordner innerhalb der neuesten Dateien aus.",
     "recent-files-link-text": "Neueste Dateien",
-    "favorites-link-text": "Meine Favoriten"
+    "favorites-link-text": "Meine Favoriten",
+    "remember-me": "Mit {{name}} verbunden bleiben",
+    "log-out": "Verbindung trennen",
+    "open-submenu": "Untermenü öffnen"
   },
   "clipboard": {
     "add-files": "Dateien der Zwischenablage hinzufügen",
diff --git a/packages/file-handling/src/i18n/en/translation.json b/packages/file-handling/src/i18n/en/translation.json
index 898223ee..dba3728b 100644
--- a/packages/file-handling/src/i18n/en/translation.json
+++ b/packages/file-handling/src/i18n/en/translation.json
@@ -77,7 +77,10 @@
     "error-save-to-favorites": "Saving to Favorites not possible! Please select a folder within the Favorites.",
     "error-save-to-recent": "Saving to Recent Files not possible! Please select a folder within the Recent Files.",
     "recent-files-link-text": "Recent Files",
-    "favorites-link-text": "My Favorites"
+    "favorites-link-text": "My Favorites",
+    "remember-me": "Stay connected with {{name}}",
+    "log-out": "Disconnect",
+    "open-submenu": "Open submenu"
   },
   "clipboard": {
     "add-files": "Add files to clipboard",
diff --git a/packages/file-handling/src/nextcloud-file-picker.js b/packages/file-handling/src/nextcloud-file-picker.js
index c31cf6b9..758b4926 100644
--- a/packages/file-handling/src/nextcloud-file-picker.js
+++ b/packages/file-handling/src/nextcloud-file-picker.js
@@ -1556,18 +1556,11 @@ export class NextcloudFilePicker extends ScopedElementsMixin(DBPLitElement) {
     logOut() {
         this.webDavClient = null;
         this.isPickerActive = false;
-<<<<<<< HEAD
         if (this.auth) {
             const publicId = this.auth['person-id'];
             localStorage.removeItem('nextcloud-webdav-username' + publicId);
             localStorage.removeItem('nextcloud-webdav-password' + publicId);
         }
-=======
-        sessionStorage.removeItem('nextcloud-webdav-username');
-        sessionStorage.removeItem('nextcloud-webdav-password');
-
-        console.log("log out!");
->>>>>>> Add sessionsaving in session storage to nextcloud filepicker, add encrypt and decrypt functionality
     }
 
     /**
@@ -2280,11 +2273,7 @@ export class NextcloudFilePicker extends ScopedElementsMixin(DBPLitElement) {
                                 }}">${i18n.t('nextcloud-file-picker.connect-nextcloud', {name: this.nextcloudName})}
                         </button>
                     </div>
-<<<<<<< HEAD
                     <div class="block text-center m-inherit ${classMap({hidden: !this.storeSession || !this.isLoggedIn()})}">
-=======
-                    <div class="block text-center m-inherit ${classMap({hidden: this.isPickerActive && !this.storeSession})}"> <!-- remove hidden to enable remember me -->
->>>>>>> Add sessionsaving in session storage to nextcloud filepicker, add encrypt and decrypt functionality
                         <label class="button-container remember-container">
                             ${i18n.t('nextcloud-file-picker.remember-me', {name: this.nextcloudName})}
                             <input type="checkbox" id="remember-checkbox" name="remember">
@@ -2378,11 +2367,15 @@ export class NextcloudFilePicker extends ScopedElementsMixin(DBPLitElement) {
                                             @click="${() => {
                                                 this.logOut();
                                             }}">
+<<<<<<< HEAD
 <<<<<<< HEAD
                                             ${i18n.t('nextcloud-file-picker.log-out')}
 =======
                                         Abmelden
 >>>>>>> Add sessionsaving in session storage to nextcloud filepicker, add encrypt and decrypt functionality
+=======
+                                            ${i18n.t('nextcloud-file-picker.log-out')}
+>>>>>>> Change log out to disconnect in nextcloud filepicker
                                     </button>
                                 </div>
                             </div>
-- 
GitLab