Merge pull request #266 from hannesa2/AndroidStudio-3.5.0

Android Studio 3.5.0
owncloud · Sep 24, 2019 · 2dcfcc2 · 2dcfcc2
2 parents 2b62387 + b66a82e
commit 2dcfcc2
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 59 deletions.
diff --git a/.classpath b/.classpath
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
diff --git a/build.gradle b/build.gradle
@@ -1,15 +1,15 @@
 buildscript {
     ext {
         // Libraries
-        kotlinVersion = '1.3.21'
+        kotlinVersion = '1.3.50'
     }
 
     repositories {
         google()
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.4.1'
+        classpath 'com.android.tools.build:gradle:3.5.0'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
         classpath "org.jetbrains.kotlin:kotlin-allopen:$kotlinVersion"
     }

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Wed Aug 17 12:51:45 CEST 2016
+#Sun Sep 08 09:13:16 CEST 2019
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.1-all.zip
diff --git a/owncloudComLibrary/build.gradle b/owncloudComLibrary/build.gradle
@@ -16,7 +16,7 @@ allOpen {
 }
 
 android {
-    compileSdkVersion 28
+    compileSdkVersion 29
 
     defaultConfig {
         minSdkVersion 19

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
@@ -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/...main/java/com/owncloud/android/lib/resources/shares/ShareToRemoteOperationResultParser.kt b/...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)