Handle new webdav path on redirects

Previously redirects with new webdav paths resulted in an
IndexOutOfBoundsException as String.substring() was called with a -1
index.

Signed-off-by: Luca Weiss <[email protected]>

Author: z3ntu

src/main/java/com/nextcloud/common/NextcloudClient.kt

@@ -133,7 +133,11 @@ class NextcloudClient(var baseUri: Uri,
                 }
 
                 if (destination != null) {
-                    val suffixIndex = location.lastIndexOf(AccountUtils.WEBDAV_PATH_4_0)
+                    var suffixIndex = location.lastIndexOf(AccountUtils.WEBDAV_PATH_4_0)
+                    if (suffixIndex == -1) {
+                        suffixIndex = location.lastIndexOf(AccountUtils.WEBDAV_PATH_9_0)
+                    }
+                    check (suffixIndex != -1) { "Failed to find webdav substring in $location" }
                     val redirectionBase = location.substring(0, suffixIndex)
                     val destinationStr = destination
                     val destinationPath = destinationStr.substring(baseUri.toString().length)

src/main/java/com/owncloud/android/lib/common/OwnCloudClient.java

@@ -269,6 +269,12 @@ public RedirectionPath followRedirection(HttpMethod method) throws IOException {
                 }
                 if (destination != null) {
                     int suffixIndex = locationStr.lastIndexOf(AccountUtils.WEBDAV_PATH_4_0);
+                    if (suffixIndex == -1) {
+                        suffixIndex = locationStr.lastIndexOf(AccountUtils.WEBDAV_PATH_9_0);
+                    }
+                    if (suffixIndex == -1) {
+                        throw new IllegalStateException("Failed to find webdav substring in " + locationStr);
+                    }
                     String redirectionBase = locationStr.substring(0, suffixIndex);
 
                     String destinationStr = destination.getValue();