mirrors/nextcloud-android
1
0
Fork 0
mirror of https://github.com/nextcloud/android.git synced 2024-11-26 23:28:42 +03:00
Code Issues Projects Releases Packages Wiki Activity

Fix types after kotlin port of some library classes

Browse source 
Signed-off-by: Álvaro Brey <alvaro.brey@nextcloud.com>
This commit is contained in:
Álvaro Brey 2023-03-10 16:45:10 +01:00 committed by Andy Scherzinger
parent 5cd7b6f853
commit f07b222a1d
No known key found for this signature in database
GPG key ID: 6CADC7E3523C308B
4 changed files with 12 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
app/src/androidTest/java/com/owncloud/android/ui/fragment/FileDetailSharingFragmentIT.kt
View file

@ -43,13 +43,13 @@ import com.owncloud.android.AbstractIT
import com.owncloud.android.R
import com.owncloud.android.datamodel.OCFile
import com.owncloud.android.lib.resources.shares.OCShare
import com.owncloud.android.lib.resources.shares.OCShare.CREATE_PERMISSION_FLAG
import com.owncloud.android.lib.resources.shares.OCShare.DELETE_PERMISSION_FLAG
import com.owncloud.android.lib.resources.shares.OCShare.MAXIMUM_PERMISSIONS_FOR_FILE
import com.owncloud.android.lib.resources.shares.OCShare.MAXIMUM_PERMISSIONS_FOR_FOLDER
import com.owncloud.android.lib.resources.shares.OCShare.NO_PERMISSION
import com.owncloud.android.lib.resources.shares.OCShare.READ_PERMISSION_FLAG
import com.owncloud.android.lib.resources.shares.OCShare.SHARE_PERMISSION_FLAG
import com.owncloud.android.lib.resources.shares.OCShare.Companion.CREATE_PERMISSION_FLAG
import com.owncloud.android.lib.resources.shares.OCShare.Companion.DELETE_PERMISSION_FLAG
import com.owncloud.android.lib.resources.shares.OCShare.Companion.MAXIMUM_PERMISSIONS_FOR_FILE
import com.owncloud.android.lib.resources.shares.OCShare.Companion.MAXIMUM_PERMISSIONS_FOR_FOLDER
import com.owncloud.android.lib.resources.shares.OCShare.Companion.NO_PERMISSION
import com.owncloud.android.lib.resources.shares.OCShare.Companion.READ_PERMISSION_FLAG
import com.owncloud.android.lib.resources.shares.OCShare.Companion.SHARE_PERMISSION_FLAG
import com.owncloud.android.lib.resources.shares.ShareType
import com.owncloud.android.ui.activity.FileDisplayActivity
import com.owncloud.android.ui.fragment.util.SharingMenuHelper

4
app/src/main/java/com/owncloud/android/ui/adapter/OCShareToOCFileConverter.kt
View file

@ -38,7 +38,9 @@ object OCShareToOCFileConverter {
*/
@JvmStatic
fun buildOCFilesFromShares(shares: List<OCShare>): List<OCFile> {
val groupedByPath: Map<String, List<OCShare>> = shares.groupBy { it.path }
val groupedByPath: Map<String, List<OCShare>> = shares
.filter { it.path != null }
.groupBy { it.path!! }
return groupedByPath
.map { (path: String, shares: List<OCShare>) -> buildOcFile(path, shares) }
.sortedByDescending { it.firstShareTimestamp }

2
app/src/main/java/com/owncloud/android/ui/fragment/FileDetailsSharingProcessFragment.kt
View file

@ -146,7 +146,7 @@ class FileDetailsSharingProcessFragment :
if (it.containsKey(ARG_SHARE_TYPE)) {
shareType = it.getSerializable(ARG_SHARE_TYPE) as ShareType
} else if (share != null) {
shareType = share!!.shareType
shareType = share!!.shareType!!
}
shareProcessStep = it.getInt(ARG_SCREEN_TYPE, SCREEN_TYPE_PERMISSION)

2
build.gradle
View file

@ -8,7 +8,7 @@ buildscript {
daggerVersion = "2.45"
markwonVersion = "4.6.2"
prismVersion = "2.0.0"
androidLibraryVersion = "master-SNAPSHOT"
androidLibraryVersion = "ac2c4ff57a152675986657e900f0fb03033f060d"
mockitoVersion = "4.11.0"
mockitoKotlinVersion = "4.1.0"
mockkVersion = "1.13.3"