mirror of
https://github.com/nextcloud/talk-android
synced 2025-02-02 20:53:09 +00:00
delete parsing of unused permissions
add getter,setter,hashCode,toString for "permissions" in Conversation.java Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
This commit is contained in:
parent
36383dfcc6
commit
96721a2df6
@ -114,16 +114,6 @@ public class Conversation {
|
|||||||
@JsonField(name = "permissions")
|
@JsonField(name = "permissions")
|
||||||
public int 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() {
|
public boolean isPublic() {
|
||||||
return (ConversationType.ROOM_PUBLIC_CALL.equals(type));
|
return (ConversationType.ROOM_PUBLIC_CALL.equals(type));
|
||||||
}
|
}
|
||||||
@ -294,6 +284,10 @@ public class Conversation {
|
|||||||
|
|
||||||
public Integer getNotificationCalls() { return notificationCalls; }
|
public Integer getNotificationCalls() { return notificationCalls; }
|
||||||
|
|
||||||
|
public int getPermissions() {
|
||||||
|
return permissions;
|
||||||
|
}
|
||||||
|
|
||||||
public void setRoomId(String roomId) {
|
public void setRoomId(String roomId) {
|
||||||
this.roomId = roomId;
|
this.roomId = roomId;
|
||||||
}
|
}
|
||||||
@ -411,6 +405,9 @@ public class Conversation {
|
|||||||
this.unreadMentionDirect = unreadMentionDirect;
|
this.unreadMentionDirect = unreadMentionDirect;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public void setPermissions(int permissions) {
|
||||||
|
this.permissions = permissions;
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean equals(Object o) {
|
public boolean equals(Object o) {
|
||||||
@ -513,6 +510,9 @@ public class Conversation {
|
|||||||
if (!Objects.equals(notificationCalls, that.notificationCalls)) {
|
if (!Objects.equals(notificationCalls, that.notificationCalls)) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
if (permissions != that.permissions) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
return Objects.equals(canDeleteConversation, that.canDeleteConversation);
|
return Objects.equals(canDeleteConversation, that.canDeleteConversation);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -553,6 +553,7 @@ public class Conversation {
|
|||||||
result = 31 * result + (canLeaveConversation != null ? canLeaveConversation.hashCode() : 0);
|
result = 31 * result + (canLeaveConversation != null ? canLeaveConversation.hashCode() : 0);
|
||||||
result = 31 * result + (canDeleteConversation != null ? canDeleteConversation.hashCode() : 0);
|
result = 31 * result + (canDeleteConversation != null ? canDeleteConversation.hashCode() : 0);
|
||||||
result = 31 * result + (notificationCalls != null ? notificationCalls.hashCode() : 0);
|
result = 31 * result + (notificationCalls != null ? notificationCalls.hashCode() : 0);
|
||||||
|
result = 31 * result + permissions;
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -590,6 +591,7 @@ public class Conversation {
|
|||||||
", canLeaveConversation=" + canLeaveConversation +
|
", canLeaveConversation=" + canLeaveConversation +
|
||||||
", canDeleteConversation=" + canDeleteConversation +
|
", canDeleteConversation=" + canDeleteConversation +
|
||||||
", notificationCalls=" + notificationCalls +
|
", notificationCalls=" + notificationCalls +
|
||||||
|
", permissions=" + permissions +
|
||||||
'}';
|
'}';
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -87,12 +87,6 @@ public class Participant {
|
|||||||
@JsonField(name = "statusMessage")
|
@JsonField(name = "statusMessage")
|
||||||
public String statusMessage;
|
public String statusMessage;
|
||||||
|
|
||||||
@JsonField(name = "permissions")
|
|
||||||
public int permissions;
|
|
||||||
|
|
||||||
@JsonField(name = "attendeePermissions")
|
|
||||||
public int attendeePermissions;
|
|
||||||
|
|
||||||
public String source;
|
public String source;
|
||||||
|
|
||||||
public boolean selected;
|
public boolean selected;
|
||||||
|
Loading…
Reference in New Issue
Block a user