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

delete parsing of unused permissions

Browse Source 
add getter,setter,hashCode,toString for "permissions" in Conversation.java

Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
This commit is contained in:
Marcel Hibbe 2022-05-10 17:48:08 +02:00
parent 36383dfcc6
commit 96721a2df6
No known key found for this signature in database
GPG Key ID: C793F8B59F43CE7B
2 changed files with 12 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
app/src/main/java/com/nextcloud/talk/models/json/conversations/Conversation.java
View File

@ -114,16 +114,6 @@ public class Conversation {
@JsonField(name = "permissions")
public int permissions;
@JsonField(name = "attendeePermissions")
public int attendeePermissions;
@JsonField(name = "callPermissions")
public int callPermissions;
@JsonField(name = "defaultPermissions")
public int defaultPermissions;
public boolean isPublic() {
return (ConversationType.ROOM_PUBLIC_CALL.equals(type));
}
@ -294,6 +284,10 @@ public class Conversation {
public Integer getNotificationCalls() { return notificationCalls; }
public int getPermissions() {
return permissions;
}
public void setRoomId(String roomId) {
this.roomId = roomId;
}
@ -411,6 +405,9 @@ public class Conversation {
this.unreadMentionDirect = unreadMentionDirect;
}
public void setPermissions(int permissions) {
this.permissions = permissions;
}
@Override
public boolean equals(Object o) {
@ -513,6 +510,9 @@ public class Conversation {
if (!Objects.equals(notificationCalls, that.notificationCalls)) {
return false;
}
if (permissions != that.permissions) {
return false;
}
return Objects.equals(canDeleteConversation, that.canDeleteConversation);
}
@ -553,6 +553,7 @@ public class Conversation {
result = 31 * result + (canLeaveConversation != null ? canLeaveConversation.hashCode() : 0);
result = 31 * result + (canDeleteConversation != null ? canDeleteConversation.hashCode() : 0);
result = 31 * result + (notificationCalls != null ? notificationCalls.hashCode() : 0);
result = 31 * result + permissions;
return result;
}
@ -590,6 +591,7 @@ public class Conversation {
", canLeaveConversation=" + canLeaveConversation +
", canDeleteConversation=" + canDeleteConversation +
", notificationCalls=" + notificationCalls +
", permissions=" + permissions +
'}';
}

6
app/src/main/java/com/nextcloud/talk/models/json/participants/Participant.java
View File

@ -87,12 +87,6 @@ public class Participant {
@JsonField(name = "statusMessage")
public String statusMessage;
@JsonField(name = "permissions")
public int permissions;
@JsonField(name = "attendeePermissions")
public int attendeePermissions;
public String source;
public boolean selected;