From 3a8b39aafb0e199bb74636382faab98ac0460eec Mon Sep 17 00:00:00 2001
From: Tamas Kozmer <tamas.kozmer@instructure.com>
Date: Mon, 10 Jul 2023 13:15:00 +0200
Subject: [PATCH 1/2] Updated version.

---
 apps/student/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/student/build.gradle b/apps/student/build.gradle
index d681217629..43afe3bf59 100644
--- a/apps/student/build.gradle
+++ b/apps/student/build.gradle
@@ -50,8 +50,8 @@ android {
         applicationId "com.instructure.candroid"
         minSdkVersion Versions.MIN_SDK
         targetSdkVersion Versions.TARGET_SDK
-        versionCode = 252
-        versionName = '6.25.0'
+        versionCode = 253
+        versionName = '6.25.1'
 
         vectorDrawables.useSupportLibrary = true
         multiDexEnabled = true

From 5c5e4c785a8a43462b26153b4e64dee99726f544 Mon Sep 17 00:00:00 2001
From: Tamas Kozmer <72397075+tamaskozmer@users.noreply.github.com>
Date: Mon, 10 Jul 2023 13:58:15 +0200
Subject: [PATCH 2/2] [MBL-16891][Student] Crash in group files #2053

refs: MBL-16891
affects: Student
release note: none
---
 .../com/instructure/student/fragment/FileListFragment.kt     | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/apps/student/src/main/java/com/instructure/student/fragment/FileListFragment.kt b/apps/student/src/main/java/com/instructure/student/fragment/FileListFragment.kt
index de46927ecc..1a99197673 100644
--- a/apps/student/src/main/java/com/instructure/student/fragment/FileListFragment.kt
+++ b/apps/student/src/main/java/com/instructure/student/fragment/FileListFragment.kt
@@ -83,7 +83,10 @@ class FileListFragment : ParentFragment(), Bookmarkable, FileUploadDialogParent
             if (canvasContext.type == CanvasContext.Type.USER) {
                 url += "users_${canvasContext.id}/"
             }
-            url += folder?.fullName?.split(" ", limit = 2)?.get(1)?.replaceFirst("files/", "") ?: ""
+            val fullNameParts = folder?.fullName?.split("/", limit = 2)
+            if ((fullNameParts?.size ?: 0) > 1) {
+                url += fullNameParts?.get(1) ?: ""
+            }
         }
 
         return url