fix unshare

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

Author: alperozturk96

app/src/main/java/com/owncloud/android/operations/UnshareOperation.java

@@ -113,6 +113,8 @@ protected RemoteOperationResult run(OwnCloudClient client) {
 
             RemoveShareRemoteOperation operation = new RemoveShareRemoteOperation(share.getRemoteId());
             result = operation.execute(client);
+            boolean isFileExists = existsFile(client, file.getRemotePath());
+            boolean isShareExists = getStorageManager().getShareById(shareId) != null;
 
             if (result.isSuccess()) {
                 // E2E: unlock folder
@@ -140,10 +142,12 @@ protected RemoteOperationResult run(OwnCloudClient client) {
 
                 getStorageManager().saveFile(file);
                 getStorageManager().removeShare(share);
-
-            } else if (result.getCode() != ResultCode.MAINTENANCE_MODE && !existsFile(client, file.getRemotePath())) {
-                // unshare failed because file was deleted before
+            } else if (result.getCode() != ResultCode.MAINTENANCE_MODE && !isFileExists) {
+                // UnShare failed because file was deleted before
                 getStorageManager().removeFile(file, true, true);
+            } else if (isShareExists && result.getCode() == ResultCode.FILE_NOT_FOUND) {
+                // UnShare failed because share was deleted before
+                getStorageManager().removeShare(share);
             }
 
         } else {

app/src/main/java/com/owncloud/android/ui/adapter/ShareeListAdapter.java

@@ -33,7 +33,9 @@
 import com.owncloud.android.utils.theme.ViewThemeUtils;
 
 import java.util.ArrayList;
+import java.util.LinkedHashSet;
 import java.util.List;
+import java.util.Set;
 
 import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.RecyclerView;
@@ -169,6 +171,7 @@ public void onBindViewHolder(@NonNull RecyclerView.ViewHolder holder, int positi
             return;
         }
 
+
         if (holder instanceof LinkShareViewHolder publicShareViewHolder) {
             publicShareViewHolder.bind(share, listener);
         } else if (holder instanceof InternalShareViewHolder internalShareViewHolder) {
@@ -204,7 +207,7 @@ public int getItemCount() {
 
     @SuppressLint("NotifyDataSetChanged")
     public void toggleShowAll() {
-        this.showAll = !this.showAll;
+        showAll = !showAll;
         notifyDataSetChanged();
     }
 
@@ -219,6 +222,12 @@ public void addShares(List<OCShare> sharesToAdd) {
         notifyDataSetChanged();
     }
 
+    @SuppressLint("NotifyDataSetChanged")
+    public void removeAll() {
+        shares.clear();
+        notifyDataSetChanged();
+    }
+
     @Override
     public void avatarGenerated(Drawable avatarDrawable, Object callContext) {
         if (callContext instanceof ImageView iv) {
@@ -273,13 +282,4 @@ protected final void sortShares() {
     public List<OCShare> getShares() {
         return shares;
     }
-
-    public void removeNewPublicShare() {
-        for (OCShare share : shares) {
-            if (share.getShareType() == ShareType.NEW_PUBLIC_LINK) {
-                shares.remove(share);
-                break;
-            }
-        }
-    }
 }

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

@@ -23,6 +23,7 @@
 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;
@@ -60,7 +61,6 @@
 import com.owncloud.android.ui.asynctasks.RetrieveHoverCardAsyncTask;
 import com.owncloud.android.ui.dialog.SharePasswordDialogFragment;
 import com.owncloud.android.ui.fragment.util.FileDetailSharingFragmentHelper;
-import com.owncloud.android.ui.fragment.util.SharePermissionManager;
 import com.owncloud.android.ui.helpers.FileOperationsHelper;
 import com.owncloud.android.utils.ClipboardUtil;
 import com.owncloud.android.utils.DisplayUtils;
@@ -69,6 +69,8 @@
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 import javax.inject.Inject;
 
@@ -105,7 +107,6 @@ public class FileDetailSharingFragment extends Fragment implements ShareeListAda
     private ShareeListAdapter internalShareeListAdapter;
 
     private ShareeListAdapter externalShareeListAdapter;
-    private final SharePermissionManager sharePermissionManager = new SharePermissionManager();
 
     @Inject UserAccountManager accountManager;
     @Inject ClientFactory clientFactory;
@@ -220,10 +221,11 @@ public void onAttach(@NonNull Context context) {
         if (!(getActivity() instanceof FileActivity)) {
             throw new IllegalArgumentException("Calling activity must be of type FileActivity");
         }
+
         try {
             onEditShareListener = (OnEditShareListener) context;
-        } catch (Exception ignored) {
-            throw new IllegalArgumentException("Calling activity must implement the interface", ignored);
+        } catch (Exception e) {
+            throw new IllegalArgumentException("Calling activity must implement the interface" + e);
         }
     }
 
@@ -523,7 +525,8 @@ public void refreshSharesFromDB() {
             DisplayUtils.showSnackMessage(getView(), getString(R.string.could_not_retrieve_shares));
             return;
         }
-        internalShareeListAdapter.getShares().clear();
+
+        internalShareeListAdapter.removeAll();
 
         // to show share with users/groups info
         List<OCShare> shares = fileDataStorageManager.getSharesWithForAFile(file.getRemotePath(),
@@ -550,25 +553,24 @@ public void refreshSharesFromDB() {
         }
 
         internalShareeListAdapter.addShares(internalShares);
+        ViewExtensionsKt.setVisibleIf(binding.sharesListInternalShowAll, internalShareeListAdapter.getShares().size() > 3);
+        addExternalAndInternalShares(externalShares);
+        ViewExtensionsKt.setVisibleIf(binding.sharesListExternalShowAll, externalShareeListAdapter.getShares().size() > 3);
+    }
 
-        ViewExtensionsKt.setVisibleIf(binding.sharesListInternalShowAll,
-                                      internalShareeListAdapter.getShares().size() > 3
-                                     );
-
-        externalShareeListAdapter.getShares().clear();
-
-        // Get public share
-        List<OCShare> publicShares = fileDataStorageManager.getSharesByPathAndType(file.getRemotePath(),
-                                                                                   ShareType.PUBLIC_LINK,
-                                                                                   "");
-
-        externalShareeListAdapter.addShares(externalShares);
-
-        externalShareeListAdapter.addShares(publicShares);
+    private void addExternalAndInternalShares(List<OCShare> externalShares) {
+        List<OCShare> publicShares = fileDataStorageManager.getSharesByPathAndType(file.getRemotePath(), ShareType.PUBLIC_LINK, "");
 
-        ViewExtensionsKt.setVisibleIf(binding.sharesListExternalShowAll,
-                                      externalShareeListAdapter.getShares().size() > 3
-                                     );
+        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);
     }
 
     private void checkContactPermission() {
@@ -656,7 +658,6 @@ public void advancedPermissions(OCShare share) {
         modifyExistingShare(share, FileDetailsSharingProcessFragment.SCREEN_TYPE_PERMISSION);
     }
 
-
     @Override
     public void sendNewEmail(OCShare share) {
         modifyExistingShare(share, FileDetailsSharingProcessFragment.SCREEN_TYPE_NOTE);

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

@@ -778,7 +778,7 @@ class FileDetailsSharingProcessFragment :
     }
 
     // region Helpers
-    private fun isFolder(): Boolean = file?.isFolder == true || share?.isFolder == true
+    private fun isFolder(): Boolean = (file?.isFolder == true || share?.isFolder == true)
 
     private fun isPublicShare(): Boolean = (shareType == ShareType.PUBLIC_LINK)
     // endregion