gronod/talk-android
1
0
Fork 1
mirror of https://github.com/nextcloud/talk-android synced 2025-06-20 12:09:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4231 from nextcloud/bugfix/noid/fixToShowAccountsFromOlderServers

Browse Source 
fix to show accounts from older servers in switch account dialog
This commit is contained in:
Marcel Hibbe 2024-09-17 11:43:33 +02:00 committed by GitHub
commit e66dc4d805
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 33 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
app/src/main/java/com/nextcloud/talk/ui/dialog/ChooseAccountDialogFragment.java
View File

@ -170,27 +170,21 @@ public class ChooseAccountDialogFragment extends DialogFragment {
@Override @Override
public void onNext(InvitationsModel invitationsModel) { public void onNext(InvitationsModel invitationsModel) {
Participant participant; addAccountToSwitcherList(
participant = new Participant(); userId,
participant.setActorType(Participant.ActorType.USERS); finalUserEntity,
participant.setActorId(userId); invitationsModel.getInvitations().size()
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);
} }
@Override @Override
public void onError(@io.reactivex.annotations.NonNull Throwable e) { public void onError(@io.reactivex.annotations.NonNull Throwable e) {
Log.e(TAG, "Failed to fetch invitations", e); Log.e(TAG, "Failed to fetch invitations", e);
addAccountToSwitcherList(
userId,
finalUserEntity,
0
);
} }
@Override @Override
@ -203,6 +197,29 @@ public class ChooseAccountDialogFragment extends DialogFragment {
} }
} }
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) { private void setupListeners(User user) {
// Creating listeners for quick-actions // Creating listeners for quick-actions
binding.currentAccount.getRoot().setOnClickListener(v -> dismiss()); binding.currentAccount.getRoot().setOnClickListener(v -> dismiss());