Merge pull request #11446 from nextcloud/chore/lib-delombok-updates

Fix types after kotlin port of some library classes

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

@@ -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

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

@@ -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 }

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

@@ -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)