diff --git a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/shares/RemoteShare.kt b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/shares/RemoteShare.kt
index 13eac361..3bdf2056 100644
--- a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/shares/RemoteShare.kt
+++ b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/shares/RemoteShare.kt
@@ -55,8 +55,7 @@ class RemoteShare : Parcelable, Serializable {
     var isFolder: Boolean = false
     var userId: Long = 0
 
-    val isPasswordProtected: Boolean
-        get() = ShareType.PUBLIC_LINK == shareType && shareWith.isNotEmpty()
+    val isValid: Boolean = id > -1
 
     constructor() : super() {
         resetData()
diff --git a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/shares/ShareXMLParser.kt b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/shares/ShareXMLParser.kt
index e405d969..02eefcc2 100644
--- a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/shares/ShareXMLParser.kt
+++ b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/shares/ShareXMLParser.kt
@@ -117,7 +117,6 @@ class ShareXMLParser {
             } else {
                 skip(parser)
             }
-
         }
         return shares
     }
@@ -150,7 +149,6 @@ class ShareXMLParser {
             } else {
                 skip(parser)
             }
-
         }
     }
 
@@ -194,7 +192,6 @@ class ShareXMLParser {
 
             } else {
                 skip(parser)
-
             }
         }
 
@@ -269,7 +266,7 @@ class ShareXMLParser {
 
             } else if (name.equals(NODE_EXPIRATION, ignoreCase = true)) {
                 val value = readNode(parser, NODE_EXPIRATION)
-                if (value.length != 0) {
+                if (value.isNotEmpty()) {
                     remoteShare.expirationDate = WebdavUtils.parseResponseDate(value)!!.time
                 }
 
@@ -296,15 +293,11 @@ class ShareXMLParser {
             }
         }
 
-        if (isValidShare(remoteShare)) {
+        if (remoteShare.isValid) {
             shares.add(remoteShare)
         }
     }
 
-    private fun isValidShare(share: RemoteShare): Boolean {
-        return share.id > -1
-    }
-
     private fun fixPathForFolder(share: RemoteShare) {
         if (share.isFolder && share.path.isNotEmpty() &&
             !share.path.endsWith(FileUtils.PATH_SEPARATOR)
diff --git a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/shares/UpdateRemoteShareOperation.kt b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/shares/UpdateRemoteShareOperation.kt
index 3c2f2a5d..6a9c31da 100644
--- a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/shares/UpdateRemoteShareOperation.kt
+++ b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/shares/UpdateRemoteShareOperation.kt
@@ -172,7 +172,7 @@ class UpdateRemoteShareOperation
 
             if (result.isSuccess && retrieveShareDetails) {
                 // retrieve more info - PUT only returns the index of the new share
-                val emptyShare = result.data.shares[0]
+                val emptyShare = result.data.shares.first()
                 val getInfo = GetRemoteShareOperation(
                     emptyShare.id
                 )