From 38909fde268119d22fcc7021ef733e5bd2776168 Mon Sep 17 00:00:00 2001
From: Stefan Niedermann <info@niedermann.it>
Date: Sat, 24 Apr 2021 12:13:27 +0200
Subject: Improve handling of account deletions

---
 .../notes/manageaccounts/ManageAccountAdapter.java      | 17 +++--------------
 1 file changed, 3 insertions(+), 14 deletions(-)

(limited to 'app/src/main/java/it/niedermann/owncloud/notes/manageaccounts/ManageAccountAdapter.java')

diff --git a/app/src/main/java/it/niedermann/owncloud/notes/manageaccounts/ManageAccountAdapter.java b/app/src/main/java/it/niedermann/owncloud/notes/manageaccounts/ManageAccountAdapter.java
index 1c84a7fc..87cffe2e 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/manageaccounts/ManageAccountAdapter.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/manageaccounts/ManageAccountAdapter.java
@@ -22,10 +22,10 @@ public class ManageAccountAdapter extends RecyclerView.Adapter<ManageAccountView
     private final List<Account> localAccounts = new ArrayList<>();
     @NonNull
     private final Consumer<Account> onAccountClick;
-    @Nullable
+    @NonNull
     private final Consumer<Account> onAccountDelete;
 
-    public ManageAccountAdapter(@NonNull Consumer<Account> onAccountClick, @Nullable Consumer<Account> onAccountDelete) {
+    public ManageAccountAdapter(@NonNull Consumer<Account> onAccountClick, @NonNull Consumer<Account> onAccountDelete) {
         this.onAccountClick = onAccountClick;
         this.onAccountDelete = onAccountDelete;
         setHasStableIds(true);
@@ -48,18 +48,7 @@ public class ManageAccountAdapter extends RecyclerView.Adapter<ManageAccountView
         holder.bind(localAccount, (localAccountClicked) -> {
             setCurrentLocalAccount(localAccountClicked);
             onAccountClick.accept(localAccountClicked);
-        }, (localAccountToDelete -> {
-            if (onAccountDelete != null) {
-                for (int i = 0; i < localAccounts.size(); i++) {
-                    if (localAccounts.get(i).getId() == localAccountToDelete.getId()) {
-                        localAccounts.remove(i);
-                        notifyItemRemoved(i);
-                        break;
-                    }
-                }
-                onAccountDelete.accept(localAccountToDelete);
-            }
-        }), currentLocalAccount != null && currentLocalAccount.getId() == localAccount.getId());
+        }, onAccountDelete, currentLocalAccount != null && currentLocalAccount.getId() == localAccount.getId());
     }
 
     @Override
-- 
cgit v1.2.3