gronod/talk-android
1
0
Fork 1
mirror of https://github.com/nextcloud/talk-android synced 2025-06-20 03:59:35 +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,6 +170,38 @@ public class ChooseAccountDialogFragment extends DialogFragment {
@Override @Override
public void onNext(InvitationsModel invitationsModel) { public void onNext(InvitationsModel invitationsModel) {
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
public void onComplete() {
// no actions atm
}
});
}
}
}
}
private void addAccountToSwitcherList(
String userId,
User finalUserEntity,
int actionsRequiredCount
) {
Participant participant; Participant participant;
participant = new Participant(); participant = new Participant();
participant.setActorType(Participant.ActorType.USERS); participant.setActorType(Participant.ActorType.USERS);
@ -181,28 +213,13 @@ public class ChooseAccountDialogFragment extends DialogFragment {
finalUserEntity, finalUserEntity,
null, null,
viewThemeUtils, viewThemeUtils,
invitationsModel.getInvitations().size() actionsRequiredCount
)); ));
adapter.addListener(onSwitchItemClickListener); adapter.addListener(onSwitchItemClickListener);
adapter.addListener(onSwitchItemLongClickListener); adapter.addListener(onSwitchItemLongClickListener);
adapter.updateDataSet(userItems, false); adapter.updateDataSet(userItems, false);
} }
@Override
public void onError(@io.reactivex.annotations.NonNull Throwable e) {
Log.e(TAG, "Failed to fetch invitations", e);
}
@Override
public void onComplete() {
// no actions atm
}
});
}
}
}
}
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());