mirror of
https://github.com/nextcloud/talk-android.git
synced 2024-11-21 20:45:29 +03:00
fix to show accounts from older servers in switch account dialog
if invitations were not supported, the account did not show up Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
This commit is contained in:
parent
0fe3e849bb
commit
853134176a
1 changed files with 33 additions and 16 deletions
|
@ -170,27 +170,21 @@ public class ChooseAccountDialogFragment extends DialogFragment {
|
|||
|
||||
@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 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) {
|
||||
// Creating listeners for quick-actions
|
||||
binding.currentAccount.getRoot().setOnClickListener(v -> dismiss());
|
||||
|
|
Loading…
Reference in a new issue