Merge pull request #4232 from nextcloud/backport/4231/stable-20.0

[stable-20.0] fix to show accounts from older servers in switch account dialog
nextcloud · Sep 17, 2024 · 845db1e · 845db1e
2 parents 0fe3e84 + 8531341
commit 845db1e
Showing 1 changed file with 33 additions and 16 deletions.
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
@@ -170,27 +170,21 @@ public void onSubscribe(Disposable d) {
 
                             @Override
                             public void onNext(InvitationsModel invitationsModel) {
-                                Participant participant;
-                                participant = new Participant();
-                                participant.setActorType(Participant.ActorType.USERS);
-                                participant.setActorId(userId);
-                                participant.setDisplayName(finalUserEntity.getDisplayName());
-                                userItems.add(
-                                    new AdvancedUserItem(
-                                        participant,
-                                        finalUserEntity,
-                                        null,
-                                        viewThemeUtils,
-                                        invitationsModel.getInvitations().size()
-                                    ));
-                                adapter.addListener(onSwitchItemClickListener);
-                                adapter.addListener(onSwitchItemLongClickListener);
-                                adapter.updateDataSet(userItems, false);
+                                addAccountToSwitcherList(
+                                    userId,
+                                    finalUserEntity,
+                                    invitationsModel.getInvitations().size()
+                                );
                             }
 
                             @Override
                             public void onError(@io.reactivex.annotations.NonNull Throwable e) {
                                 Log.e(TAG, "Failed to fetch invitations", e);
+                                addAccountToSwitcherList(
+                                    userId,
+                                    finalUserEntity,
+                                    0
+                                );
                             }
 
                             @Override
@@ -203,6 +197,29 @@ public void onComplete() {
         }
     }
 
+    private void addAccountToSwitcherList(
+        String userId,
+        User finalUserEntity,
+        int actionsRequiredCount
+    ) {
+        Participant participant;
+        participant = new Participant();
+        participant.setActorType(Participant.ActorType.USERS);
+        participant.setActorId(userId);
+        participant.setDisplayName(finalUserEntity.getDisplayName());
+        userItems.add(
+            new AdvancedUserItem(
+                participant,
+                finalUserEntity,
+                null,
+                viewThemeUtils,
+                actionsRequiredCount
+            ));
+        adapter.addListener(onSwitchItemClickListener);
+        adapter.addListener(onSwitchItemLongClickListener);
+        adapter.updateDataSet(userItems, false);
+    }
+
     private void setupListeners(User user) {
         // Creating listeners for quick-actions
         binding.currentAccount.getRoot().setOnClickListener(v -> dismiss());