From 8f6baa43e9f525f9a80e8d41769afdc0e0118cb7 Mon Sep 17 00:00:00 2001
From: Felix Heidecke <felix@heidecke.me>
Date: Tue, 1 Oct 2019 16:05:53 +0200
Subject: [PATCH 1/2] Fix icon locked/open switching

---
 apps/files/src/components/FileLink.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/files/src/components/FileLink.vue b/apps/files/src/components/FileLink.vue
index f8067b5bead..143fed3f763 100644
--- a/apps/files/src/components/FileLink.vue
+++ b/apps/files/src/components/FileLink.vue
@@ -9,8 +9,8 @@
       <li v-for="(link, index) in $_links" :key="'li-' + index">
         <oc-grid flex gutter="small">
           <div class="uk-width-auto">
-            <oc-icon v-if="link.password" name="lock" size="medium" />
-            <oc-icon v-else name="link" size="medium" />
+            <oc-icon v-show="link.password" name="lock" size="medium" />
+            <oc-icon v-show="!link.password" name="link" size="medium" />
           </div>
           <div class="uk-width-expand uk-text-truncate">
             <span class="uk-text-bold">{{ link.name }}</span><br>

From 2986760cbbd7cc41002dc37e50ae9588228e8120 Mon Sep 17 00:00:00 2001
From: Felix Heidecke <felix@heidecke.me>
Date: Tue, 1 Oct 2019 16:49:07 +0200
Subject: [PATCH 2/2] Add ability to remove set password

---
 apps/files/src/components/FileLinkForm.vue | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/apps/files/src/components/FileLinkForm.vue b/apps/files/src/components/FileLinkForm.vue
index 855937d30a9..7f1405f832c 100644
--- a/apps/files/src/components/FileLinkForm.vue
+++ b/apps/files/src/components/FileLinkForm.vue
@@ -59,7 +59,10 @@
       </div>
       <div class="uk-width-1-1 uk-width-3-5@m">
         <label class="uk-form-label" for=""><span v-translate>Password</span><em v-if="$_passwordEnforced" class="uk-margin-small-left">(<span v-translate>required</span>)</em></label>
-        <input type="password" autocomplete="new-password" class="uk-input" :class="{ 'uk-form-danger': !$_passwordIsValid }" v-model="password" :placeholder="hasPassword && password === null? '********' : placeholder.password" id="oc-files-file-link-password" />
+        <div class="uk-position-relative">
+          <input type="password" autocomplete="new-password" class="uk-input" :class="{ 'uk-form-danger': !$_passwordIsValid }" v-model="password" :placeholder="hasPassword && password === null? '********' : placeholder.password" id="oc-files-file-link-password" />
+          <div uk-close v-if="!$_passwordEnforced && hasPassword && password!=''" class="uk-position-small uk-position-center-right oc-cursor-pointer" @click="password=''" :uk-tooltip="$_passwordRemoveText" />
+        </div>
       </div>
       </div>
       <!-- @TODO: Enable Mail API to use the following
@@ -187,6 +190,10 @@ export default {
       if (permissions >= 5 && password.read_write === '1') { return true }
 
       return false
+    },
+
+    $_passwordRemoveText () {
+      return this.$gettext('Remove password')
     }
   },
   methods: {