mirrors/nextcloud-talk-android
1
0
Fork 0
mirror of https://github.com/nextcloud/talk-android.git synced 2024-11-25 14:35:40 +03:00
Code Issues Projects Releases Packages Wiki Activity

fix to show accounts from older servers in switch account dialog

Browse source 
if invitations were not supported, the account did not show up

Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
This commit is contained in:
Marcel Hibbe 2024-09-17 11:30:36 +02:00 committed by backportbot[bot]
parent 0fe3e849bb
commit 853134176a
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());