Skip to content

[stable-3.24] Shows favorite state in share overview #11293

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
AlvaroBrey merged 1 commit into from
Jan 25, 2023
Merged

[stable-3.24] Shows favorite state in share overview #11293

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions app/src/main/java/com/owncloud/android/ui/adapter/OCShareToOCFileConverter.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@ object OCShareToOCFileConverter {
// don't have file length or mod timestamp
fileLength = -1
modificationTimestamp = -1
isFavorite = firstShare.isFavorite
}
if (shares.any { it.shareType in listOf(ShareType.PUBLIC_LINK, ShareType.EMAIL) }) {
file.isSharedViaLink = true
Expand Down
43 changes: 23 additions & 20 deletions app/src/test/java/com/owncloud/android/ui/adapter/OCShareToOCFileConverterTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ package com.owncloud.android.ui.adapter

import com.owncloud.android.lib.resources.shares.OCShare
import com.owncloud.android.lib.resources.shares.ShareType
import org.junit.Assert
import org.junit.Assert.assertEquals
import org.junit.Test

class OCShareToOCFileConverterTest {
Expand All @@ -34,16 +34,18 @@ class OCShareToOCFileConverterTest {
OCShare("/foo")
.apply {
shareType = ShareType.PUBLIC_LINK
isFavorite = true
}
)

val result = OCShareToOCFileConverter.buildOCFilesFromShares(shares)

Assert.assertEquals("Wrong file list size", 1, result.size)
assertEquals("Wrong file list size", 1, result.size)
val ocFile = result[0]
Assert.assertEquals("Wrong file path", "/foo", ocFile.remotePath)
Assert.assertEquals("File should have link attribute", true, ocFile.isSharedViaLink)
Assert.assertEquals("File should not have sharee attribute", false, ocFile.isSharedWithSharee)
assertEquals("Wrong file path", "/foo", ocFile.remotePath)
assertEquals("File should have link attribute", true, ocFile.isSharedViaLink)
assertEquals("File should not have sharee attribute", false, ocFile.isSharedWithSharee)
assertEquals("Wrong favorite status", true, ocFile.isFavorite)
}

@Test
Expand All @@ -70,13 +72,14 @@ class OCShareToOCFileConverterTest {

val result = OCShareToOCFileConverter.buildOCFilesFromShares(shares)

Assert.assertEquals("Wrong file list size", 1, result.size)
assertEquals("Wrong file list size", 1, result.size)
val ocFile = result[0]
Assert.assertEquals("Wrong file path", "/foo", ocFile.remotePath)
Assert.assertEquals("File should have link attribute", true, ocFile.isSharedViaLink)
Assert.assertEquals("File should have sharee attribute", true, ocFile.isSharedWithSharee)
Assert.assertEquals("Wrong name of sharees", 1, ocFile.sharees.size)
Assert.assertEquals("Wrong shared timestamp", 10000, ocFile.firstShareTimestamp)
assertEquals("Wrong file path", "/foo", ocFile.remotePath)
assertEquals("File should have link attribute", true, ocFile.isSharedViaLink)
assertEquals("File should have sharee attribute", true, ocFile.isSharedWithSharee)
assertEquals("Wrong name of sharees", 1, ocFile.sharees.size)
assertEquals("Wrong shared timestamp", 10000, ocFile.firstShareTimestamp)
assertEquals("Wrong favorite status", false, ocFile.isFavorite)
}

@Test
Expand Down Expand Up @@ -112,18 +115,18 @@ class OCShareToOCFileConverterTest {

val result = OCShareToOCFileConverter.buildOCFilesFromShares(shares)

Assert.assertEquals("Wrong file list size", 2, result.size)
assertEquals("Wrong file list size", 2, result.size)

val ocFile = result[0]
Assert.assertEquals("Wrong file path", "/foo", ocFile.remotePath)
Assert.assertEquals("File should have no link attribute", false, ocFile.isSharedViaLink)
Assert.assertEquals("File should have sharee attribute", true, ocFile.isSharedWithSharee)
Assert.assertEquals("Wrong name of sharees", 3, ocFile.sharees.size)
Assert.assertEquals("Wrong shared timestamp", 10000, ocFile.firstShareTimestamp)
assertEquals("Wrong file path", "/foo", ocFile.remotePath)
assertEquals("File should have no link attribute", false, ocFile.isSharedViaLink)
assertEquals("File should have sharee attribute", true, ocFile.isSharedWithSharee)
assertEquals("Wrong name of sharees", 3, ocFile.sharees.size)
assertEquals("Wrong shared timestamp", 10000, ocFile.firstShareTimestamp)

val ocFile2 = result[1]
Assert.assertEquals("Wrong file path", "/bar", ocFile2.remotePath)
Assert.assertEquals("File should have link attribute", true, ocFile2.isSharedViaLink)
Assert.assertEquals("File should have no sharee attribute", false, ocFile2.isSharedWithSharee)
assertEquals("Wrong file path", "/bar", ocFile2.remotePath)
assertEquals("File should have link attribute", true, ocFile2.isSharedViaLink)
assertEquals("File should have no sharee attribute", false, ocFile2.isSharedWithSharee)
}
}