From 159bc0789e41f9a3177e7f51db0e72255e1b0c9c Mon Sep 17 00:00:00 2001
From: Hannes Achleitner <hannes.software@gmx.at>
Date: Sun, 8 Sep 2019 09:25:54 +0200
Subject: [PATCH] Kotlin 1.3.50

---
 build.gradle                                   |  2 +-
 .../lib/resources/shares/RemoteShare.kt        | 18 +++++++++---------
 .../ShareToRemoteOperationResultParser.kt      |  6 ++++--
 3 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/build.gradle b/build.gradle
index 953e444d..27d7add3 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,7 +1,7 @@
 buildscript {
     ext {
         // Libraries
-        kotlinVersion = '1.3.21'
+        kotlinVersion = '1.3.50'
     }
 
     repositories {
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 de669db6..04b61b97 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
@@ -104,19 +104,19 @@ class RemoteShare : Parcelable, Serializable {
 
     fun readFromParcel(source: Parcel) {
         id = source.readLong()
-        shareWith = source.readString()
-        path = source.readString()
-        token = source.readString()
-        sharedWithDisplayName = source.readString()
-        sharedWithAdditionalInfo = source.readString()
-        name = source.readString()
-        shareLink = source.readString()
+        shareWith = source.readString().toString()
+        path = source.readString().toString()
+        token = source.readString().toString()
+        sharedWithDisplayName = source.readString().toString()
+        sharedWithAdditionalInfo = source.readString().toString()
+        name = source.readString().toString()
+        shareLink = source.readString().toString()
         fileSource = source.readLong()
         itemSource = source.readLong()
+        shareType = ShareType.NO_SHARED
         try {
-            shareType = ShareType.valueOf(source.readString())
+            shareType = source.readString()?.let { ShareType.valueOf(it) }
         } catch (x: IllegalArgumentException) {
-            shareType = ShareType.NO_SHARED
         }
         permissions = source.readInt()
         sharedDate = source.readLong()
diff --git a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/shares/ShareToRemoteOperationResultParser.kt b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/shares/ShareToRemoteOperationResultParser.kt
index c3e23f3f..09fc03ab 100644
--- a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/shares/ShareToRemoteOperationResultParser.kt
+++ b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/shares/ShareToRemoteOperationResultParser.kt
@@ -47,7 +47,7 @@ class ShareToRemoteOperationResultParser(private var shareXmlParser: ShareXMLPar
         }
 
         var result: RemoteOperationResult<ShareParserResult>
-        var resultData: List<RemoteShare>?
+        val resultData: List<RemoteShare>?
 
         try {
             // Parse xml response and obtain the list of shares
@@ -81,7 +81,9 @@ class ShareToRemoteOperationResultParser(private var shareXmlParser: ShareXMLPar
                             share
                         }
 
-                        result.setData(ShareParserResult(ArrayList(resultData)))
+                        if (resultData != null) {
+                            result.setData(ShareParserResult(ArrayList(resultData.toMutableList())))
+                        }
 
                     } else {
                         result = RemoteOperationResult(RemoteOperationResult.ResultCode.WRONG_SERVER_RESPONSE)