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

Merge pull request #1964 from nextcloud/bugfix/1963/handleDisabledUserStatusApp

Browse Source 
fix to load conversations when servers status app is disabled
This commit is contained in:
Marcel Hibbe 2022-05-03 12:37:11 +02:00 committed by GitHub
commit 2fc5545576
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/main/java/com/nextcloud/talk/adapters/items/ConversationItem.java
View File

@ -202,11 +202,11 @@ public class ConversationItem extends AbstractFlexibleItem<ConversationItem.Conv
holder.binding.favoriteConversationImageView.setVisibility(View.GONE);
}
if (Conversation.ConversationType.ROOM_SYSTEM != conversation.getType()) {
if (status != null && Conversation.ConversationType.ROOM_SYSTEM != conversation.getType()) {
float size = DisplayUtils.convertDpToPixel(STATUS_SIZE_IN_DP, appContext);
holder.binding.userStatusImage.setImageDrawable(new StatusDrawable(
status != null ? status.getStatus() : "",
status != null ? status.getIcon() : "",
status.getStatus(),
status.getIcon(),
size,
context.getResources().getColor(R.color.bg_default),
appContext));

8
app/src/main/java/com/nextcloud/talk/controllers/ConversationsListController.java
View File

@ -472,10 +472,14 @@ public class ConversationsListController extends BaseController implements Searc
@SuppressLint("LongLogTag")
public void fetchData() {
fetchUserStatuses();
if (CapabilitiesUtil.isUserStatusAvailable(userUtils.getCurrentUser())) {
fetchUserStatusesAndRooms();
} else {
fetchRooms();
}
}
private void fetchUserStatuses() {
private void fetchUserStatusesAndRooms() {
ncApi.getUserStatuses(credentials, ApiUtils.getUrlForUserStatuses(currentUser.getBaseUrl()))
.subscribe(new Observer<StatusesOverall>() {
@Override