From 480122d6486cb9f29e93ade2b37c14c3d0a7a0ca Mon Sep 17 00:00:00 2001 From: Andy Scherzinger Date: Mon, 18 Jul 2022 18:48:27 +0200 Subject: [PATCH] rename entity to user Signed-off-by: Andy Scherzinger --- .../com/nextcloud/talk/adapters/items/AdvancedUserItem.java | 2 +- .../com/nextcloud/talk/controllers/SwitchAccountController.kt | 2 +- .../nextcloud/talk/ui/dialog/ChooseAccountDialogFragment.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/com/nextcloud/talk/adapters/items/AdvancedUserItem.java b/app/src/main/java/com/nextcloud/talk/adapters/items/AdvancedUserItem.java index 73cf34613..a7b49be04 100644 --- a/app/src/main/java/com/nextcloud/talk/adapters/items/AdvancedUserItem.java +++ b/app/src/main/java/com/nextcloud/talk/adapters/items/AdvancedUserItem.java @@ -82,7 +82,7 @@ public class AdvancedUserItem extends AbstractFlexibleItem if (userItems.size > position) { - val user = (userItems[position] as AdvancedUserItem).entity + val user = (userItems[position] as AdvancedUserItem).user if (userManager.setUserAsActive(user).blockingGet()) { cookieManager.cookieStore.removeAll() diff --git a/app/src/main/java/com/nextcloud/talk/ui/dialog/ChooseAccountDialogFragment.java b/app/src/main/java/com/nextcloud/talk/ui/dialog/ChooseAccountDialogFragment.java index c56689640..c78db0e4c 100644 --- a/app/src/main/java/com/nextcloud/talk/ui/dialog/ChooseAccountDialogFragment.java +++ b/app/src/main/java/com/nextcloud/talk/ui/dialog/ChooseAccountDialogFragment.java @@ -275,7 +275,7 @@ public class ChooseAccountDialogFragment extends DialogFragment { @Override public boolean onItemClick(View view, int position) { if (userItems.size() > position) { - User user = (userItems.get(position)).getEntity(); + User user = (userItems.get(position)).getUser(); if (userManager.setUserAsActive(user).blockingGet()) { cookieManager.getCookieStore().removeAll();