mergeDistinctByToken

Signed-off-by: alperozturk <alper_ozturk@proton.me>

Author: alperozturk96

app/src/main/java/com/nextcloud/utils/OCShareExtensions.kt

@@ -13,3 +13,7 @@ import com.owncloud.android.lib.resources.shares.ShareType
 fun OCShare.hasFileRequestPermission(): Boolean {
     return (isFolder && (shareType == ShareType.PUBLIC_LINK || shareType == ShareType.EMAIL))
 }
+
+fun List<OCShare>.mergeDistinctByToken(other: List<OCShare>): List<OCShare> {
+    return (this + other).distinctBy { it.token }
+}

app/src/main/java/com/owncloud/android/ui/fragment/FileDetailSharingFragment.java

@@ -23,7 +23,6 @@
 import android.database.Cursor;
 import android.graphics.drawable.Drawable;
 import android.net.Uri;
-import android.os.Build;
 import android.os.Bundle;
 import android.provider.ContactsContract;
 import android.text.InputType;
@@ -36,6 +35,7 @@
 import com.nextcloud.client.account.UserAccountManager;
 import com.nextcloud.client.di.Injectable;
 import com.nextcloud.client.network.ClientFactory;
+import com.nextcloud.utils.OCShareExtensionsKt;
 import com.nextcloud.utils.extensions.BundleExtensionsKt;
 import com.nextcloud.utils.extensions.FileExtensionsKt;
 import com.nextcloud.utils.extensions.ViewExtensionsKt;
@@ -69,8 +69,6 @@
 
 import java.util.ArrayList;
 import java.util.List;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
 
 import javax.inject.Inject;
 
@@ -559,18 +557,10 @@ public void refreshSharesFromDB() {
     }
 
     private void addExternalAndInternalShares(List<OCShare> externalShares) {
-        List<OCShare> publicShares = fileDataStorageManager.getSharesByPathAndType(file.getRemotePath(), ShareType.PUBLIC_LINK, "");
-
+        final var publicShares = fileDataStorageManager.getSharesByPathAndType(file.getRemotePath(), ShareType.PUBLIC_LINK, "");
         externalShareeListAdapter.removeAll();
-        Stream<OCShare> combinedStream = Stream.concat(externalShares.stream(), publicShares.stream())
-            .distinct();
-        List<OCShare> combinedShares;
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE) {
-            combinedShares = combinedStream.toList();
-        } else {
-            combinedShares = combinedStream.collect(Collectors.toList());
-        }
-        externalShareeListAdapter.addShares(combinedShares);
+        final var shares = OCShareExtensionsKt.mergeDistinctByToken(externalShares, publicShares);
+        externalShareeListAdapter.addShares(shares);
     }
 
     private void checkContactPermission() {

app/src/main/java/com/owncloud/android/ui/fragment/QuickSharingPermissionsBottomSheetDialog.java

@@ -22,7 +22,6 @@
 import com.owncloud.android.databinding.QuickSharingPermissionsBottomSheetFragmentBinding;
 import com.owncloud.android.datamodel.quickPermission.QuickPermission;
 import com.owncloud.android.lib.resources.shares.OCShare;
-import com.owncloud.android.lib.resources.shares.ShareType;
 import com.owncloud.android.ui.activity.FileActivity;
 import com.owncloud.android.ui.adapter.QuickSharingPermissionsAdapter;
 import com.owncloud.android.ui.fragment.util.SharingMenuHelper;