Code refactoring and unit test for PhotoAlbumEntry

Author: surinder-tsys

library/src/main/java/com/owncloud/android/lib/common/utils/WebDavFileUtils.java

@@ -18,6 +18,8 @@
 import org.apache.jackrabbit.webdav.MultiStatusResponse;
 
 import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
 
 /**
  * WebDav helper.
@@ -72,19 +74,23 @@ public ArrayList<RemoteFile> readData(MultiStatus remoteData,
      *                   retrieved.
      * @return
      */
-    public ArrayList<RemoteFile> readAlbumData(MultiStatus remoteData, OwnCloudClient client) {
-        String url = client.getBaseUri() + "/remote.php/dav/photos/" + client.getUserId();
+    public List<RemoteFile> readAlbumData(MultiStatus remoteData, OwnCloudClient client) {
+        String baseUrl = client.getBaseUri() + "/remote.php/dav/photos/" + client.getUserId();
+        String encodedPath = Uri.parse(baseUrl).getEncodedPath();
+        if (encodedPath == null) {
+            return Collections.emptyList();
+        }
 
-        ArrayList<RemoteFile> mFolderAndFiles = new ArrayList<>();
+        List<RemoteFile> files = new ArrayList<>();
+        final var responses = remoteData.getResponses();
 
-        // loop to update every child
         // reading from 1 as 0th item will be just the root album path
-        for (int i = 1; i < remoteData.getResponses().length; ++i) {
-            /// new OCFile instance with the data from the server
-            WebdavEntry we = new WebdavEntry(remoteData.getResponses()[i], Uri.parse(url).getEncodedPath());
-            RemoteFile remoteFile = new RemoteFile(we);
-            mFolderAndFiles.add(remoteFile);
+        for (int i = 1; i < responses.length; i++) {
+            WebdavEntry entry = new WebdavEntry(responses[i], encodedPath);
+            RemoteFile remoteFile = new RemoteFile(entry);
+            files.add(remoteFile);
         }
-        return mFolderAndFiles;
+
+        return files;
     }
 }

library/src/main/java/com/owncloud/android/lib/resources/albums/PhotoAlbumEntry.kt

@@ -66,41 +66,26 @@ class PhotoAlbumEntry(response: MultiStatusResponse) {
 
     val albumName: String
         get() {
-            var href = href
-            if (href.isEmpty()) {
-                return ""
-            }
-
-            // Remove trailing slash if present
-            if (href.endsWith("/")) {
-                href = href.substring(0, href.length - 1)
-            }
-
-            // Split and return last part
-            val parts = href.split("/".toRegex()).dropLastWhile { it.isEmpty() }.toTypedArray()
-            return if (parts.isNotEmpty()) parts[parts.size - 1] else ""
+            return href
+                .removeSuffix("/")
+                .substringAfterLast("/")
+                .takeIf { it.isNotEmpty() } ?: ""
         }
 
     val createdDate: String
         get() {
-            val jsonRange = dateRange
             val currentDate = Date(System.currentTimeMillis())
-            if (jsonRange.isNullOrEmpty()) {
-                return dateFormat.format(currentDate)
-            }
 
-            try {
-                val obj = JSONObject(jsonRange)
+            return try {
+                val obj = JSONObject(dateRange ?: return dateFormat.format(currentDate))
                 val startTimestamp = obj.optLong("start", 0)
-
-                if (startTimestamp > 0) {
-                    val date = Date(startTimestamp * 1000L) // Convert to milliseconds
-                    return dateFormat.format(date)
-                }
+                if (startTimestamp > 0)
+                    dateFormat.format(Date(startTimestamp * 1000L))
+                else
+                    dateFormat.format(currentDate)
             } catch (e: JSONException) {
                 e.printStackTrace()
-                return dateFormat.format(currentDate)
+                dateFormat.format(currentDate)
             }
-            return dateFormat.format(currentDate)
         }
 }

library/src/main/java/com/owncloud/android/lib/resources/albums/ReadAlbumItemsRemoteOperation.java

@@ -57,7 +57,7 @@ protected RemoteOperationResult<List<RemoteFile>> run(OwnCloudClient client) {
             if (isSuccess) {
                 // get data from remote folder
                 MultiStatus dataInServer = query.getResponseBodyAsMultiStatus();
-                ArrayList<RemoteFile> mFolderAndFiles = new WebDavFileUtils().readAlbumData(dataInServer, client);
+                List<RemoteFile> mFolderAndFiles = new WebDavFileUtils().readAlbumData(dataInServer, client);
 
                 // Result of the operation
                 result = new RemoteOperationResult<>(true, query);

library/src/test/java/com/owncloud/android/lib/resources/albums/PhotoAlbumEntryTest.kt

@@ -0,0 +1,57 @@
+/*
+ * Nextcloud Android Library
+ *
+ * SPDX-FileCopyrightText: 2025 TSI-mc <surinder.kumar@t-systems.com>
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+
+package com.owncloud.android.lib.resources.albums
+
+import org.apache.jackrabbit.webdav.MultiStatusResponse
+import org.junit.Assert.assertEquals
+import org.junit.Test
+
+class PhotoAlbumEntryTest {
+
+    @Test
+    fun testAlbumName_withTrailingSlash() {
+        val entry = createTestEntry("/remote.php/dav/photos/user_id/albums/vacation2024/")
+        assertEquals("vacation2024", entry.albumName)
+    }
+
+    @Test
+    fun testAlbumName_withoutTrailingSlash() {
+        val entry = createTestEntry("/remote.php/dav/photos/user_id/albums/vacation2024")
+        assertEquals("vacation2024", entry.albumName)
+    }
+
+    @Test
+    fun testAlbumName_nestedPath() {
+        val entry = createTestEntry("/remote.php/dav/photos/user_id/albums/travel/europe/")
+        assertEquals("europe", entry.albumName)
+    }
+
+    @Test
+    fun testAlbumName_singleSlash() {
+        val entry = createTestEntry("/")
+        assertEquals("", entry.albumName)
+    }
+
+    @Test
+    fun testAlbumName_onlySlashes() {
+        val entry = createTestEntry("///")
+        assertEquals("", entry.albumName)
+    }
+
+    @Test
+    fun testAlbumName_noSlash() {
+        val entry = createTestEntry("holiday")
+        assertEquals("holiday", entry.albumName)
+    }
+
+    // Helper method to create a stub entry
+    private fun createTestEntry(href: String): PhotoAlbumEntry {
+        val response = MultiStatusResponse(href, 200)
+        return PhotoAlbumEntry(response)
+    }
+}