diff --git a/app/src/main/java/com/nextcloud/talk/components/filebrowser/models/BrowserFile.java b/app/src/main/java/com/nextcloud/talk/components/filebrowser/models/BrowserFile.java
index 026373a2c..c57549951 100644
--- a/app/src/main/java/com/nextcloud/talk/components/filebrowser/models/BrowserFile.java
+++ b/app/src/main/java/com/nextcloud/talk/components/filebrowser/models/BrowserFile.java
@@ -60,9 +60,6 @@ public class BrowserFile {
     public String permissions;
     private boolean isAllowedToReShare = false;
 
-    public BrowserFile() {
-    }
-
     public static BrowserFile getModelFromResponse(Response response, String remotePath) {
         BrowserFile browserFile = new BrowserFile();
         browserFile.setPath(Uri.decode(remotePath));
@@ -273,10 +270,8 @@ public class BrowserFile {
         if (this$permissions == null ? other$permissions != null : !this$permissions.equals(other$permissions)) {
             return false;
         }
-        if (this.isAllowedToReShare() != other.isAllowedToReShare()) {
-            return false;
-        }
-        return true;
+
+        return this.isAllowedToReShare() == other.isAllowedToReShare();
     }
 
     protected boolean canEqual(final Object other) {
diff --git a/app/src/main/java/com/nextcloud/talk/components/filebrowser/models/DavResponse.java b/app/src/main/java/com/nextcloud/talk/components/filebrowser/models/DavResponse.java
index 7b277b218..55d26e608 100644
--- a/app/src/main/java/com/nextcloud/talk/components/filebrowser/models/DavResponse.java
+++ b/app/src/main/java/com/nextcloud/talk/components/filebrowser/models/DavResponse.java
@@ -26,9 +26,6 @@ public class DavResponse {
     public Response response;
     public Object data;
 
-    public DavResponse() {
-    }
-
     public Response getResponse() {
         return this.response;
     }
@@ -63,10 +60,8 @@ public class DavResponse {
         }
         final Object this$data = this.getData();
         final Object other$data = other.getData();
-        if (this$data == null ? other$data != null : !this$data.equals(other$data)) {
-            return false;
-        }
-        return true;
+
+        return this$data == null ? other$data == null : this$data.equals(other$data);
     }
 
     protected boolean canEqual(final Object other) {
diff --git a/app/src/main/java/com/nextcloud/talk/events/BottomSheetLockEvent.java b/app/src/main/java/com/nextcloud/talk/events/BottomSheetLockEvent.java
index e5bf4b84d..b9c61e487 100644
--- a/app/src/main/java/com/nextcloud/talk/events/BottomSheetLockEvent.java
+++ b/app/src/main/java/com/nextcloud/talk/events/BottomSheetLockEvent.java
@@ -91,10 +91,8 @@ public class BottomSheetLockEvent {
         if (this.isCancel() != other.isCancel()) {
             return false;
         }
-        if (this.isDismissView() != other.isDismissView()) {
-            return false;
-        }
-        return true;
+
+        return this.isDismissView() == other.isDismissView();
     }
 
     protected boolean canEqual(final Object other) {
diff --git a/app/src/main/java/com/nextcloud/talk/events/ConfigurationChangeEvent.java b/app/src/main/java/com/nextcloud/talk/events/ConfigurationChangeEvent.java
index bb58558e8..751073356 100644
--- a/app/src/main/java/com/nextcloud/talk/events/ConfigurationChangeEvent.java
+++ b/app/src/main/java/com/nextcloud/talk/events/ConfigurationChangeEvent.java
@@ -21,9 +21,6 @@
 package com.nextcloud.talk.events;
 
 public class ConfigurationChangeEvent {
-    public ConfigurationChangeEvent() {
-    }
-
     public boolean equals(final Object o) {
         if (o == this) {
             return true;
@@ -32,10 +29,8 @@ public class ConfigurationChangeEvent {
             return false;
         }
         final ConfigurationChangeEvent other = (ConfigurationChangeEvent) o;
-        if (!other.canEqual((Object) this)) {
-            return false;
-        }
-        return true;
+
+        return other.canEqual((Object) this);
     }
 
     protected boolean canEqual(final Object other) {
@@ -43,8 +38,7 @@ public class ConfigurationChangeEvent {
     }
 
     public int hashCode() {
-        int result = 1;
-        return result;
+        return 1;
     }
 
     public String toString() {
diff --git a/app/src/main/java/com/nextcloud/talk/events/EventStatus.java b/app/src/main/java/com/nextcloud/talk/events/EventStatus.java
index d0adeac7f..70f0a392a 100644
--- a/app/src/main/java/com/nextcloud/talk/events/EventStatus.java
+++ b/app/src/main/java/com/nextcloud/talk/events/EventStatus.java
@@ -74,10 +74,8 @@ public class EventStatus {
         if (this$eventType == null ? other$eventType != null : !this$eventType.equals(other$eventType)) {
             return false;
         }
-        if (this.isAllGood() != other.isAllGood()) {
-            return false;
-        }
-        return true;
+
+        return this.isAllGood() == other.isAllGood();
     }
 
     protected boolean canEqual(final Object other) {
diff --git a/app/src/main/java/com/nextcloud/talk/events/MediaStreamEvent.java b/app/src/main/java/com/nextcloud/talk/events/MediaStreamEvent.java
index 23b0ca84d..9db02e2b4 100644
--- a/app/src/main/java/com/nextcloud/talk/events/MediaStreamEvent.java
+++ b/app/src/main/java/com/nextcloud/talk/events/MediaStreamEvent.java
@@ -70,10 +70,8 @@ public class MediaStreamEvent {
         }
         final Object this$videoStreamType = this.getVideoStreamType();
         final Object other$videoStreamType = other.getVideoStreamType();
-        if (this$videoStreamType == null ? other$videoStreamType != null : !this$videoStreamType.equals(other$videoStreamType)) {
-            return false;
-        }
-        return true;
+
+        return this$videoStreamType == null ? other$videoStreamType == null : this$videoStreamType.equals(other$videoStreamType);
     }
 
     protected boolean canEqual(final Object other) {
diff --git a/app/src/main/java/com/nextcloud/talk/events/MoreMenuClickEvent.java b/app/src/main/java/com/nextcloud/talk/events/MoreMenuClickEvent.java
index 6b15ae856..38d452a79 100644
--- a/app/src/main/java/com/nextcloud/talk/events/MoreMenuClickEvent.java
+++ b/app/src/main/java/com/nextcloud/talk/events/MoreMenuClickEvent.java
@@ -46,10 +46,8 @@ public class MoreMenuClickEvent {
         }
         final Object this$conversation = this.getConversation();
         final Object other$conversation = other.getConversation();
-        if (this$conversation == null ? other$conversation != null : !this$conversation.equals(other$conversation)) {
-            return false;
-        }
-        return true;
+
+        return this$conversation == null ? other$conversation == null : this$conversation.equals(other$conversation);
     }
 
     protected boolean canEqual(final Object other) {
diff --git a/app/src/main/java/com/nextcloud/talk/events/NetworkEvent.java b/app/src/main/java/com/nextcloud/talk/events/NetworkEvent.java
index e54ca6547..2167c92c4 100644
--- a/app/src/main/java/com/nextcloud/talk/events/NetworkEvent.java
+++ b/app/src/main/java/com/nextcloud/talk/events/NetworkEvent.java
@@ -21,6 +21,12 @@
 package com.nextcloud.talk.events;
 
 public class NetworkEvent {
+    private final NetworkConnectionEvent networkConnectionEvent;
+
+    public NetworkEvent(NetworkConnectionEvent networkConnectionEvent) {
+        this.networkConnectionEvent = networkConnectionEvent;
+    }
+
     public NetworkConnectionEvent getNetworkConnectionEvent() {
         return this.networkConnectionEvent;
     }
@@ -38,10 +44,8 @@ public class NetworkEvent {
         }
         final Object this$networkConnectionEvent = this.getNetworkConnectionEvent();
         final Object other$networkConnectionEvent = other.getNetworkConnectionEvent();
-        if (this$networkConnectionEvent == null ? other$networkConnectionEvent != null : !this$networkConnectionEvent.equals(other$networkConnectionEvent)) {
-            return false;
-        }
-        return true;
+
+        return this$networkConnectionEvent == null ? other$networkConnectionEvent == null : this$networkConnectionEvent.equals(other$networkConnectionEvent);
     }
 
     protected boolean canEqual(final Object other) {
@@ -63,10 +67,4 @@ public class NetworkEvent {
     public enum NetworkConnectionEvent {
         NETWORK_CONNECTED, NETWORK_DISCONNECTED
     }
-
-    private final NetworkConnectionEvent networkConnectionEvent;
-
-    public NetworkEvent(NetworkConnectionEvent networkConnectionEvent) {
-        this.networkConnectionEvent = networkConnectionEvent;
-    }
 }
diff --git a/app/src/main/java/com/nextcloud/talk/events/PeerConnectionEvent.java b/app/src/main/java/com/nextcloud/talk/events/PeerConnectionEvent.java
index 0e83e3110..4e48929f7 100644
--- a/app/src/main/java/com/nextcloud/talk/events/PeerConnectionEvent.java
+++ b/app/src/main/java/com/nextcloud/talk/events/PeerConnectionEvent.java
@@ -91,10 +91,8 @@ public class PeerConnectionEvent {
         }
         final Object this$videoStreamType = this.getVideoStreamType();
         final Object other$videoStreamType = other.getVideoStreamType();
-        if (this$videoStreamType == null ? other$videoStreamType != null : !this$videoStreamType.equals(other$videoStreamType)) {
-            return false;
-        }
-        return true;
+
+        return this$videoStreamType == null ? other$videoStreamType == null : this$videoStreamType.equals(other$videoStreamType);
     }
 
     protected boolean canEqual(final Object other) {
diff --git a/app/src/main/java/com/nextcloud/talk/events/SessionDescriptionSendEvent.java b/app/src/main/java/com/nextcloud/talk/events/SessionDescriptionSendEvent.java
index c6030f49b..f6fa43e71 100644
--- a/app/src/main/java/com/nextcloud/talk/events/SessionDescriptionSendEvent.java
+++ b/app/src/main/java/com/nextcloud/talk/events/SessionDescriptionSendEvent.java
@@ -99,10 +99,8 @@ public class SessionDescriptionSendEvent {
         }
         final Object this$videoStreamType = this.getVideoStreamType();
         final Object other$videoStreamType = other.getVideoStreamType();
-        if (this$videoStreamType == null ? other$videoStreamType != null : !this$videoStreamType.equals(other$videoStreamType)) {
-            return false;
-        }
-        return true;
+
+        return this$videoStreamType == null ? other$videoStreamType == null : this$videoStreamType.equals(other$videoStreamType);
     }
 
     protected boolean canEqual(final Object other) {
diff --git a/app/src/main/java/com/nextcloud/talk/events/UserMentionClickEvent.java b/app/src/main/java/com/nextcloud/talk/events/UserMentionClickEvent.java
index 8e3d0f087..467a18412 100644
--- a/app/src/main/java/com/nextcloud/talk/events/UserMentionClickEvent.java
+++ b/app/src/main/java/com/nextcloud/talk/events/UserMentionClickEvent.java
@@ -44,10 +44,8 @@ public class UserMentionClickEvent {
         }
         final Object this$userId = this.getUserId();
         final Object other$userId = other.getUserId();
-        if (this$userId == null ? other$userId != null : !this$userId.equals(other$userId)) {
-            return false;
-        }
-        return true;
+
+        return this$userId == null ? other$userId == null : this$userId.equals(other$userId);
     }
 
     protected boolean canEqual(final Object other) {
diff --git a/app/src/main/java/com/nextcloud/talk/events/WebSocketCommunicationEvent.java b/app/src/main/java/com/nextcloud/talk/events/WebSocketCommunicationEvent.java
index 1a31582c1..532869e9f 100644
--- a/app/src/main/java/com/nextcloud/talk/events/WebSocketCommunicationEvent.java
+++ b/app/src/main/java/com/nextcloud/talk/events/WebSocketCommunicationEvent.java
@@ -61,10 +61,8 @@ public class WebSocketCommunicationEvent {
         }
         final Object this$hashMap = this.getHashMap();
         final Object other$hashMap = other.getHashMap();
-        if (this$hashMap == null ? other$hashMap != null : !this$hashMap.equals(other$hashMap)) {
-            return false;
-        }
-        return true;
+
+        return this$hashMap == null ? other$hashMap == null : this$hashMap.equals(other$hashMap);
     }
 
     protected boolean canEqual(final Object other) {
diff --git a/app/src/main/java/com/nextcloud/talk/models/ExternalSignalingServer.java b/app/src/main/java/com/nextcloud/talk/models/ExternalSignalingServer.java
index 095a5cb3f..4c16b5ddc 100644
--- a/app/src/main/java/com/nextcloud/talk/models/ExternalSignalingServer.java
+++ b/app/src/main/java/com/nextcloud/talk/models/ExternalSignalingServer.java
@@ -33,9 +33,6 @@ public class ExternalSignalingServer {
     @JsonField(name = "externalSignalingTicket")
     String externalSignalingTicket;
 
-    public ExternalSignalingServer() {
-    }
-
     public String getExternalSignalingServer() {
         return this.externalSignalingServer;
     }
@@ -70,10 +67,8 @@ public class ExternalSignalingServer {
         }
         final Object this$externalSignalingTicket = this.getExternalSignalingTicket();
         final Object other$externalSignalingTicket = other.getExternalSignalingTicket();
-        if (this$externalSignalingTicket == null ? other$externalSignalingTicket != null : !this$externalSignalingTicket.equals(other$externalSignalingTicket)) {
-            return false;
-        }
-        return true;
+
+        return this$externalSignalingTicket == null ? other$externalSignalingTicket == null : this$externalSignalingTicket.equals(other$externalSignalingTicket);
     }
 
     protected boolean canEqual(final Object other) {
diff --git a/app/src/main/java/com/nextcloud/talk/models/ImportAccount.java b/app/src/main/java/com/nextcloud/talk/models/ImportAccount.java
index 202ace338..56dd426d8 100644
--- a/app/src/main/java/com/nextcloud/talk/models/ImportAccount.java
+++ b/app/src/main/java/com/nextcloud/talk/models/ImportAccount.java
@@ -82,10 +82,8 @@ public class ImportAccount {
         }
         final Object this$baseUrl = this.getBaseUrl();
         final Object other$baseUrl = other.getBaseUrl();
-        if (this$baseUrl == null ? other$baseUrl != null : !this$baseUrl.equals(other$baseUrl)) {
-            return false;
-        }
-        return true;
+
+        return this$baseUrl == null ? other$baseUrl == null : this$baseUrl.equals(other$baseUrl);
     }
 
     protected boolean canEqual(final Object other) {
diff --git a/app/src/main/java/com/nextcloud/talk/models/LoginData.java b/app/src/main/java/com/nextcloud/talk/models/LoginData.java
index 203598be1..ab4fa5863 100644
--- a/app/src/main/java/com/nextcloud/talk/models/LoginData.java
+++ b/app/src/main/java/com/nextcloud/talk/models/LoginData.java
@@ -28,9 +28,6 @@ public class LoginData {
     String username;
     String token;
 
-    public LoginData() {
-    }
-
     public String getServerUrl() {
         return this.serverUrl;
     }
@@ -78,10 +75,8 @@ public class LoginData {
         }
         final Object this$token = this.getToken();
         final Object other$token = other.getToken();
-        if (this$token == null ? other$token != null : !this$token.equals(other$token)) {
-            return false;
-        }
-        return true;
+
+        return this$token == null ? other$token == null : this$token.equals(other$token);
     }
 
     protected boolean canEqual(final Object other) {
diff --git a/app/src/main/java/com/nextcloud/talk/models/RetrofitBucket.java b/app/src/main/java/com/nextcloud/talk/models/RetrofitBucket.java
index 051ac0b7a..32aeab070 100644
--- a/app/src/main/java/com/nextcloud/talk/models/RetrofitBucket.java
+++ b/app/src/main/java/com/nextcloud/talk/models/RetrofitBucket.java
@@ -28,9 +28,6 @@ public class RetrofitBucket {
     public String url;
     public Map<String, String> queryMap;
 
-    public RetrofitBucket() {
-    }
-
     public String getUrl() {
         return this.url;
     }
@@ -65,10 +62,8 @@ public class RetrofitBucket {
         }
         final Object this$queryMap = this.getQueryMap();
         final Object other$queryMap = other.getQueryMap();
-        if (this$queryMap == null ? other$queryMap != null : !this$queryMap.equals(other$queryMap)) {
-            return false;
-        }
-        return true;
+
+        return this$queryMap == null ? other$queryMap == null : this$queryMap.equals(other$queryMap);
     }
 
     protected boolean canEqual(final Object other) {
diff --git a/app/src/main/java/com/nextcloud/talk/models/RingtoneSettings.java b/app/src/main/java/com/nextcloud/talk/models/RingtoneSettings.java
index 585367bfc..b7374858c 100644
--- a/app/src/main/java/com/nextcloud/talk/models/RingtoneSettings.java
+++ b/app/src/main/java/com/nextcloud/talk/models/RingtoneSettings.java
@@ -39,9 +39,6 @@ public class RingtoneSettings {
     @JsonField(name = "ringtoneName")
     public String ringtoneName;
 
-    public RingtoneSettings() {
-    }
-
     @Nullable
     public Uri getRingtoneUri() {
         return this.ringtoneUri;
@@ -77,10 +74,8 @@ public class RingtoneSettings {
         }
         final Object this$ringtoneName = this.getRingtoneName();
         final Object other$ringtoneName = other.getRingtoneName();
-        if (this$ringtoneName == null ? other$ringtoneName != null : !this$ringtoneName.equals(other$ringtoneName)) {
-            return false;
-        }
-        return true;
+
+        return this$ringtoneName == null ? other$ringtoneName == null : this$ringtoneName.equals(other$ringtoneName);
     }
 
     protected boolean canEqual(final Object other) {
diff --git a/app/src/main/java/com/nextcloud/talk/models/SignatureVerification.java b/app/src/main/java/com/nextcloud/talk/models/SignatureVerification.java
index 1e8895027..169bf1637 100644
--- a/app/src/main/java/com/nextcloud/talk/models/SignatureVerification.java
+++ b/app/src/main/java/com/nextcloud/talk/models/SignatureVerification.java
@@ -30,9 +30,6 @@ public class SignatureVerification {
     public boolean signatureValid;
     public UserEntity userEntity;
 
-    public SignatureVerification() {
-    }
-
     public boolean isSignatureValid() {
         return this.signatureValid;
     }
@@ -65,10 +62,8 @@ public class SignatureVerification {
         }
         final Object this$userEntity = this.getUserEntity();
         final Object other$userEntity = other.getUserEntity();
-        if (this$userEntity == null ? other$userEntity != null : !this$userEntity.equals(other$userEntity)) {
-            return false;
-        }
-        return true;
+
+        return this$userEntity == null ? other$userEntity == null : this$userEntity.equals(other$userEntity);
     }
 
     protected boolean canEqual(final Object other) {
diff --git a/app/src/main/java/com/nextcloud/talk/models/json/autocomplete/AutocompleteOCS.java b/app/src/main/java/com/nextcloud/talk/models/json/autocomplete/AutocompleteOCS.java
index 4e00f6e57..c96da6c19 100644
--- a/app/src/main/java/com/nextcloud/talk/models/json/autocomplete/AutocompleteOCS.java
+++ b/app/src/main/java/com/nextcloud/talk/models/json/autocomplete/AutocompleteOCS.java
@@ -34,9 +34,6 @@ public class AutocompleteOCS extends GenericOCS {
     @JsonField(name = "data")
     List<AutocompleteUser> data;
 
-    public AutocompleteOCS() {
-    }
-
     public List<AutocompleteUser> getData() {
         return this.data;
     }
@@ -58,10 +55,8 @@ public class AutocompleteOCS extends GenericOCS {
         }
         final Object this$data = this.getData();
         final Object other$data = other.getData();
-        if (this$data == null ? other$data != null : !this$data.equals(other$data)) {
-            return false;
-        }
-        return true;
+
+        return this$data == null ? other$data == null : this$data.equals(other$data);
     }
 
     protected boolean canEqual(final Object other) {
diff --git a/app/src/main/java/com/nextcloud/talk/models/json/autocomplete/AutocompleteOverall.java b/app/src/main/java/com/nextcloud/talk/models/json/autocomplete/AutocompleteOverall.java
index 599d96eb4..b80e12567 100644
--- a/app/src/main/java/com/nextcloud/talk/models/json/autocomplete/AutocompleteOverall.java
+++ b/app/src/main/java/com/nextcloud/talk/models/json/autocomplete/AutocompleteOverall.java
@@ -31,9 +31,6 @@ public class AutocompleteOverall {
     @JsonField(name = "ocs")
     AutocompleteOCS ocs;
 
-    public AutocompleteOverall() {
-    }
-
     public AutocompleteOCS getOcs() {
         return this.ocs;
     }
@@ -55,10 +52,8 @@ public class AutocompleteOverall {
         }
         final Object this$ocs = this.getOcs();
         final Object other$ocs = other.getOcs();
-        if (this$ocs == null ? other$ocs != null : !this$ocs.equals(other$ocs)) {
-            return false;
-        }
-        return true;
+
+        return this$ocs == null ? other$ocs == null : this$ocs.equals(other$ocs);
     }
 
     protected boolean canEqual(final Object other) {
diff --git a/app/src/main/java/com/nextcloud/talk/models/json/autocomplete/AutocompleteUser.java b/app/src/main/java/com/nextcloud/talk/models/json/autocomplete/AutocompleteUser.java
index 35ac80555..3d50c9fce 100644
--- a/app/src/main/java/com/nextcloud/talk/models/json/autocomplete/AutocompleteUser.java
+++ b/app/src/main/java/com/nextcloud/talk/models/json/autocomplete/AutocompleteUser.java
@@ -37,9 +37,6 @@ public class AutocompleteUser {
     @JsonField(name = "source")
     String source;
 
-    public AutocompleteUser() {
-    }
-
     public String getId() {
         return this.id;
     }
@@ -87,10 +84,7 @@ public class AutocompleteUser {
         }
         final Object this$source = this.getSource();
         final Object other$source = other.getSource();
-        if (this$source == null ? other$source != null : !this$source.equals(other$source)) {
-            return false;
-        }
-        return true;
+        return this$source == null ? other$source == null : this$source.equals(other$source);
     }
 
     protected boolean canEqual(final Object other) {
diff --git a/app/src/main/java/com/nextcloud/talk/models/json/capabilities/Capabilities.java b/app/src/main/java/com/nextcloud/talk/models/json/capabilities/Capabilities.java
index eccd9f1a2..b6ec829e0 100644
--- a/app/src/main/java/com/nextcloud/talk/models/json/capabilities/Capabilities.java
+++ b/app/src/main/java/com/nextcloud/talk/models/json/capabilities/Capabilities.java
@@ -46,9 +46,6 @@ public class Capabilities {
     @JsonField(name = "provisioning_api")
     ProvisioningCapability provisioningCapability;
 
-    public Capabilities() {
-    }
-
     public SpreedCapability getSpreedCapability() {
         return this.spreedCapability;
     }
@@ -122,10 +119,8 @@ public class Capabilities {
         }
         final Object this$provisioningCapability = this.getProvisioningCapability();
         final Object other$provisioningCapability = other.getProvisioningCapability();
-        if (this$provisioningCapability == null ? other$provisioningCapability != null : !this$provisioningCapability.equals(other$provisioningCapability)) {
-            return false;
-        }
-        return true;
+
+        return this$provisioningCapability == null ? other$provisioningCapability == null : this$provisioningCapability.equals(other$provisioningCapability);
     }
 
     protected boolean canEqual(final Object other) {
diff --git a/app/src/main/java/com/nextcloud/talk/models/json/capabilities/CapabilitiesList.java b/app/src/main/java/com/nextcloud/talk/models/json/capabilities/CapabilitiesList.java
index 4c5771ed0..9ebb6a9b4 100644
--- a/app/src/main/java/com/nextcloud/talk/models/json/capabilities/CapabilitiesList.java
+++ b/app/src/main/java/com/nextcloud/talk/models/json/capabilities/CapabilitiesList.java
@@ -31,9 +31,6 @@ public class CapabilitiesList {
     @JsonField(name = "capabilities")
     Capabilities capabilities;
 
-    public CapabilitiesList() {
-    }
-
     public Capabilities getCapabilities() {
         return this.capabilities;
     }
@@ -55,10 +52,8 @@ public class CapabilitiesList {
         }
         final Object this$capabilities = this.getCapabilities();
         final Object other$capabilities = other.getCapabilities();
-        if (this$capabilities == null ? other$capabilities != null : !this$capabilities.equals(other$capabilities)) {
-            return false;
-        }
-        return true;
+
+        return this$capabilities == null ? other$capabilities == null : this$capabilities.equals(other$capabilities);
     }
 
     protected boolean canEqual(final Object other) {
diff --git a/app/src/main/java/com/nextcloud/talk/models/json/capabilities/CapabilitiesOCS.java b/app/src/main/java/com/nextcloud/talk/models/json/capabilities/CapabilitiesOCS.java
index e81d93bcb..40d21f812 100644
--- a/app/src/main/java/com/nextcloud/talk/models/json/capabilities/CapabilitiesOCS.java
+++ b/app/src/main/java/com/nextcloud/talk/models/json/capabilities/CapabilitiesOCS.java
@@ -31,9 +31,6 @@ public class CapabilitiesOCS extends GenericOCS {
     @JsonField(name = "data")
     CapabilitiesList data;
 
-    public CapabilitiesOCS() {
-    }
-
     public CapabilitiesList getData() {
         return this.data;
     }
@@ -55,10 +52,8 @@ public class CapabilitiesOCS extends GenericOCS {
         }
         final Object this$data = this.getData();
         final Object other$data = other.getData();
-        if (this$data == null ? other$data != null : !this$data.equals(other$data)) {
-            return false;
-        }
-        return true;
+
+        return this$data == null ? other$data == null : this$data.equals(other$data);
     }
 
     protected boolean canEqual(final Object other) {
diff --git a/app/src/main/java/com/nextcloud/talk/models/json/capabilities/CapabilitiesOverall.java b/app/src/main/java/com/nextcloud/talk/models/json/capabilities/CapabilitiesOverall.java
index 9d1b3eb9d..cec4b9a0c 100644
--- a/app/src/main/java/com/nextcloud/talk/models/json/capabilities/CapabilitiesOverall.java
+++ b/app/src/main/java/com/nextcloud/talk/models/json/capabilities/CapabilitiesOverall.java
@@ -30,9 +30,6 @@ public class CapabilitiesOverall {
     @JsonField(name = "ocs")
     CapabilitiesOCS ocs;
 
-    public CapabilitiesOverall() {
-    }
-
     public CapabilitiesOCS getOcs() {
         return this.ocs;
     }
@@ -54,10 +51,8 @@ public class CapabilitiesOverall {
         }
         final Object this$ocs = this.getOcs();
         final Object other$ocs = other.getOcs();
-        if (this$ocs == null ? other$ocs != null : !this$ocs.equals(other$ocs)) {
-            return false;
-        }
-        return true;
+
+        return this$ocs == null ? other$ocs == null : this$ocs.equals(other$ocs);
     }
 
     protected boolean canEqual(final Object other) {
diff --git a/app/src/main/java/com/nextcloud/talk/models/json/capabilities/NotificationsCapability.java b/app/src/main/java/com/nextcloud/talk/models/json/capabilities/NotificationsCapability.java
index f4f2f7847..50839b814 100644
--- a/app/src/main/java/com/nextcloud/talk/models/json/capabilities/NotificationsCapability.java
+++ b/app/src/main/java/com/nextcloud/talk/models/json/capabilities/NotificationsCapability.java
@@ -33,9 +33,6 @@ public class NotificationsCapability {
     @JsonField(name = "ocs-endpoints")
     List<String> features;
 
-    public NotificationsCapability() {
-    }
-
     public List<String> getFeatures() {
         return this.features;
     }
@@ -57,10 +54,8 @@ public class NotificationsCapability {
         }
         final Object this$features = this.getFeatures();
         final Object other$features = other.getFeatures();
-        if (this$features == null ? other$features != null : !this$features.equals(other$features)) {
-            return false;
-        }
-        return true;
+
+        return this$features == null ? other$features == null : this$features.equals(other$features);
     }
 
     protected boolean canEqual(final Object other) {
diff --git a/app/src/main/java/com/nextcloud/talk/models/json/capabilities/ProvisioningCapability.java b/app/src/main/java/com/nextcloud/talk/models/json/capabilities/ProvisioningCapability.java
index 39d2da48a..c7a1ce05e 100644
--- a/app/src/main/java/com/nextcloud/talk/models/json/capabilities/ProvisioningCapability.java
+++ b/app/src/main/java/com/nextcloud/talk/models/json/capabilities/ProvisioningCapability.java
@@ -31,9 +31,6 @@ public class ProvisioningCapability {
     @JsonField(name = "AccountPropertyScopesVersion")
     Integer accountPropertyScopesVersion;
 
-    public ProvisioningCapability() {
-    }
-
     public Integer getAccountPropertyScopesVersion() {
         return this.accountPropertyScopesVersion;
     }
@@ -55,10 +52,8 @@ public class ProvisioningCapability {
         }
         final Object this$accountPropertyScopesVersion = this.getAccountPropertyScopesVersion();
         final Object other$accountPropertyScopesVersion = other.getAccountPropertyScopesVersion();
-        if (this$accountPropertyScopesVersion == null ? other$accountPropertyScopesVersion != null : !this$accountPropertyScopesVersion.equals(other$accountPropertyScopesVersion)) {
-            return false;
-        }
-        return true;
+
+        return this$accountPropertyScopesVersion == null ? other$accountPropertyScopesVersion == null : this$accountPropertyScopesVersion.equals(other$accountPropertyScopesVersion);
     }
 
     protected boolean canEqual(final Object other) {
diff --git a/app/src/main/java/com/nextcloud/talk/models/json/capabilities/SpreedCapability.java b/app/src/main/java/com/nextcloud/talk/models/json/capabilities/SpreedCapability.java
index 79b40a0ca..55b698365 100644
--- a/app/src/main/java/com/nextcloud/talk/models/json/capabilities/SpreedCapability.java
+++ b/app/src/main/java/com/nextcloud/talk/models/json/capabilities/SpreedCapability.java
@@ -37,9 +37,6 @@ public class SpreedCapability {
     @JsonField(name = "config")
     HashMap<String, HashMap<String, String>> config;
 
-    public SpreedCapability() {
-    }
-
     public List<String> getFeatures() {
         return this.features;
     }
@@ -74,10 +71,8 @@ public class SpreedCapability {
         }
         final Object this$config = this.getConfig();
         final Object other$config = other.getConfig();
-        if (this$config == null ? other$config != null : !this$config.equals(other$config)) {
-            return false;
-        }
-        return true;
+
+        return this$config == null ? other$config == null : this$config.equals(other$config);
     }
 
     protected boolean canEqual(final Object other) {
diff --git a/app/src/main/java/com/nextcloud/talk/models/json/capabilities/ThemingCapability.java b/app/src/main/java/com/nextcloud/talk/models/json/capabilities/ThemingCapability.java
index 804a1d252..23ddb84be 100644
--- a/app/src/main/java/com/nextcloud/talk/models/json/capabilities/ThemingCapability.java
+++ b/app/src/main/java/com/nextcloud/talk/models/json/capabilities/ThemingCapability.java
@@ -58,9 +58,6 @@ public class ThemingCapability {
     @JsonField(name = "background-default")
     boolean backgroundDefault;
 
-    public ThemingCapability() {
-    }
-
     public String getName() {
         return this.name;
     }
@@ -195,10 +192,8 @@ public class ThemingCapability {
         if (this.isBackgroundPlain() != other.isBackgroundPlain()) {
             return false;
         }
-        if (this.isBackgroundDefault() != other.isBackgroundDefault()) {
-            return false;
-        }
-        return true;
+
+        return this.isBackgroundDefault() == other.isBackgroundDefault();
     }
 
     protected boolean canEqual(final Object other) {
diff --git a/app/src/main/java/com/nextcloud/talk/models/json/chat/ChatMessage.java b/app/src/main/java/com/nextcloud/talk/models/json/chat/ChatMessage.java
index f92e3d66c..8af5af9d8 100644
--- a/app/src/main/java/com/nextcloud/talk/models/json/chat/ChatMessage.java
+++ b/app/src/main/java/com/nextcloud/talk/models/json/chat/ChatMessage.java
@@ -91,9 +91,6 @@ public class ChatMessage implements IMessage, MessageContentType, MessageContent
             MessageType.SYSTEM_MESSAGE, MessageType.SINGLE_LINK_VIDEO_MESSAGE,
             MessageType.SINGLE_LINK_AUDIO_MESSAGE, MessageType.SINGLE_LINK_MESSAGE);
 
-    public ChatMessage() {
-    }
-
     private boolean hasFileAttachment() {
         if (messageParameters != null && messageParameters.size() > 0) {
             for (String key : messageParameters.keySet()) {
@@ -487,10 +484,8 @@ public class ChatMessage implements IMessage, MessageContentType, MessageContent
         }
         final Object this$messageTypesToIgnore = this.getMessageTypesToIgnore();
         final Object other$messageTypesToIgnore = other.getMessageTypesToIgnore();
-        if (this$messageTypesToIgnore == null ? other$messageTypesToIgnore != null : !this$messageTypesToIgnore.equals(other$messageTypesToIgnore)) {
-            return false;
-        }
-        return true;
+
+        return this$messageTypesToIgnore == null ? other$messageTypesToIgnore == null : this$messageTypesToIgnore.equals(other$messageTypesToIgnore);
     }
 
     protected boolean canEqual(final Object other) {
diff --git a/app/src/main/java/com/nextcloud/talk/models/json/chat/ChatOCS.java b/app/src/main/java/com/nextcloud/talk/models/json/chat/ChatOCS.java
index be5a2959b..89d09ae89 100644
--- a/app/src/main/java/com/nextcloud/talk/models/json/chat/ChatOCS.java
+++ b/app/src/main/java/com/nextcloud/talk/models/json/chat/ChatOCS.java
@@ -33,9 +33,6 @@ public class ChatOCS extends GenericOCS {
     @JsonField(name = "data")
     public List<ChatMessage> data;
 
-    public ChatOCS() {
-    }
-
     public List<ChatMessage> getData() {
         return this.data;
     }
@@ -57,10 +54,8 @@ public class ChatOCS extends GenericOCS {
         }
         final Object this$data = this.getData();
         final Object other$data = other.getData();
-        if (this$data == null ? other$data != null : !this$data.equals(other$data)) {
-            return false;
-        }
-        return true;
+
+        return this$data == null ? other$data == null : this$data.equals(other$data);
     }
 
     protected boolean canEqual(final Object other) {
diff --git a/app/src/main/java/com/nextcloud/talk/models/json/chat/ChatOCSSingleMessage.java b/app/src/main/java/com/nextcloud/talk/models/json/chat/ChatOCSSingleMessage.java
index c5678dd1d..01efaa88f 100644
--- a/app/src/main/java/com/nextcloud/talk/models/json/chat/ChatOCSSingleMessage.java
+++ b/app/src/main/java/com/nextcloud/talk/models/json/chat/ChatOCSSingleMessage.java
@@ -31,9 +31,6 @@ public class ChatOCSSingleMessage extends GenericOCS {
     @JsonField(name = "data")
     public ChatMessage data;
 
-    public ChatOCSSingleMessage() {
-    }
-
     public ChatMessage getData() {
         return this.data;
     }
@@ -55,10 +52,8 @@ public class ChatOCSSingleMessage extends GenericOCS {
         }
         final Object this$data = this.getData();
         final Object other$data = other.getData();
-        if (this$data == null ? other$data != null : !this$data.equals(other$data)) {
-            return false;
-        }
-        return true;
+
+        return this$data == null ? other$data == null : this$data.equals(other$data);
     }
 
     protected boolean canEqual(final Object other) {
diff --git a/app/src/main/java/com/nextcloud/talk/models/json/chat/ChatOverall.java b/app/src/main/java/com/nextcloud/talk/models/json/chat/ChatOverall.java
index 00493fdb8..ce1cdfd4f 100644
--- a/app/src/main/java/com/nextcloud/talk/models/json/chat/ChatOverall.java
+++ b/app/src/main/java/com/nextcloud/talk/models/json/chat/ChatOverall.java
@@ -31,9 +31,6 @@ public class ChatOverall {
     @JsonField(name = "ocs")
     public ChatOCS ocs;
 
-    public ChatOverall() {
-    }
-
     public ChatOCS getOcs() {
         return this.ocs;
     }
@@ -55,10 +52,8 @@ public class ChatOverall {
         }
         final Object this$ocs = this.getOcs();
         final Object other$ocs = other.getOcs();
-        if (this$ocs == null ? other$ocs != null : !this$ocs.equals(other$ocs)) {
-            return false;
-        }
-        return true;
+
+        return this$ocs == null ? other$ocs == null : this$ocs.equals(other$ocs);
     }
 
     protected boolean canEqual(final Object other) {
diff --git a/app/src/main/java/com/nextcloud/talk/models/json/chat/ChatOverallSingleMessage.java b/app/src/main/java/com/nextcloud/talk/models/json/chat/ChatOverallSingleMessage.java
index 7a895e4e0..ed2e04523 100644
--- a/app/src/main/java/com/nextcloud/talk/models/json/chat/ChatOverallSingleMessage.java
+++ b/app/src/main/java/com/nextcloud/talk/models/json/chat/ChatOverallSingleMessage.java
@@ -31,9 +31,6 @@ public class ChatOverallSingleMessage {
     @JsonField(name = "ocs")
     public ChatOCSSingleMessage ocs;
 
-    public ChatOverallSingleMessage() {
-    }
-
     public ChatOCSSingleMessage getOcs() {
         return this.ocs;
     }
@@ -55,10 +52,8 @@ public class ChatOverallSingleMessage {
         }
         final Object this$ocs = this.getOcs();
         final Object other$ocs = other.getOcs();
-        if (this$ocs == null ? other$ocs != null : !this$ocs.equals(other$ocs)) {
-            return false;
-        }
-        return true;
+
+        return this$ocs == null ? other$ocs == null : this$ocs.equals(other$ocs);
     }
 
     protected boolean canEqual(final Object other) {
diff --git a/app/src/main/java/com/nextcloud/talk/models/json/conversations/Conversation.java b/app/src/main/java/com/nextcloud/talk/models/json/conversations/Conversation.java
index 5a6a02d61..befa1799a 100644
--- a/app/src/main/java/com/nextcloud/talk/models/json/conversations/Conversation.java
+++ b/app/src/main/java/com/nextcloud/talk/models/json/conversations/Conversation.java
@@ -94,9 +94,6 @@ public class Conversation {
     @JsonField(name = "callFlag")
     public int callFlag;
 
-    public Conversation() {
-    }
-
     public boolean isPublic() {
         return (ConversationType.ROOM_PUBLIC_CALL.equals(type));
     }
@@ -107,7 +104,6 @@ public class Conversation {
                 Participant.ParticipantType.USER_FOLLOWING_LINK.equals(participantType));
     }
 
-
     private boolean isLockedOneToOne(UserEntity conversationUser) {
         return (getType() == ConversationType.ROOM_TYPE_ONE_TO_ONE_CALL && conversationUser.hasSpreedFeatureCapability("locked-one-to-one-rooms"));
     }
@@ -135,8 +131,8 @@ public class Conversation {
     }
 
     public boolean canLeave(UserEntity conversationUser) {
-        return !canModerate(conversationUser) || (getType() != ConversationType.ROOM_TYPE_ONE_TO_ONE_CALL && getParticipants().size() > 1);
-
+        return !canModerate(conversationUser) ||
+                (getType() != ConversationType.ROOM_TYPE_ONE_TO_ONE_CALL && getParticipants().size() > 1);
     }
 
     public String getDeleteWarningMessage() {
@@ -477,10 +473,8 @@ public class Conversation {
         if (this.getLastReadMessage() != other.getLastReadMessage()) {
             return false;
         }
-        if (this.getCallFlag() != other.getCallFlag()) {
-            return false;
-        }
-        return true;
+
+        return this.getCallFlag() == other.getCallFlag();
     }
 
     protected boolean canEqual(final Object other) {
diff --git a/app/src/main/java/com/nextcloud/talk/models/json/conversations/RoomOCS.java b/app/src/main/java/com/nextcloud/talk/models/json/conversations/RoomOCS.java
index 48242d382..a86a31802 100644
--- a/app/src/main/java/com/nextcloud/talk/models/json/conversations/RoomOCS.java
+++ b/app/src/main/java/com/nextcloud/talk/models/json/conversations/RoomOCS.java
@@ -29,9 +29,6 @@ public class RoomOCS extends GenericOCS {
     @JsonField(name = "data")
     public Conversation data;
 
-    public RoomOCS() {
-    }
-
     public Conversation getData() {
         return this.data;
     }
@@ -53,10 +50,8 @@ public class RoomOCS extends GenericOCS {
         }
         final Object this$data = this.getData();
         final Object other$data = other.getData();
-        if (this$data == null ? other$data != null : !this$data.equals(other$data)) {
-            return false;
-        }
-        return true;
+
+        return this$data == null ? other$data == null : this$data.equals(other$data);
     }
 
     protected boolean canEqual(final Object other) {
diff --git a/app/src/main/java/com/nextcloud/talk/models/json/conversations/RoomOverall.java b/app/src/main/java/com/nextcloud/talk/models/json/conversations/RoomOverall.java
index f62320126..e4c53d7cc 100644
--- a/app/src/main/java/com/nextcloud/talk/models/json/conversations/RoomOverall.java
+++ b/app/src/main/java/com/nextcloud/talk/models/json/conversations/RoomOverall.java
@@ -28,9 +28,6 @@ public class RoomOverall {
     @JsonField(name = "ocs")
     public RoomOCS ocs;
 
-    public RoomOverall() {
-    }
-
     public RoomOCS getOcs() {
         return this.ocs;
     }
@@ -52,10 +49,8 @@ public class RoomOverall {
         }
         final Object this$ocs = this.getOcs();
         final Object other$ocs = other.getOcs();
-        if (this$ocs == null ? other$ocs != null : !this$ocs.equals(other$ocs)) {
-            return false;
-        }
-        return true;
+
+        return this$ocs == null ? other$ocs == null : this$ocs.equals(other$ocs);
     }
 
     protected boolean canEqual(final Object other) {
diff --git a/app/src/main/java/com/nextcloud/talk/models/json/conversations/RoomsOCS.java b/app/src/main/java/com/nextcloud/talk/models/json/conversations/RoomsOCS.java
index 181cb2db8..58555de39 100644
--- a/app/src/main/java/com/nextcloud/talk/models/json/conversations/RoomsOCS.java
+++ b/app/src/main/java/com/nextcloud/talk/models/json/conversations/RoomsOCS.java
@@ -34,9 +34,6 @@ public class RoomsOCS extends GenericOCS {
     @JsonField(name = "data")
     public List<Conversation> data;
 
-    public RoomsOCS() {
-    }
-
     public List<Conversation> getData() {
         return this.data;
     }
@@ -58,10 +55,8 @@ public class RoomsOCS extends GenericOCS {
         }
         final Object this$data = this.getData();
         final Object other$data = other.getData();
-        if (this$data == null ? other$data != null : !this$data.equals(other$data)) {
-            return false;
-        }
-        return true;
+
+        return this$data == null ? other$data == null : this$data.equals(other$data);
     }
 
     protected boolean canEqual(final Object other) {
diff --git a/app/src/main/java/com/nextcloud/talk/models/json/conversations/RoomsOverall.java b/app/src/main/java/com/nextcloud/talk/models/json/conversations/RoomsOverall.java
index 69891687b..f8a5c6b24 100644
--- a/app/src/main/java/com/nextcloud/talk/models/json/conversations/RoomsOverall.java
+++ b/app/src/main/java/com/nextcloud/talk/models/json/conversations/RoomsOverall.java
@@ -31,9 +31,6 @@ public class RoomsOverall {
     @JsonField(name = "ocs")
     public RoomsOCS ocs;
 
-    public RoomsOverall() {
-    }
-
     public RoomsOCS getOcs() {
         return this.ocs;
     }
@@ -55,10 +52,8 @@ public class RoomsOverall {
         }
         final Object this$ocs = this.getOcs();
         final Object other$ocs = other.getOcs();
-        if (this$ocs == null ? other$ocs != null : !this$ocs.equals(other$ocs)) {
-            return false;
-        }
-        return true;
+
+        return this$ocs == null ? other$ocs == null : this$ocs.equals(other$ocs);
     }
 
     protected boolean canEqual(final Object other) {
diff --git a/app/src/main/java/com/nextcloud/talk/models/json/generic/GenericMeta.java b/app/src/main/java/com/nextcloud/talk/models/json/generic/GenericMeta.java
index 45105701c..bca1ca26f 100644
--- a/app/src/main/java/com/nextcloud/talk/models/json/generic/GenericMeta.java
+++ b/app/src/main/java/com/nextcloud/talk/models/json/generic/GenericMeta.java
@@ -37,9 +37,6 @@ public class GenericMeta {
     @JsonField(name = "message")
     public String message;
 
-    public GenericMeta() {
-    }
-
     public String getStatus() {
         return this.status;
     }
@@ -85,10 +82,8 @@ public class GenericMeta {
         }
         final Object this$message = this.getMessage();
         final Object other$message = other.getMessage();
-        if (this$message == null ? other$message != null : !this$message.equals(other$message)) {
-            return false;
-        }
-        return true;
+
+        return this$message == null ? other$message == null : this$message.equals(other$message);
     }
 
     protected boolean canEqual(final Object other) {
diff --git a/app/src/main/java/com/nextcloud/talk/models/json/generic/GenericOCS.java b/app/src/main/java/com/nextcloud/talk/models/json/generic/GenericOCS.java
index 5da62d212..c4273a5af 100644
--- a/app/src/main/java/com/nextcloud/talk/models/json/generic/GenericOCS.java
+++ b/app/src/main/java/com/nextcloud/talk/models/json/generic/GenericOCS.java
@@ -31,9 +31,6 @@ public class GenericOCS {
     @JsonField(name = "meta")
     public GenericMeta meta;
 
-    public GenericOCS() {
-    }
-
     public GenericMeta getMeta() {
         return this.meta;
     }
@@ -55,10 +52,8 @@ public class GenericOCS {
         }
         final Object this$meta = this.getMeta();
         final Object other$meta = other.getMeta();
-        if (this$meta == null ? other$meta != null : !this$meta.equals(other$meta)) {
-            return false;
-        }
-        return true;
+
+        return this$meta == null ? other$meta == null : this$meta.equals(other$meta);
     }
 
     protected boolean canEqual(final Object other) {
diff --git a/app/src/main/java/com/nextcloud/talk/models/json/generic/GenericOverall.java b/app/src/main/java/com/nextcloud/talk/models/json/generic/GenericOverall.java
index 1c8063471..012542b0e 100644
--- a/app/src/main/java/com/nextcloud/talk/models/json/generic/GenericOverall.java
+++ b/app/src/main/java/com/nextcloud/talk/models/json/generic/GenericOverall.java
@@ -31,9 +31,6 @@ public class GenericOverall {
     @JsonField(name = "ocs")
     public GenericOCS ocs;
 
-    public GenericOverall() {
-    }
-
     public GenericOCS getOcs() {
         return this.ocs;
     }
@@ -55,10 +52,8 @@ public class GenericOverall {
         }
         final Object this$ocs = this.getOcs();
         final Object other$ocs = other.getOcs();
-        if (this$ocs == null ? other$ocs != null : !this$ocs.equals(other$ocs)) {
-            return false;
-        }
-        return true;
+
+        return this$ocs == null ? other$ocs == null : this$ocs.equals(other$ocs);
     }
 
     protected boolean canEqual(final Object other) {
diff --git a/app/src/main/java/com/nextcloud/talk/models/json/generic/Status.java b/app/src/main/java/com/nextcloud/talk/models/json/generic/Status.java
index 265b0251e..29eceb139 100644
--- a/app/src/main/java/com/nextcloud/talk/models/json/generic/Status.java
+++ b/app/src/main/java/com/nextcloud/talk/models/json/generic/Status.java
@@ -49,9 +49,6 @@ public class Status {
     @JsonField(name = "productname")
     public String productName;
 
-    public Status() {
-    }
-
     public boolean isInstalled() {
         return this.installed;
     }
@@ -145,10 +142,8 @@ public class Status {
         }
         final Object this$productName = this.getProductName();
         final Object other$productName = other.getProductName();
-        if (this$productName == null ? other$productName != null : !this$productName.equals(other$productName)) {
-            return false;
-        }
-        return true;
+
+        return this$productName == null ? other$productName == null : this$productName.equals(other$productName);
     }
 
     protected boolean canEqual(final Object other) {
diff --git a/app/src/main/java/com/nextcloud/talk/models/json/mention/Mention.java b/app/src/main/java/com/nextcloud/talk/models/json/mention/Mention.java
index 763dc54dc..7770eb13f 100644
--- a/app/src/main/java/com/nextcloud/talk/models/json/mention/Mention.java
+++ b/app/src/main/java/com/nextcloud/talk/models/json/mention/Mention.java
@@ -37,9 +37,6 @@ public class Mention {
     @JsonField(name = "source")
     String source;
 
-    public Mention() {
-    }
-
     public String getId() {
         return this.id;
     }
@@ -87,10 +84,8 @@ public class Mention {
         }
         final Object this$source = this.getSource();
         final Object other$source = other.getSource();
-        if (this$source == null ? other$source != null : !this$source.equals(other$source)) {
-            return false;
-        }
-        return true;
+
+        return this$source == null ? other$source == null : this$source.equals(other$source);
     }
 
     protected boolean canEqual(final Object other) {
diff --git a/app/src/main/java/com/nextcloud/talk/models/json/mention/MentionOCS.java b/app/src/main/java/com/nextcloud/talk/models/json/mention/MentionOCS.java
index 28658345e..0d0375f46 100644
--- a/app/src/main/java/com/nextcloud/talk/models/json/mention/MentionOCS.java
+++ b/app/src/main/java/com/nextcloud/talk/models/json/mention/MentionOCS.java
@@ -33,9 +33,6 @@ public class MentionOCS extends GenericOCS {
     @JsonField(name = "data")
     List<Mention> data;
 
-    public MentionOCS() {
-    }
-
     public List<Mention> getData() {
         return this.data;
     }
@@ -57,10 +54,8 @@ public class MentionOCS extends GenericOCS {
         }
         final Object this$data = this.getData();
         final Object other$data = other.getData();
-        if (this$data == null ? other$data != null : !this$data.equals(other$data)) {
-            return false;
-        }
-        return true;
+
+        return this$data == null ? other$data == null : this$data.equals(other$data);
     }
 
     protected boolean canEqual(final Object other) {
diff --git a/app/src/main/java/com/nextcloud/talk/models/json/mention/MentionOverall.java b/app/src/main/java/com/nextcloud/talk/models/json/mention/MentionOverall.java
index ee53821e9..27e369d13 100644
--- a/app/src/main/java/com/nextcloud/talk/models/json/mention/MentionOverall.java
+++ b/app/src/main/java/com/nextcloud/talk/models/json/mention/MentionOverall.java
@@ -30,9 +30,6 @@ public class MentionOverall {
     @JsonField(name = "ocs")
     MentionOCS ocs;
 
-    public MentionOverall() {
-    }
-
     public MentionOCS getOcs() {
         return this.ocs;
     }
@@ -54,10 +51,8 @@ public class MentionOverall {
         }
         final Object this$ocs = this.getOcs();
         final Object other$ocs = other.getOcs();
-        if (this$ocs == null ? other$ocs != null : !this$ocs.equals(other$ocs)) {
-            return false;
-        }
-        return true;
+
+        return this$ocs == null ? other$ocs == null : this$ocs.equals(other$ocs);
     }
 
     protected boolean canEqual(final Object other) {
diff --git a/app/src/main/java/com/nextcloud/talk/models/json/notifications/Notification.java b/app/src/main/java/com/nextcloud/talk/models/json/notifications/Notification.java
index 61b0c7f4c..eb72656d8 100644
--- a/app/src/main/java/com/nextcloud/talk/models/json/notifications/Notification.java
+++ b/app/src/main/java/com/nextcloud/talk/models/json/notifications/Notification.java
@@ -64,9 +64,6 @@ public class Notification {
     @JsonField(name = "actions")
     List<NotificationAction> actions;
 
-    public Notification() {
-    }
-
     public String getIcon() {
         return this.icon;
     }
@@ -268,10 +265,8 @@ public class Notification {
         }
         final Object this$actions = this.getActions();
         final Object other$actions = other.getActions();
-        if (this$actions == null ? other$actions != null : !this$actions.equals(other$actions)) {
-            return false;
-        }
-        return true;
+
+        return this$actions == null ? other$actions == null : this$actions.equals(other$actions);
     }
 
     protected boolean canEqual(final Object other) {
diff --git a/app/src/main/java/com/nextcloud/talk/models/json/notifications/NotificationAction.java b/app/src/main/java/com/nextcloud/talk/models/json/notifications/NotificationAction.java
index ad969305f..5da2da200 100644
--- a/app/src/main/java/com/nextcloud/talk/models/json/notifications/NotificationAction.java
+++ b/app/src/main/java/com/nextcloud/talk/models/json/notifications/NotificationAction.java
@@ -40,9 +40,6 @@ public class NotificationAction {
     @JsonField(name = "primary")
     boolean primary;
 
-    public NotificationAction() {
-    }
-
     public String getLabel() {
         return this.label;
     }
@@ -101,10 +98,8 @@ public class NotificationAction {
         if (this$type == null ? other$type != null : !this$type.equals(other$type)) {
             return false;
         }
-        if (this.isPrimary() != other.isPrimary()) {
-            return false;
-        }
-        return true;
+
+        return this.isPrimary() == other.isPrimary();
     }
 
     protected boolean canEqual(final Object other) {
diff --git a/app/src/main/java/com/nextcloud/talk/models/json/notifications/NotificationOCS.java b/app/src/main/java/com/nextcloud/talk/models/json/notifications/NotificationOCS.java
index de24ca04a..d4418cf88 100644
--- a/app/src/main/java/com/nextcloud/talk/models/json/notifications/NotificationOCS.java
+++ b/app/src/main/java/com/nextcloud/talk/models/json/notifications/NotificationOCS.java
@@ -32,9 +32,6 @@ public class NotificationOCS extends GenericOCS {
     @JsonField(name = "data")
     Notification notification;
 
-    public NotificationOCS() {
-    }
-
     public Notification getNotification() {
         return this.notification;
     }
@@ -56,10 +53,8 @@ public class NotificationOCS extends GenericOCS {
         }
         final Object this$notification = this.getNotification();
         final Object other$notification = other.getNotification();
-        if (this$notification == null ? other$notification != null : !this$notification.equals(other$notification)) {
-            return false;
-        }
-        return true;
+
+        return this$notification == null ? other$notification == null : this$notification.equals(other$notification);
     }
 
     protected boolean canEqual(final Object other) {
diff --git a/app/src/main/java/com/nextcloud/talk/models/json/notifications/NotificationOverall.java b/app/src/main/java/com/nextcloud/talk/models/json/notifications/NotificationOverall.java
index 6de5a43df..f2a1e7d5b 100644
--- a/app/src/main/java/com/nextcloud/talk/models/json/notifications/NotificationOverall.java
+++ b/app/src/main/java/com/nextcloud/talk/models/json/notifications/NotificationOverall.java
@@ -27,9 +27,6 @@ public class NotificationOverall {
     @JsonField(name = "ocs")
     NotificationOCS ocs;
 
-    public NotificationOverall() {
-    }
-
     public NotificationOCS getOcs() {
         return this.ocs;
     }
@@ -51,10 +48,8 @@ public class NotificationOverall {
         }
         final Object this$ocs = this.getOcs();
         final Object other$ocs = other.getOcs();
-        if (this$ocs == null ? other$ocs != null : !this$ocs.equals(other$ocs)) {
-            return false;
-        }
-        return true;
+
+        return this$ocs == null ? other$ocs == null : this$ocs.equals(other$ocs);
     }
 
     protected boolean canEqual(final Object other) {
diff --git a/app/src/main/java/com/nextcloud/talk/models/json/notifications/NotificationRichObject.java b/app/src/main/java/com/nextcloud/talk/models/json/notifications/NotificationRichObject.java
index 39bdf33c6..8a5d37b61 100644
--- a/app/src/main/java/com/nextcloud/talk/models/json/notifications/NotificationRichObject.java
+++ b/app/src/main/java/com/nextcloud/talk/models/json/notifications/NotificationRichObject.java
@@ -37,9 +37,6 @@ public class NotificationRichObject {
     @JsonField(name = "name")
     String name;
 
-    public NotificationRichObject() {
-    }
-
     public String getLabel() {
         return this.label;
     }
@@ -87,10 +84,8 @@ public class NotificationRichObject {
         }
         final Object this$name = this.getName();
         final Object other$name = other.getName();
-        if (this$name == null ? other$name != null : !this$name.equals(other$name)) {
-            return false;
-        }
-        return true;
+
+        return this$name == null ? other$name == null : this$name.equals(other$name);
     }
 
     protected boolean canEqual(final Object other) {
diff --git a/app/src/main/java/com/nextcloud/talk/models/json/notifications/NotificationsOCS.java b/app/src/main/java/com/nextcloud/talk/models/json/notifications/NotificationsOCS.java
index a5f20d065..cb63693c9 100644
--- a/app/src/main/java/com/nextcloud/talk/models/json/notifications/NotificationsOCS.java
+++ b/app/src/main/java/com/nextcloud/talk/models/json/notifications/NotificationsOCS.java
@@ -34,9 +34,6 @@ public class NotificationsOCS extends GenericOCS {
     @JsonField(name = "data")
     List<Notification> notificationsList;
 
-    public NotificationsOCS() {
-    }
-
     public List<Notification> getNotificationsList() {
         return this.notificationsList;
     }
@@ -58,10 +55,8 @@ public class NotificationsOCS extends GenericOCS {
         }
         final Object this$notificationsList = this.getNotificationsList();
         final Object other$notificationsList = other.getNotificationsList();
-        if (this$notificationsList == null ? other$notificationsList != null : !this$notificationsList.equals(other$notificationsList)) {
-            return false;
-        }
-        return true;
+
+        return this$notificationsList == null ? other$notificationsList == null : this$notificationsList.equals(other$notificationsList);
     }
 
     protected boolean canEqual(final Object other) {
diff --git a/app/src/main/java/com/nextcloud/talk/models/json/notifications/NotificationsOverall.java b/app/src/main/java/com/nextcloud/talk/models/json/notifications/NotificationsOverall.java
index fbb8933b3..683ffbf26 100644
--- a/app/src/main/java/com/nextcloud/talk/models/json/notifications/NotificationsOverall.java
+++ b/app/src/main/java/com/nextcloud/talk/models/json/notifications/NotificationsOverall.java
@@ -27,9 +27,6 @@ public class NotificationsOverall {
     @JsonField(name = "ocs")
     NotificationsOCS ocs;
 
-    public NotificationsOverall() {
-    }
-
     public NotificationsOCS getOcs() {
         return this.ocs;
     }
@@ -51,10 +48,8 @@ public class NotificationsOverall {
         }
         final Object this$ocs = this.getOcs();
         final Object other$ocs = other.getOcs();
-        if (this$ocs == null ? other$ocs != null : !this$ocs.equals(other$ocs)) {
-            return false;
-        }
-        return true;
+
+        return this$ocs == null ? other$ocs == null : this$ocs.equals(other$ocs);
     }
 
     protected boolean canEqual(final Object other) {
diff --git a/app/src/main/java/com/nextcloud/talk/models/json/participants/AddParticipantOverall.java b/app/src/main/java/com/nextcloud/talk/models/json/participants/AddParticipantOverall.java
index 348d52393..0fd69701e 100644
--- a/app/src/main/java/com/nextcloud/talk/models/json/participants/AddParticipantOverall.java
+++ b/app/src/main/java/com/nextcloud/talk/models/json/participants/AddParticipantOverall.java
@@ -29,9 +29,6 @@ public class AddParticipantOverall {
     @JsonField(name = "ocs")
     RoomsOCS ocs;
 
-    public AddParticipantOverall() {
-    }
-
     public RoomsOCS getOcs() {
         return this.ocs;
     }
@@ -53,10 +50,8 @@ public class AddParticipantOverall {
         }
         final Object this$ocs = this.getOcs();
         final Object other$ocs = other.getOcs();
-        if (this$ocs == null ? other$ocs != null : !this$ocs.equals(other$ocs)) {
-            return false;
-        }
-        return true;
+
+        return this$ocs == null ? other$ocs == null : this$ocs.equals(other$ocs);
     }
 
     protected boolean canEqual(final Object other) {
diff --git a/app/src/main/java/com/nextcloud/talk/models/json/participants/Participant.java b/app/src/main/java/com/nextcloud/talk/models/json/participants/Participant.java
index cf0cc05b6..5832a0461 100644
--- a/app/src/main/java/com/nextcloud/talk/models/json/participants/Participant.java
+++ b/app/src/main/java/com/nextcloud/talk/models/json/participants/Participant.java
@@ -59,10 +59,6 @@ public class Participant {
 
     public boolean selected;
 
-    public Participant() {
-    }
-
-
     public ParticipantFlags getParticipantFlags() {
         ParticipantFlags participantFlags = ParticipantFlags.NOT_IN_CALL;
         if (inCall != null) {
@@ -212,10 +208,8 @@ public class Participant {
         if (this$source == null ? other$source != null : !this$source.equals(other$source)) {
             return false;
         }
-        if (this.isSelected() != other.isSelected()) {
-            return false;
-        }
-        return true;
+
+        return this.isSelected() == other.isSelected();
     }
 
     protected boolean canEqual(final Object other) {
diff --git a/app/src/main/java/com/nextcloud/talk/models/json/participants/ParticipantsOCS.java b/app/src/main/java/com/nextcloud/talk/models/json/participants/ParticipantsOCS.java
index 3fd00a8df..d82257fab 100644
--- a/app/src/main/java/com/nextcloud/talk/models/json/participants/ParticipantsOCS.java
+++ b/app/src/main/java/com/nextcloud/talk/models/json/participants/ParticipantsOCS.java
@@ -34,9 +34,6 @@ public class ParticipantsOCS extends GenericOCS {
     @JsonField(name = "data")
     public List<Participant> data;
 
-    public ParticipantsOCS() {
-    }
-
     public List<Participant> getData() {
         return this.data;
     }
@@ -58,10 +55,8 @@ public class ParticipantsOCS extends GenericOCS {
         }
         final Object this$data = this.getData();
         final Object other$data = other.getData();
-        if (this$data == null ? other$data != null : !this$data.equals(other$data)) {
-            return false;
-        }
-        return true;
+
+        return this$data == null ? other$data == null : this$data.equals(other$data);
     }
 
     protected boolean canEqual(final Object other) {
diff --git a/app/src/main/java/com/nextcloud/talk/models/json/participants/ParticipantsOverall.java b/app/src/main/java/com/nextcloud/talk/models/json/participants/ParticipantsOverall.java
index e57ad1e21..438a6748b 100644
--- a/app/src/main/java/com/nextcloud/talk/models/json/participants/ParticipantsOverall.java
+++ b/app/src/main/java/com/nextcloud/talk/models/json/participants/ParticipantsOverall.java
@@ -31,9 +31,6 @@ public class ParticipantsOverall {
     @JsonField(name = "ocs")
     public ParticipantsOCS ocs;
 
-    public ParticipantsOverall() {
-    }
-
     public ParticipantsOCS getOcs() {
         return this.ocs;
     }
@@ -55,10 +52,8 @@ public class ParticipantsOverall {
         }
         final Object this$ocs = this.getOcs();
         final Object other$ocs = other.getOcs();
-        if (this$ocs == null ? other$ocs != null : !this$ocs.equals(other$ocs)) {
-            return false;
-        }
-        return true;
+
+        return this$ocs == null ? other$ocs == null : this$ocs.equals(other$ocs);
     }
 
     protected boolean canEqual(final Object other) {
diff --git a/app/src/main/java/com/nextcloud/talk/models/json/push/DecryptedPushMessage.java b/app/src/main/java/com/nextcloud/talk/models/json/push/DecryptedPushMessage.java
index 0e004ec80..245bde202 100644
--- a/app/src/main/java/com/nextcloud/talk/models/json/push/DecryptedPushMessage.java
+++ b/app/src/main/java/com/nextcloud/talk/models/json/push/DecryptedPushMessage.java
@@ -59,9 +59,6 @@ public class DecryptedPushMessage {
     @JsonIgnore
     public long timestamp;
 
-    public DecryptedPushMessage() {
-    }
-
     public String getApp() {
         return this.app;
     }
@@ -192,10 +189,8 @@ public class DecryptedPushMessage {
         if (this$text == null ? other$text != null : !this$text.equals(other$text)) {
             return false;
         }
-        if (this.getTimestamp() != other.getTimestamp()) {
-            return false;
-        }
-        return true;
+
+        return this.getTimestamp() == other.getTimestamp();
     }
 
     protected boolean canEqual(final Object other) {
diff --git a/app/src/main/java/com/nextcloud/talk/models/json/push/NotificationUser.java b/app/src/main/java/com/nextcloud/talk/models/json/push/NotificationUser.java
index 9cff9e689..c1121b0cd 100644
--- a/app/src/main/java/com/nextcloud/talk/models/json/push/NotificationUser.java
+++ b/app/src/main/java/com/nextcloud/talk/models/json/push/NotificationUser.java
@@ -37,9 +37,6 @@ public class NotificationUser {
     @JsonField(name = "name")
     String name;
 
-    public NotificationUser() {
-    }
-
     public String getType() {
         return this.type;
     }
@@ -87,10 +84,8 @@ public class NotificationUser {
         }
         final Object this$name = this.getName();
         final Object other$name = other.getName();
-        if (this$name == null ? other$name != null : !this$name.equals(other$name)) {
-            return false;
-        }
-        return true;
+
+        return this$name == null ? other$name == null : this$name.equals(other$name);
     }
 
     protected boolean canEqual(final Object other) {
diff --git a/app/src/main/java/com/nextcloud/talk/models/json/push/PushConfigurationState.java b/app/src/main/java/com/nextcloud/talk/models/json/push/PushConfigurationState.java
index a692c17fa..19115b49b 100644
--- a/app/src/main/java/com/nextcloud/talk/models/json/push/PushConfigurationState.java
+++ b/app/src/main/java/com/nextcloud/talk/models/json/push/PushConfigurationState.java
@@ -43,9 +43,6 @@ public class PushConfigurationState {
     @JsonField(name = "usesRegularPass")
     public boolean usesRegularPass;
 
-    public PushConfigurationState() {
-    }
-
     public String getPushToken() {
         return this.pushToken;
     }
@@ -117,10 +114,8 @@ public class PushConfigurationState {
         if (this$userPublicKey == null ? other$userPublicKey != null : !this$userPublicKey.equals(other$userPublicKey)) {
             return false;
         }
-        if (this.isUsesRegularPass() != other.isUsesRegularPass()) {
-            return false;
-        }
-        return true;
+
+        return this.isUsesRegularPass() == other.isUsesRegularPass();
     }
 
     protected boolean canEqual(final Object other) {
diff --git a/app/src/main/java/com/nextcloud/talk/models/json/push/PushRegistration.java b/app/src/main/java/com/nextcloud/talk/models/json/push/PushRegistration.java
index 4555860e6..cca7da596 100644
--- a/app/src/main/java/com/nextcloud/talk/models/json/push/PushRegistration.java
+++ b/app/src/main/java/com/nextcloud/talk/models/json/push/PushRegistration.java
@@ -38,9 +38,6 @@ public class PushRegistration {
     @JsonField(name = "signature")
     String signature;
 
-    public PushRegistration() {
-    }
-
     public String getPublicKey() {
         return this.publicKey;
     }
@@ -88,10 +85,8 @@ public class PushRegistration {
         }
         final Object this$signature = this.getSignature();
         final Object other$signature = other.getSignature();
-        if (this$signature == null ? other$signature != null : !this$signature.equals(other$signature)) {
-            return false;
-        }
-        return true;
+
+        return this$signature == null ? other$signature == null : this$signature.equals(other$signature);
     }
 
     protected boolean canEqual(final Object other) {
diff --git a/app/src/main/java/com/nextcloud/talk/models/json/push/PushRegistrationOCS.java b/app/src/main/java/com/nextcloud/talk/models/json/push/PushRegistrationOCS.java
index f1a135bc4..4ae277ada 100644
--- a/app/src/main/java/com/nextcloud/talk/models/json/push/PushRegistrationOCS.java
+++ b/app/src/main/java/com/nextcloud/talk/models/json/push/PushRegistrationOCS.java
@@ -32,9 +32,6 @@ public class PushRegistrationOCS extends GenericOCS {
     @JsonField(name = "data")
     PushRegistration data;
 
-    public PushRegistrationOCS() {
-    }
-
     public PushRegistration getData() {
         return this.data;
     }
@@ -56,10 +53,8 @@ public class PushRegistrationOCS extends GenericOCS {
         }
         final Object this$data = this.getData();
         final Object other$data = other.getData();
-        if (this$data == null ? other$data != null : !this$data.equals(other$data)) {
-            return false;
-        }
-        return true;
+
+        return this$data == null ? other$data == null : this$data.equals(other$data);
     }
 
     protected boolean canEqual(final Object other) {
diff --git a/app/src/main/java/com/nextcloud/talk/models/json/push/PushRegistrationOverall.java b/app/src/main/java/com/nextcloud/talk/models/json/push/PushRegistrationOverall.java
index 53e8464ae..1bdd0160e 100644
--- a/app/src/main/java/com/nextcloud/talk/models/json/push/PushRegistrationOverall.java
+++ b/app/src/main/java/com/nextcloud/talk/models/json/push/PushRegistrationOverall.java
@@ -31,9 +31,6 @@ public class PushRegistrationOverall {
     @JsonField(name = "ocs")
     PushRegistrationOCS ocs;
 
-    public PushRegistrationOverall() {
-    }
-
     public PushRegistrationOCS getOcs() {
         return this.ocs;
     }
@@ -55,10 +52,8 @@ public class PushRegistrationOverall {
         }
         final Object this$ocs = this.getOcs();
         final Object other$ocs = other.getOcs();
-        if (this$ocs == null ? other$ocs != null : !this$ocs.equals(other$ocs)) {
-            return false;
-        }
-        return true;
+
+        return this$ocs == null ? other$ocs == null : this$ocs.equals(other$ocs);
     }
 
     protected boolean canEqual(final Object other) {
diff --git a/app/src/main/java/com/nextcloud/talk/models/json/search/ContactsByNumberOCS.java b/app/src/main/java/com/nextcloud/talk/models/json/search/ContactsByNumberOCS.java
index 348d007bd..6c3644377 100644
--- a/app/src/main/java/com/nextcloud/talk/models/json/search/ContactsByNumberOCS.java
+++ b/app/src/main/java/com/nextcloud/talk/models/json/search/ContactsByNumberOCS.java
@@ -35,9 +35,6 @@ public class ContactsByNumberOCS extends GenericOCS {
     @JsonField(name = "data")
     public Map<String, String> map = new HashMap();
 
-    public ContactsByNumberOCS() {
-    }
-
     public Map<String, String> getMap() {
         return this.map;
     }
@@ -59,10 +56,8 @@ public class ContactsByNumberOCS extends GenericOCS {
         }
         final Object this$map = this.getMap();
         final Object other$map = other.getMap();
-        if (this$map == null ? other$map != null : !this$map.equals(other$map)) {
-            return false;
-        }
-        return true;
+
+        return this$map == null ? other$map == null : this$map.equals(other$map);
     }
 
     protected boolean canEqual(final Object other) {
diff --git a/app/src/main/java/com/nextcloud/talk/models/json/search/ContactsByNumberOverall.java b/app/src/main/java/com/nextcloud/talk/models/json/search/ContactsByNumberOverall.java
index 4ae4e2acb..7bdc7672e 100644
--- a/app/src/main/java/com/nextcloud/talk/models/json/search/ContactsByNumberOverall.java
+++ b/app/src/main/java/com/nextcloud/talk/models/json/search/ContactsByNumberOverall.java
@@ -31,9 +31,6 @@ public class ContactsByNumberOverall {
     @JsonField(name = "ocs")
     public ContactsByNumberOCS ocs;
 
-    public ContactsByNumberOverall() {
-    }
-
     public ContactsByNumberOCS getOcs() {
         return this.ocs;
     }
@@ -55,10 +52,8 @@ public class ContactsByNumberOverall {
         }
         final Object this$ocs = this.getOcs();
         final Object other$ocs = other.getOcs();
-        if (this$ocs == null ? other$ocs != null : !this$ocs.equals(other$ocs)) {
-            return false;
-        }
-        return true;
+
+        return this$ocs == null ? other$ocs == null : this$ocs.equals(other$ocs);
     }
 
     protected boolean canEqual(final Object other) {
diff --git a/app/src/main/java/com/nextcloud/talk/models/json/sharees/ExactSharees.java b/app/src/main/java/com/nextcloud/talk/models/json/sharees/ExactSharees.java
index bf8f90230..47777628a 100644
--- a/app/src/main/java/com/nextcloud/talk/models/json/sharees/ExactSharees.java
+++ b/app/src/main/java/com/nextcloud/talk/models/json/sharees/ExactSharees.java
@@ -33,9 +33,6 @@ public class ExactSharees {
     @JsonField(name = "users")
     List<Sharee> exactSharees;
 
-    public ExactSharees() {
-    }
-
     public List<Sharee> getExactSharees() {
         return this.exactSharees;
     }
@@ -57,10 +54,8 @@ public class ExactSharees {
         }
         final Object this$exactSharees = this.getExactSharees();
         final Object other$exactSharees = other.getExactSharees();
-        if (this$exactSharees == null ? other$exactSharees != null : !this$exactSharees.equals(other$exactSharees)) {
-            return false;
-        }
-        return true;
+
+        return this$exactSharees == null ? other$exactSharees == null : this$exactSharees.equals(other$exactSharees);
     }
 
     protected boolean canEqual(final Object other) {
diff --git a/app/src/main/java/com/nextcloud/talk/models/json/sharees/Sharee.java b/app/src/main/java/com/nextcloud/talk/models/json/sharees/Sharee.java
index 2b03ba4a4..9a9385a41 100644
--- a/app/src/main/java/com/nextcloud/talk/models/json/sharees/Sharee.java
+++ b/app/src/main/java/com/nextcloud/talk/models/json/sharees/Sharee.java
@@ -37,9 +37,6 @@ public class Sharee {
     @JsonField(name = "label")
     String label;
 
-    public Sharee() {
-    }
-
     public String getId() {
         return this.id;
     }
@@ -87,10 +84,8 @@ public class Sharee {
         }
         final Object this$label = this.getLabel();
         final Object other$label = other.getLabel();
-        if (this$label == null ? other$label != null : !this$label.equals(other$label)) {
-            return false;
-        }
-        return true;
+
+        return this$label == null ? other$label == null : this$label.equals(other$label);
     }
 
     protected boolean canEqual(final Object other) {
diff --git a/app/src/main/java/com/nextcloud/talk/models/json/sharees/ShareesOCS.java b/app/src/main/java/com/nextcloud/talk/models/json/sharees/ShareesOCS.java
index 34e62f1eb..3246ae4d4 100644
--- a/app/src/main/java/com/nextcloud/talk/models/json/sharees/ShareesOCS.java
+++ b/app/src/main/java/com/nextcloud/talk/models/json/sharees/ShareesOCS.java
@@ -32,9 +32,6 @@ public class ShareesOCS extends GenericOCS {
     @JsonField(name = "data")
     SharesData data;
 
-    public ShareesOCS() {
-    }
-
     public SharesData getData() {
         return this.data;
     }
@@ -56,10 +53,8 @@ public class ShareesOCS extends GenericOCS {
         }
         final Object this$data = this.getData();
         final Object other$data = other.getData();
-        if (this$data == null ? other$data != null : !this$data.equals(other$data)) {
-            return false;
-        }
-        return true;
+
+        return this$data == null ? other$data == null : this$data.equals(other$data);
     }
 
     protected boolean canEqual(final Object other) {
diff --git a/app/src/main/java/com/nextcloud/talk/models/json/sharees/ShareesOverall.java b/app/src/main/java/com/nextcloud/talk/models/json/sharees/ShareesOverall.java
index 1cff0e73d..2047b3842 100644
--- a/app/src/main/java/com/nextcloud/talk/models/json/sharees/ShareesOverall.java
+++ b/app/src/main/java/com/nextcloud/talk/models/json/sharees/ShareesOverall.java
@@ -31,9 +31,6 @@ public class ShareesOverall {
     @JsonField(name = "ocs")
     ShareesOCS ocs;
 
-    public ShareesOverall() {
-    }
-
     public ShareesOCS getOcs() {
         return this.ocs;
     }
@@ -55,10 +52,8 @@ public class ShareesOverall {
         }
         final Object this$ocs = this.getOcs();
         final Object other$ocs = other.getOcs();
-        if (this$ocs == null ? other$ocs != null : !this$ocs.equals(other$ocs)) {
-            return false;
-        }
-        return true;
+
+        return this$ocs == null ? other$ocs == null : this$ocs.equals(other$ocs);
     }
 
     protected boolean canEqual(final Object other) {
diff --git a/app/src/main/java/com/nextcloud/talk/models/json/sharees/SharesData.java b/app/src/main/java/com/nextcloud/talk/models/json/sharees/SharesData.java
index dddcbcddf..f4eb8611f 100644
--- a/app/src/main/java/com/nextcloud/talk/models/json/sharees/SharesData.java
+++ b/app/src/main/java/com/nextcloud/talk/models/json/sharees/SharesData.java
@@ -36,9 +36,6 @@ public class SharesData {
     @JsonField(name = "exact")
     ExactSharees exactUsers;
 
-    public SharesData() {
-    }
-
     public List<Sharee> getUsers() {
         return this.users;
     }
@@ -73,10 +70,8 @@ public class SharesData {
         }
         final Object this$exactUsers = this.getExactUsers();
         final Object other$exactUsers = other.getExactUsers();
-        if (this$exactUsers == null ? other$exactUsers != null : !this$exactUsers.equals(other$exactUsers)) {
-            return false;
-        }
-        return true;
+
+        return this$exactUsers == null ? other$exactUsers == null : this$exactUsers.equals(other$exactUsers);
     }
 
     protected boolean canEqual(final Object other) {
diff --git a/app/src/main/java/com/nextcloud/talk/models/json/sharees/Value.java b/app/src/main/java/com/nextcloud/talk/models/json/sharees/Value.java
index c31cf0588..525621416 100644
--- a/app/src/main/java/com/nextcloud/talk/models/json/sharees/Value.java
+++ b/app/src/main/java/com/nextcloud/talk/models/json/sharees/Value.java
@@ -31,9 +31,6 @@ public class Value {
     @JsonField(name = "shareWith")
     String shareWith;
 
-    public Value() {
-    }
-
     public String getShareWith() {
         return this.shareWith;
     }
@@ -55,10 +52,8 @@ public class Value {
         }
         final Object this$shareWith = this.getShareWith();
         final Object other$shareWith = other.getShareWith();
-        if (this$shareWith == null ? other$shareWith != null : !this$shareWith.equals(other$shareWith)) {
-            return false;
-        }
-        return true;
+
+        return this$shareWith == null ? other$shareWith == null : this$shareWith.equals(other$shareWith);
     }
 
     protected boolean canEqual(final Object other) {
diff --git a/app/src/main/java/com/nextcloud/talk/models/json/signaling/DataChannelMessage.java b/app/src/main/java/com/nextcloud/talk/models/json/signaling/DataChannelMessage.java
index 4d39c4215..8315105bd 100644
--- a/app/src/main/java/com/nextcloud/talk/models/json/signaling/DataChannelMessage.java
+++ b/app/src/main/java/com/nextcloud/talk/models/json/signaling/DataChannelMessage.java
@@ -76,10 +76,8 @@ public class DataChannelMessage {
         }
         final Object this$payload = this.getPayload();
         final Object other$payload = other.getPayload();
-        if (this$payload == null ? other$payload != null : !this$payload.equals(other$payload)) {
-            return false;
-        }
-        return true;
+
+        return this$payload == null ? other$payload == null : this$payload.equals(other$payload);
     }
 
     protected boolean canEqual(final Object other) {
diff --git a/app/src/main/java/com/nextcloud/talk/models/json/signaling/DataChannelMessageNick.java b/app/src/main/java/com/nextcloud/talk/models/json/signaling/DataChannelMessageNick.java
index ffd655ff9..c9038868c 100644
--- a/app/src/main/java/com/nextcloud/talk/models/json/signaling/DataChannelMessageNick.java
+++ b/app/src/main/java/com/nextcloud/talk/models/json/signaling/DataChannelMessageNick.java
@@ -78,10 +78,8 @@ public class DataChannelMessageNick {
         }
         final Object this$payload = this.getPayload();
         final Object other$payload = other.getPayload();
-        if (this$payload == null ? other$payload != null : !this$payload.equals(other$payload)) {
-            return false;
-        }
-        return true;
+
+        return this$payload == null ? other$payload == null : this$payload.equals(other$payload);
     }
 
     protected boolean canEqual(final Object other) {
diff --git a/app/src/main/java/com/nextcloud/talk/models/json/signaling/NCIceCandidate.java b/app/src/main/java/com/nextcloud/talk/models/json/signaling/NCIceCandidate.java
index a881d9666..72662c581 100644
--- a/app/src/main/java/com/nextcloud/talk/models/json/signaling/NCIceCandidate.java
+++ b/app/src/main/java/com/nextcloud/talk/models/json/signaling/NCIceCandidate.java
@@ -37,9 +37,6 @@ public class NCIceCandidate {
     @JsonField(name = "candidate")
     String candidate;
 
-    public NCIceCandidate() {
-    }
-
     public int getSdpMLineIndex() {
         return this.sdpMLineIndex;
     }
@@ -85,10 +82,8 @@ public class NCIceCandidate {
         }
         final Object this$candidate = this.getCandidate();
         final Object other$candidate = other.getCandidate();
-        if (this$candidate == null ? other$candidate != null : !this$candidate.equals(other$candidate)) {
-            return false;
-        }
-        return true;
+
+        return this$candidate == null ? other$candidate == null : this$candidate.equals(other$candidate);
     }
 
     protected boolean canEqual(final Object other) {
diff --git a/app/src/main/java/com/nextcloud/talk/models/json/signaling/NCMessagePayload.java b/app/src/main/java/com/nextcloud/talk/models/json/signaling/NCMessagePayload.java
index 32383eeb1..dfb9c2897 100644
--- a/app/src/main/java/com/nextcloud/talk/models/json/signaling/NCMessagePayload.java
+++ b/app/src/main/java/com/nextcloud/talk/models/json/signaling/NCMessagePayload.java
@@ -43,9 +43,6 @@ public class NCMessagePayload {
     @JsonField(name = "name")
     String name;
 
-    public NCMessagePayload() {
-    }
-
     public String getType() {
         return this.type;
     }
@@ -119,10 +116,8 @@ public class NCMessagePayload {
         }
         final Object this$name = this.getName();
         final Object other$name = other.getName();
-        if (this$name == null ? other$name != null : !this$name.equals(other$name)) {
-            return false;
-        }
-        return true;
+
+        return this$name == null ? other$name == null : this$name.equals(other$name);
     }
 
     protected boolean canEqual(final Object other) {
diff --git a/app/src/main/java/com/nextcloud/talk/models/json/signaling/NCMessageWrapper.java b/app/src/main/java/com/nextcloud/talk/models/json/signaling/NCMessageWrapper.java
index a39891624..8beb8a32f 100644
--- a/app/src/main/java/com/nextcloud/talk/models/json/signaling/NCMessageWrapper.java
+++ b/app/src/main/java/com/nextcloud/talk/models/json/signaling/NCMessageWrapper.java
@@ -38,9 +38,6 @@ public class NCMessageWrapper {
     @JsonField(name = "sessionId")
     String sessionId;
 
-    public NCMessageWrapper() {
-    }
-
     public NCSignalingMessage getSignalingMessage() {
         return this.signalingMessage;
     }
@@ -88,10 +85,8 @@ public class NCMessageWrapper {
         }
         final Object this$sessionId = this.getSessionId();
         final Object other$sessionId = other.getSessionId();
-        if (this$sessionId == null ? other$sessionId != null : !this$sessionId.equals(other$sessionId)) {
-            return false;
-        }
-        return true;
+
+        return this$sessionId == null ? other$sessionId == null : this$sessionId.equals(other$sessionId);
     }
 
     protected boolean canEqual(final Object other) {
diff --git a/app/src/main/java/com/nextcloud/talk/models/json/signaling/NCSignalingMessage.java b/app/src/main/java/com/nextcloud/talk/models/json/signaling/NCSignalingMessage.java
index ac979dbe8..610533476 100644
--- a/app/src/main/java/com/nextcloud/talk/models/json/signaling/NCSignalingMessage.java
+++ b/app/src/main/java/com/nextcloud/talk/models/json/signaling/NCSignalingMessage.java
@@ -43,9 +43,6 @@ public class NCSignalingMessage {
     @JsonField(name = "prefix")
     String prefix;
 
-    public NCSignalingMessage() {
-    }
-
     public String getFrom() {
         return this.from;
     }
@@ -145,10 +142,8 @@ public class NCSignalingMessage {
         }
         final Object this$prefix = this.getPrefix();
         final Object other$prefix = other.getPrefix();
-        if (this$prefix == null ? other$prefix != null : !this$prefix.equals(other$prefix)) {
-            return false;
-        }
-        return true;
+
+        return this$prefix == null ? other$prefix == null : this$prefix.equals(other$prefix);
     }
 
     protected boolean canEqual(final Object other) {
diff --git a/app/src/main/java/com/nextcloud/talk/models/json/signaling/Signaling.java b/app/src/main/java/com/nextcloud/talk/models/json/signaling/Signaling.java
index bb2112e64..adfb55e12 100644
--- a/app/src/main/java/com/nextcloud/talk/models/json/signaling/Signaling.java
+++ b/app/src/main/java/com/nextcloud/talk/models/json/signaling/Signaling.java
@@ -35,9 +35,6 @@ public class Signaling {
     @JsonField(name = "data")
     Object messageWrapper;
 
-    public Signaling() {
-    }
-
     public String getType() {
         return this.type;
     }
@@ -72,10 +69,8 @@ public class Signaling {
         }
         final Object this$messageWrapper = this.getMessageWrapper();
         final Object other$messageWrapper = other.getMessageWrapper();
-        if (this$messageWrapper == null ? other$messageWrapper != null : !this$messageWrapper.equals(other$messageWrapper)) {
-            return false;
-        }
-        return true;
+
+        return this$messageWrapper == null ? other$messageWrapper == null : this$messageWrapper.equals(other$messageWrapper);
     }
 
     protected boolean canEqual(final Object other) {
diff --git a/app/src/main/java/com/nextcloud/talk/models/json/signaling/SignalingOCS.java b/app/src/main/java/com/nextcloud/talk/models/json/signaling/SignalingOCS.java
index 00d55b7c0..c060e4bf1 100644
--- a/app/src/main/java/com/nextcloud/talk/models/json/signaling/SignalingOCS.java
+++ b/app/src/main/java/com/nextcloud/talk/models/json/signaling/SignalingOCS.java
@@ -31,9 +31,6 @@ public class SignalingOCS extends GenericOCS {
     @JsonField(name = "data")
     List<Signaling> signalings;
 
-    public SignalingOCS() {
-    }
-
     public List<Signaling> getSignalings() {
         return this.signalings;
     }
@@ -55,10 +52,8 @@ public class SignalingOCS extends GenericOCS {
         }
         final Object this$signalings = this.getSignalings();
         final Object other$signalings = other.getSignalings();
-        if (this$signalings == null ? other$signalings != null : !this$signalings.equals(other$signalings)) {
-            return false;
-        }
-        return true;
+
+        return this$signalings == null ? other$signalings == null : this$signalings.equals(other$signalings);
     }
 
     protected boolean canEqual(final Object other) {
diff --git a/app/src/main/java/com/nextcloud/talk/models/json/signaling/SignalingOverall.java b/app/src/main/java/com/nextcloud/talk/models/json/signaling/SignalingOverall.java
index c8408a541..83a1df6c3 100644
--- a/app/src/main/java/com/nextcloud/talk/models/json/signaling/SignalingOverall.java
+++ b/app/src/main/java/com/nextcloud/talk/models/json/signaling/SignalingOverall.java
@@ -28,9 +28,6 @@ public class SignalingOverall {
     @JsonField(name = "ocs")
     SignalingOCS ocs;
 
-    public SignalingOverall() {
-    }
-
     public SignalingOCS getOcs() {
         return this.ocs;
     }
@@ -52,10 +49,8 @@ public class SignalingOverall {
         }
         final Object this$ocs = this.getOcs();
         final Object other$ocs = other.getOcs();
-        if (this$ocs == null ? other$ocs != null : !this$ocs.equals(other$ocs)) {
-            return false;
-        }
-        return true;
+
+        return this$ocs == null ? other$ocs == null : this$ocs.equals(other$ocs);
     }
 
     protected boolean canEqual(final Object other) {
diff --git a/app/src/main/java/com/nextcloud/talk/models/json/signaling/settings/IceServer.java b/app/src/main/java/com/nextcloud/talk/models/json/signaling/settings/IceServer.java
index 07f925715..428660e9b 100644
--- a/app/src/main/java/com/nextcloud/talk/models/json/signaling/settings/IceServer.java
+++ b/app/src/main/java/com/nextcloud/talk/models/json/signaling/settings/IceServer.java
@@ -39,9 +39,6 @@ public class IceServer {
     @JsonField(name = "credential")
     String credential;
 
-    public IceServer() {
-    }
-
     public String getUrl() {
         return this.url;
     }
@@ -102,10 +99,8 @@ public class IceServer {
         }
         final Object this$credential = this.getCredential();
         final Object other$credential = other.getCredential();
-        if (this$credential == null ? other$credential != null : !this$credential.equals(other$credential)) {
-            return false;
-        }
-        return true;
+
+        return this$credential == null ? other$credential == null : this$credential.equals(other$credential);
     }
 
     protected boolean canEqual(final Object other) {
diff --git a/app/src/main/java/com/nextcloud/talk/models/json/signaling/settings/Settings.java b/app/src/main/java/com/nextcloud/talk/models/json/signaling/settings/Settings.java
index dd8858e05..985217601 100644
--- a/app/src/main/java/com/nextcloud/talk/models/json/signaling/settings/Settings.java
+++ b/app/src/main/java/com/nextcloud/talk/models/json/signaling/settings/Settings.java
@@ -39,9 +39,6 @@ public class Settings {
     @JsonField(name = "ticket")
     String externalSignalingTicket;
 
-    public Settings() {
-    }
-
     public List<IceServer> getStunServers() {
         return this.stunServers;
     }
@@ -102,10 +99,8 @@ public class Settings {
         }
         final Object this$externalSignalingTicket = this.getExternalSignalingTicket();
         final Object other$externalSignalingTicket = other.getExternalSignalingTicket();
-        if (this$externalSignalingTicket == null ? other$externalSignalingTicket != null : !this$externalSignalingTicket.equals(other$externalSignalingTicket)) {
-            return false;
-        }
-        return true;
+
+        return this$externalSignalingTicket == null ? other$externalSignalingTicket == null : this$externalSignalingTicket.equals(other$externalSignalingTicket);
     }
 
     protected boolean canEqual(final Object other) {
diff --git a/app/src/main/java/com/nextcloud/talk/models/json/signaling/settings/SignalingSettingsOcs.java b/app/src/main/java/com/nextcloud/talk/models/json/signaling/settings/SignalingSettingsOcs.java
index bfa0aded2..477438485 100644
--- a/app/src/main/java/com/nextcloud/talk/models/json/signaling/settings/SignalingSettingsOcs.java
+++ b/app/src/main/java/com/nextcloud/talk/models/json/signaling/settings/SignalingSettingsOcs.java
@@ -29,9 +29,6 @@ public class SignalingSettingsOcs extends GenericOCS {
     @JsonField(name = "data")
     Settings settings;
 
-    public SignalingSettingsOcs() {
-    }
-
     public Settings getSettings() {
         return this.settings;
     }
@@ -53,10 +50,8 @@ public class SignalingSettingsOcs extends GenericOCS {
         }
         final Object this$settings = this.getSettings();
         final Object other$settings = other.getSettings();
-        if (this$settings == null ? other$settings != null : !this$settings.equals(other$settings)) {
-            return false;
-        }
-        return true;
+
+        return this$settings == null ? other$settings == null : this$settings.equals(other$settings);
     }
 
     protected boolean canEqual(final Object other) {
diff --git a/app/src/main/java/com/nextcloud/talk/models/json/signaling/settings/SignalingSettingsOverall.java b/app/src/main/java/com/nextcloud/talk/models/json/signaling/settings/SignalingSettingsOverall.java
index 2172fa4cf..17420876b 100644
--- a/app/src/main/java/com/nextcloud/talk/models/json/signaling/settings/SignalingSettingsOverall.java
+++ b/app/src/main/java/com/nextcloud/talk/models/json/signaling/settings/SignalingSettingsOverall.java
@@ -28,9 +28,6 @@ public class SignalingSettingsOverall {
     @JsonField(name = "ocs")
     SignalingSettingsOcs ocs;
 
-    public SignalingSettingsOverall() {
-    }
-
     public SignalingSettingsOcs getOcs() {
         return this.ocs;
     }
@@ -52,10 +49,8 @@ public class SignalingSettingsOverall {
         }
         final Object this$ocs = this.getOcs();
         final Object other$ocs = other.getOcs();
-        if (this$ocs == null ? other$ocs != null : !this$ocs.equals(other$ocs)) {
-            return false;
-        }
-        return true;
+
+        return this$ocs == null ? other$ocs == null : this$ocs.equals(other$ocs);
     }
 
     protected boolean canEqual(final Object other) {
diff --git a/app/src/main/java/com/nextcloud/talk/models/json/userprofile/UserProfileData.java b/app/src/main/java/com/nextcloud/talk/models/json/userprofile/UserProfileData.java
index 6c63f7124..5f02e9f6e 100644
--- a/app/src/main/java/com/nextcloud/talk/models/json/userprofile/UserProfileData.java
+++ b/app/src/main/java/com/nextcloud/talk/models/json/userprofile/UserProfileData.java
@@ -72,9 +72,6 @@ public class UserProfileData {
     @JsonField(name = "websiteScope", typeConverter = ScopeConverter.class)
     Scope websiteScope;
 
-    public UserProfileData() {
-    }
-
     public String getValueByField(ProfileController.Field field) {
         switch (field) {
             case EMAIL:
@@ -303,10 +300,8 @@ public class UserProfileData {
         }
         final Object this$websiteScope = this.getWebsiteScope();
         final Object other$websiteScope = other.getWebsiteScope();
-        if (this$websiteScope == null ? other$websiteScope != null : !this$websiteScope.equals(other$websiteScope)) {
-            return false;
-        }
-        return true;
+
+        return this$websiteScope == null ? other$websiteScope == null : this$websiteScope.equals(other$websiteScope);
     }
 
     protected boolean canEqual(final Object other) {
diff --git a/app/src/main/java/com/nextcloud/talk/models/json/userprofile/UserProfileFieldsOCS.java b/app/src/main/java/com/nextcloud/talk/models/json/userprofile/UserProfileFieldsOCS.java
index cdf146b7c..db7573cb2 100644
--- a/app/src/main/java/com/nextcloud/talk/models/json/userprofile/UserProfileFieldsOCS.java
+++ b/app/src/main/java/com/nextcloud/talk/models/json/userprofile/UserProfileFieldsOCS.java
@@ -34,9 +34,6 @@ public class UserProfileFieldsOCS extends GenericOCS {
     @JsonField(name = "data")
     ArrayList<String> data;
 
-    public UserProfileFieldsOCS() {
-    }
-
     public ArrayList<String> getData() {
         return this.data;
     }
@@ -65,10 +62,8 @@ public class UserProfileFieldsOCS extends GenericOCS {
         }
         final Object this$data = this.getData();
         final Object other$data = other.getData();
-        if (this$data == null ? other$data != null : !this$data.equals(other$data)) {
-            return false;
-        }
-        return true;
+
+        return this$data == null ? other$data == null : this$data.equals(other$data);
     }
 
     protected boolean canEqual(final Object other) {
diff --git a/app/src/main/java/com/nextcloud/talk/models/json/userprofile/UserProfileFieldsOverall.java b/app/src/main/java/com/nextcloud/talk/models/json/userprofile/UserProfileFieldsOverall.java
index c48b42a1c..6bb09c35d 100644
--- a/app/src/main/java/com/nextcloud/talk/models/json/userprofile/UserProfileFieldsOverall.java
+++ b/app/src/main/java/com/nextcloud/talk/models/json/userprofile/UserProfileFieldsOverall.java
@@ -31,9 +31,6 @@ public class UserProfileFieldsOverall {
     @JsonField(name = "ocs")
     UserProfileFieldsOCS ocs;
 
-    public UserProfileFieldsOverall() {
-    }
-
     public UserProfileFieldsOCS getOcs() {
         return this.ocs;
     }
@@ -55,10 +52,8 @@ public class UserProfileFieldsOverall {
         }
         final Object this$ocs = this.getOcs();
         final Object other$ocs = other.getOcs();
-        if (this$ocs == null ? other$ocs != null : !this$ocs.equals(other$ocs)) {
-            return false;
-        }
-        return true;
+
+        return this$ocs == null ? other$ocs == null : this$ocs.equals(other$ocs);
     }
 
     protected boolean canEqual(final Object other) {
diff --git a/app/src/main/java/com/nextcloud/talk/models/json/userprofile/UserProfileOCS.java b/app/src/main/java/com/nextcloud/talk/models/json/userprofile/UserProfileOCS.java
index c8704bab3..a9eaf1ec2 100644
--- a/app/src/main/java/com/nextcloud/talk/models/json/userprofile/UserProfileOCS.java
+++ b/app/src/main/java/com/nextcloud/talk/models/json/userprofile/UserProfileOCS.java
@@ -32,9 +32,6 @@ public class UserProfileOCS extends GenericOCS {
     @JsonField(name = "data")
     UserProfileData data;
 
-    public UserProfileOCS() {
-    }
-
     public UserProfileData getData() {
         return this.data;
     }
@@ -56,10 +53,8 @@ public class UserProfileOCS extends GenericOCS {
         }
         final Object this$data = this.getData();
         final Object other$data = other.getData();
-        if (this$data == null ? other$data != null : !this$data.equals(other$data)) {
-            return false;
-        }
-        return true;
+
+        return this$data == null ? other$data == null : this$data.equals(other$data);
     }
 
     protected boolean canEqual(final Object other) {
diff --git a/app/src/main/java/com/nextcloud/talk/models/json/userprofile/UserProfileOverall.java b/app/src/main/java/com/nextcloud/talk/models/json/userprofile/UserProfileOverall.java
index c2e5d7e12..78a86d5ae 100644
--- a/app/src/main/java/com/nextcloud/talk/models/json/userprofile/UserProfileOverall.java
+++ b/app/src/main/java/com/nextcloud/talk/models/json/userprofile/UserProfileOverall.java
@@ -31,9 +31,6 @@ public class UserProfileOverall {
     @JsonField(name = "ocs")
     UserProfileOCS ocs;
 
-    public UserProfileOverall() {
-    }
-
     public UserProfileOCS getOcs() {
         return this.ocs;
     }
@@ -55,10 +52,8 @@ public class UserProfileOverall {
         }
         final Object this$ocs = this.getOcs();
         final Object other$ocs = other.getOcs();
-        if (this$ocs == null ? other$ocs != null : !this$ocs.equals(other$ocs)) {
-            return false;
-        }
-        return true;
+
+        return this$ocs == null ? other$ocs == null : this$ocs.equals(other$ocs);
     }
 
     protected boolean canEqual(final Object other) {
diff --git a/app/src/main/java/com/nextcloud/talk/models/json/websocket/ActorWebSocketMessage.java b/app/src/main/java/com/nextcloud/talk/models/json/websocket/ActorWebSocketMessage.java
index 5cdb81fc3..1cc2e0678 100644
--- a/app/src/main/java/com/nextcloud/talk/models/json/websocket/ActorWebSocketMessage.java
+++ b/app/src/main/java/com/nextcloud/talk/models/json/websocket/ActorWebSocketMessage.java
@@ -37,9 +37,6 @@ public class ActorWebSocketMessage {
     @JsonField(name = "userid")
     String userid;
 
-    public ActorWebSocketMessage() {
-    }
-
     public String getType() {
         return this.type;
     }
@@ -87,10 +84,8 @@ public class ActorWebSocketMessage {
         }
         final Object this$userid = this.getUserid();
         final Object other$userid = other.getUserid();
-        if (this$userid == null ? other$userid != null : !this$userid.equals(other$userid)) {
-            return false;
-        }
-        return true;
+
+        return this$userid == null ? other$userid == null : this$userid.equals(other$userid);
     }
 
     protected boolean canEqual(final Object other) {
diff --git a/app/src/main/java/com/nextcloud/talk/models/json/websocket/AuthParametersWebSocketMessage.java b/app/src/main/java/com/nextcloud/talk/models/json/websocket/AuthParametersWebSocketMessage.java
index 436eb4660..b4366ce48 100644
--- a/app/src/main/java/com/nextcloud/talk/models/json/websocket/AuthParametersWebSocketMessage.java
+++ b/app/src/main/java/com/nextcloud/talk/models/json/websocket/AuthParametersWebSocketMessage.java
@@ -34,9 +34,6 @@ public class AuthParametersWebSocketMessage {
     @JsonField(name = "ticket")
     String ticket;
 
-    public AuthParametersWebSocketMessage() {
-    }
-
     public String getUserid() {
         return this.userid;
     }
@@ -71,10 +68,8 @@ public class AuthParametersWebSocketMessage {
         }
         final Object this$ticket = this.getTicket();
         final Object other$ticket = other.getTicket();
-        if (this$ticket == null ? other$ticket != null : !this$ticket.equals(other$ticket)) {
-            return false;
-        }
-        return true;
+
+        return this$ticket == null ? other$ticket == null : this$ticket.equals(other$ticket);
     }
 
     protected boolean canEqual(final Object other) {
diff --git a/app/src/main/java/com/nextcloud/talk/models/json/websocket/AuthWebSocketMessage.java b/app/src/main/java/com/nextcloud/talk/models/json/websocket/AuthWebSocketMessage.java
index e1c159012..2c08101fd 100644
--- a/app/src/main/java/com/nextcloud/talk/models/json/websocket/AuthWebSocketMessage.java
+++ b/app/src/main/java/com/nextcloud/talk/models/json/websocket/AuthWebSocketMessage.java
@@ -34,9 +34,6 @@ public class AuthWebSocketMessage {
     @JsonField(name = "params")
     AuthParametersWebSocketMessage authParametersWebSocketMessage;
 
-    public AuthWebSocketMessage() {
-    }
-
     public String getUrl() {
         return this.url;
     }
@@ -71,10 +68,8 @@ public class AuthWebSocketMessage {
         }
         final Object this$authParametersWebSocketMessage = this.getAuthParametersWebSocketMessage();
         final Object other$authParametersWebSocketMessage = other.getAuthParametersWebSocketMessage();
-        if (this$authParametersWebSocketMessage == null ? other$authParametersWebSocketMessage != null : !this$authParametersWebSocketMessage.equals(other$authParametersWebSocketMessage)) {
-            return false;
-        }
-        return true;
+
+        return this$authParametersWebSocketMessage == null ? other$authParametersWebSocketMessage == null : this$authParametersWebSocketMessage.equals(other$authParametersWebSocketMessage);
     }
 
     protected boolean canEqual(final Object other) {
diff --git a/app/src/main/java/com/nextcloud/talk/models/json/websocket/BaseWebSocketMessage.java b/app/src/main/java/com/nextcloud/talk/models/json/websocket/BaseWebSocketMessage.java
index 0cccf715e..66ba83a9e 100644
--- a/app/src/main/java/com/nextcloud/talk/models/json/websocket/BaseWebSocketMessage.java
+++ b/app/src/main/java/com/nextcloud/talk/models/json/websocket/BaseWebSocketMessage.java
@@ -31,9 +31,6 @@ public class BaseWebSocketMessage {
     @JsonField(name = "type")
     String type;
 
-    public BaseWebSocketMessage() {
-    }
-
     public String getType() {
         return this.type;
     }
@@ -55,10 +52,8 @@ public class BaseWebSocketMessage {
         }
         final Object this$type = this.getType();
         final Object other$type = other.getType();
-        if (this$type == null ? other$type != null : !this$type.equals(other$type)) {
-            return false;
-        }
-        return true;
+
+        return this$type == null ? other$type == null : this$type.equals(other$type);
     }
 
     protected boolean canEqual(final Object other) {
diff --git a/app/src/main/java/com/nextcloud/talk/models/json/websocket/ByeWebSocketMessage.java b/app/src/main/java/com/nextcloud/talk/models/json/websocket/ByeWebSocketMessage.java
index 18e8b7273..a1b6c2e59 100644
--- a/app/src/main/java/com/nextcloud/talk/models/json/websocket/ByeWebSocketMessage.java
+++ b/app/src/main/java/com/nextcloud/talk/models/json/websocket/ByeWebSocketMessage.java
@@ -33,9 +33,6 @@ public class ByeWebSocketMessage extends BaseWebSocketMessage {
     @JsonField(name = "bye")
     HashMap<String, Object> bye;
 
-    public ByeWebSocketMessage() {
-    }
-
     public HashMap<String, Object> getBye() {
         return this.bye;
     }
@@ -57,10 +54,8 @@ public class ByeWebSocketMessage extends BaseWebSocketMessage {
         }
         final Object this$bye = this.getBye();
         final Object other$bye = other.getBye();
-        if (this$bye == null ? other$bye != null : !this$bye.equals(other$bye)) {
-            return false;
-        }
-        return true;
+
+        return this$bye == null ? other$bye == null : this$bye.equals(other$bye);
     }
 
     protected boolean canEqual(final Object other) {
diff --git a/app/src/main/java/com/nextcloud/talk/models/json/websocket/CallOverallWebSocketMessage.java b/app/src/main/java/com/nextcloud/talk/models/json/websocket/CallOverallWebSocketMessage.java
index 70ed9595d..064daa45a 100644
--- a/app/src/main/java/com/nextcloud/talk/models/json/websocket/CallOverallWebSocketMessage.java
+++ b/app/src/main/java/com/nextcloud/talk/models/json/websocket/CallOverallWebSocketMessage.java
@@ -31,9 +31,6 @@ public class CallOverallWebSocketMessage extends BaseWebSocketMessage {
     @JsonField(name = "message")
     CallWebSocketMessage callWebSocketMessage;
 
-    public CallOverallWebSocketMessage() {
-    }
-
     public CallWebSocketMessage getCallWebSocketMessage() {
         return this.callWebSocketMessage;
     }
@@ -55,10 +52,8 @@ public class CallOverallWebSocketMessage extends BaseWebSocketMessage {
         }
         final Object this$callWebSocketMessage = this.getCallWebSocketMessage();
         final Object other$callWebSocketMessage = other.getCallWebSocketMessage();
-        if (this$callWebSocketMessage == null ? other$callWebSocketMessage != null : !this$callWebSocketMessage.equals(other$callWebSocketMessage)) {
-            return false;
-        }
-        return true;
+
+        return this$callWebSocketMessage == null ? other$callWebSocketMessage == null : this$callWebSocketMessage.equals(other$callWebSocketMessage);
     }
 
     protected boolean canEqual(final Object other) {
diff --git a/app/src/main/java/com/nextcloud/talk/models/json/websocket/CallWebSocketMessage.java b/app/src/main/java/com/nextcloud/talk/models/json/websocket/CallWebSocketMessage.java
index 47a4262fa..6b3b59099 100644
--- a/app/src/main/java/com/nextcloud/talk/models/json/websocket/CallWebSocketMessage.java
+++ b/app/src/main/java/com/nextcloud/talk/models/json/websocket/CallWebSocketMessage.java
@@ -38,9 +38,6 @@ public class CallWebSocketMessage {
     @JsonField(name = "data")
     NCSignalingMessage ncSignalingMessage;
 
-    public CallWebSocketMessage() {
-    }
-
     public ActorWebSocketMessage getRecipientWebSocketMessage() {
         return this.recipientWebSocketMessage;
     }
@@ -88,10 +85,8 @@ public class CallWebSocketMessage {
         }
         final Object this$ncSignalingMessage = this.getNcSignalingMessage();
         final Object other$ncSignalingMessage = other.getNcSignalingMessage();
-        if (this$ncSignalingMessage == null ? other$ncSignalingMessage != null : !this$ncSignalingMessage.equals(other$ncSignalingMessage)) {
-            return false;
-        }
-        return true;
+
+        return this$ncSignalingMessage == null ? other$ncSignalingMessage == null : this$ncSignalingMessage.equals(other$ncSignalingMessage);
     }
 
     protected boolean canEqual(final Object other) {
diff --git a/app/src/main/java/com/nextcloud/talk/models/json/websocket/ErrorOverallWebSocketMessage.java b/app/src/main/java/com/nextcloud/talk/models/json/websocket/ErrorOverallWebSocketMessage.java
index d4f1f1a45..94b37056c 100644
--- a/app/src/main/java/com/nextcloud/talk/models/json/websocket/ErrorOverallWebSocketMessage.java
+++ b/app/src/main/java/com/nextcloud/talk/models/json/websocket/ErrorOverallWebSocketMessage.java
@@ -31,9 +31,6 @@ public class ErrorOverallWebSocketMessage extends BaseWebSocketMessage {
     @JsonField(name = "error")
     ErrorWebSocketMessage errorWebSocketMessage;
 
-    public ErrorOverallWebSocketMessage() {
-    }
-
     public ErrorWebSocketMessage getErrorWebSocketMessage() {
         return this.errorWebSocketMessage;
     }
@@ -55,10 +52,8 @@ public class ErrorOverallWebSocketMessage extends BaseWebSocketMessage {
         }
         final Object this$errorWebSocketMessage = this.getErrorWebSocketMessage();
         final Object other$errorWebSocketMessage = other.getErrorWebSocketMessage();
-        if (this$errorWebSocketMessage == null ? other$errorWebSocketMessage != null : !this$errorWebSocketMessage.equals(other$errorWebSocketMessage)) {
-            return false;
-        }
-        return true;
+
+        return this$errorWebSocketMessage == null ? other$errorWebSocketMessage == null : this$errorWebSocketMessage.equals(other$errorWebSocketMessage);
     }
 
     protected boolean canEqual(final Object other) {
diff --git a/app/src/main/java/com/nextcloud/talk/models/json/websocket/ErrorWebSocketMessage.java b/app/src/main/java/com/nextcloud/talk/models/json/websocket/ErrorWebSocketMessage.java
index 7cd2f215c..3b1c829aa 100644
--- a/app/src/main/java/com/nextcloud/talk/models/json/websocket/ErrorWebSocketMessage.java
+++ b/app/src/main/java/com/nextcloud/talk/models/json/websocket/ErrorWebSocketMessage.java
@@ -34,9 +34,6 @@ public class ErrorWebSocketMessage {
     @JsonField(name = "message")
     String message;
 
-    public ErrorWebSocketMessage() {
-    }
-
     public String getCode() {
         return this.code;
     }
@@ -71,10 +68,8 @@ public class ErrorWebSocketMessage {
         }
         final Object this$message = this.getMessage();
         final Object other$message = other.getMessage();
-        if (this$message == null ? other$message != null : !this$message.equals(other$message)) {
-            return false;
-        }
-        return true;
+
+        return this$message == null ? other$message == null : this$message.equals(other$message);
     }
 
     protected boolean canEqual(final Object other) {
diff --git a/app/src/main/java/com/nextcloud/talk/models/json/websocket/EventOverallWebSocketMessage.java b/app/src/main/java/com/nextcloud/talk/models/json/websocket/EventOverallWebSocketMessage.java
index 8a7bbc1af..d9424ee43 100644
--- a/app/src/main/java/com/nextcloud/talk/models/json/websocket/EventOverallWebSocketMessage.java
+++ b/app/src/main/java/com/nextcloud/talk/models/json/websocket/EventOverallWebSocketMessage.java
@@ -35,9 +35,6 @@ public class EventOverallWebSocketMessage extends BaseWebSocketMessage {
     @JsonField(name = "event")
     HashMap<String, Object> eventMap;
 
-    public EventOverallWebSocketMessage() {
-    }
-
     public String getType() {
         return this.type;
     }
@@ -72,10 +69,8 @@ public class EventOverallWebSocketMessage extends BaseWebSocketMessage {
         }
         final Object this$eventMap = this.getEventMap();
         final Object other$eventMap = other.getEventMap();
-        if (this$eventMap == null ? other$eventMap != null : !this$eventMap.equals(other$eventMap)) {
-            return false;
-        }
-        return true;
+
+        return this$eventMap == null ? other$eventMap == null : this$eventMap.equals(other$eventMap);
     }
 
     protected boolean canEqual(final Object other) {
diff --git a/app/src/main/java/com/nextcloud/talk/models/json/websocket/HelloOverallWebSocketMessage.java b/app/src/main/java/com/nextcloud/talk/models/json/websocket/HelloOverallWebSocketMessage.java
index e0f1f2292..51d56e856 100644
--- a/app/src/main/java/com/nextcloud/talk/models/json/websocket/HelloOverallWebSocketMessage.java
+++ b/app/src/main/java/com/nextcloud/talk/models/json/websocket/HelloOverallWebSocketMessage.java
@@ -31,9 +31,6 @@ public class HelloOverallWebSocketMessage extends BaseWebSocketMessage {
     @JsonField(name = "hello")
     HelloWebSocketMessage helloWebSocketMessage;
 
-    public HelloOverallWebSocketMessage() {
-    }
-
     public HelloWebSocketMessage getHelloWebSocketMessage() {
         return this.helloWebSocketMessage;
     }
@@ -55,10 +52,8 @@ public class HelloOverallWebSocketMessage extends BaseWebSocketMessage {
         }
         final Object this$helloWebSocketMessage = this.getHelloWebSocketMessage();
         final Object other$helloWebSocketMessage = other.getHelloWebSocketMessage();
-        if (this$helloWebSocketMessage == null ? other$helloWebSocketMessage != null : !this$helloWebSocketMessage.equals(other$helloWebSocketMessage)) {
-            return false;
-        }
-        return true;
+
+        return this$helloWebSocketMessage == null ? other$helloWebSocketMessage == null : this$helloWebSocketMessage.equals(other$helloWebSocketMessage);
     }
 
     protected boolean canEqual(final Object other) {
diff --git a/app/src/main/java/com/nextcloud/talk/models/json/websocket/HelloResponseOverallWebSocketMessage.java b/app/src/main/java/com/nextcloud/talk/models/json/websocket/HelloResponseOverallWebSocketMessage.java
index cb6d1d2d1..589e7d432 100644
--- a/app/src/main/java/com/nextcloud/talk/models/json/websocket/HelloResponseOverallWebSocketMessage.java
+++ b/app/src/main/java/com/nextcloud/talk/models/json/websocket/HelloResponseOverallWebSocketMessage.java
@@ -31,9 +31,6 @@ public class HelloResponseOverallWebSocketMessage extends BaseWebSocketMessage {
     @JsonField(name = "hello")
     HelloResponseWebSocketMessage helloResponseWebSocketMessage;
 
-    public HelloResponseOverallWebSocketMessage() {
-    }
-
     public HelloResponseWebSocketMessage getHelloResponseWebSocketMessage() {
         return this.helloResponseWebSocketMessage;
     }
@@ -55,10 +52,8 @@ public class HelloResponseOverallWebSocketMessage extends BaseWebSocketMessage {
         }
         final Object this$helloResponseWebSocketMessage = this.getHelloResponseWebSocketMessage();
         final Object other$helloResponseWebSocketMessage = other.getHelloResponseWebSocketMessage();
-        if (this$helloResponseWebSocketMessage == null ? other$helloResponseWebSocketMessage != null : !this$helloResponseWebSocketMessage.equals(other$helloResponseWebSocketMessage)) {
-            return false;
-        }
-        return true;
+
+        return this$helloResponseWebSocketMessage == null ? other$helloResponseWebSocketMessage == null : this$helloResponseWebSocketMessage.equals(other$helloResponseWebSocketMessage);
     }
 
     protected boolean canEqual(final Object other) {
diff --git a/app/src/main/java/com/nextcloud/talk/models/json/websocket/HelloResponseWebSocketMessage.java b/app/src/main/java/com/nextcloud/talk/models/json/websocket/HelloResponseWebSocketMessage.java
index 71403a865..f31c7f1e5 100644
--- a/app/src/main/java/com/nextcloud/talk/models/json/websocket/HelloResponseWebSocketMessage.java
+++ b/app/src/main/java/com/nextcloud/talk/models/json/websocket/HelloResponseWebSocketMessage.java
@@ -37,9 +37,6 @@ public class HelloResponseWebSocketMessage {
     @JsonField(name = "server")
     ServerHelloResponseFeaturesWebSocketMessage serverHelloResponseFeaturesWebSocketMessage;
 
-    public HelloResponseWebSocketMessage() {
-    }
-
     public boolean serverHasMCUSupport() {
         return serverHelloResponseFeaturesWebSocketMessage != null && serverHelloResponseFeaturesWebSocketMessage.getFeatures() != null
                 && serverHelloResponseFeaturesWebSocketMessage.getFeatures().contains("mcu");
@@ -92,10 +89,8 @@ public class HelloResponseWebSocketMessage {
         }
         final Object this$serverHelloResponseFeaturesWebSocketMessage = this.getServerHelloResponseFeaturesWebSocketMessage();
         final Object other$serverHelloResponseFeaturesWebSocketMessage = other.getServerHelloResponseFeaturesWebSocketMessage();
-        if (this$serverHelloResponseFeaturesWebSocketMessage == null ? other$serverHelloResponseFeaturesWebSocketMessage != null : !this$serverHelloResponseFeaturesWebSocketMessage.equals(other$serverHelloResponseFeaturesWebSocketMessage)) {
-            return false;
-        }
-        return true;
+
+        return this$serverHelloResponseFeaturesWebSocketMessage == null ? other$serverHelloResponseFeaturesWebSocketMessage == null : this$serverHelloResponseFeaturesWebSocketMessage.equals(other$serverHelloResponseFeaturesWebSocketMessage);
     }
 
     protected boolean canEqual(final Object other) {
diff --git a/app/src/main/java/com/nextcloud/talk/models/json/websocket/HelloWebSocketMessage.java b/app/src/main/java/com/nextcloud/talk/models/json/websocket/HelloWebSocketMessage.java
index df5f018ae..2aed8f798 100644
--- a/app/src/main/java/com/nextcloud/talk/models/json/websocket/HelloWebSocketMessage.java
+++ b/app/src/main/java/com/nextcloud/talk/models/json/websocket/HelloWebSocketMessage.java
@@ -37,9 +37,6 @@ public class HelloWebSocketMessage {
     @JsonField(name = "auth")
     AuthWebSocketMessage authWebSocketMessage;
 
-    public HelloWebSocketMessage() {
-    }
-
     public String getVersion() {
         return this.version;
     }
@@ -87,10 +84,8 @@ public class HelloWebSocketMessage {
         }
         final Object this$authWebSocketMessage = this.getAuthWebSocketMessage();
         final Object other$authWebSocketMessage = other.getAuthWebSocketMessage();
-        if (this$authWebSocketMessage == null ? other$authWebSocketMessage != null : !this$authWebSocketMessage.equals(other$authWebSocketMessage)) {
-            return false;
-        }
-        return true;
+
+        return this$authWebSocketMessage == null ? other$authWebSocketMessage == null : this$authWebSocketMessage.equals(other$authWebSocketMessage);
     }
 
     protected boolean canEqual(final Object other) {
diff --git a/app/src/main/java/com/nextcloud/talk/models/json/websocket/JoinedRoomOverallWebSocketMessage.java b/app/src/main/java/com/nextcloud/talk/models/json/websocket/JoinedRoomOverallWebSocketMessage.java
index 2d260567b..c6523b13f 100644
--- a/app/src/main/java/com/nextcloud/talk/models/json/websocket/JoinedRoomOverallWebSocketMessage.java
+++ b/app/src/main/java/com/nextcloud/talk/models/json/websocket/JoinedRoomOverallWebSocketMessage.java
@@ -31,9 +31,6 @@ public class JoinedRoomOverallWebSocketMessage extends BaseWebSocketMessage {
     @JsonField(name = "room")
     RoomWebSocketMessage roomWebSocketMessage;
 
-    public JoinedRoomOverallWebSocketMessage() {
-    }
-
     public RoomWebSocketMessage getRoomWebSocketMessage() {
         return this.roomWebSocketMessage;
     }
@@ -55,10 +52,8 @@ public class JoinedRoomOverallWebSocketMessage extends BaseWebSocketMessage {
         }
         final Object this$roomWebSocketMessage = this.getRoomWebSocketMessage();
         final Object other$roomWebSocketMessage = other.getRoomWebSocketMessage();
-        if (this$roomWebSocketMessage == null ? other$roomWebSocketMessage != null : !this$roomWebSocketMessage.equals(other$roomWebSocketMessage)) {
-            return false;
-        }
-        return true;
+
+        return this$roomWebSocketMessage == null ? other$roomWebSocketMessage == null : this$roomWebSocketMessage.equals(other$roomWebSocketMessage);
     }
 
     protected boolean canEqual(final Object other) {
diff --git a/app/src/main/java/com/nextcloud/talk/models/json/websocket/RequestOfferOverallWebSocketMessage.java b/app/src/main/java/com/nextcloud/talk/models/json/websocket/RequestOfferOverallWebSocketMessage.java
index 656155503..7994ac56f 100644
--- a/app/src/main/java/com/nextcloud/talk/models/json/websocket/RequestOfferOverallWebSocketMessage.java
+++ b/app/src/main/java/com/nextcloud/talk/models/json/websocket/RequestOfferOverallWebSocketMessage.java
@@ -31,9 +31,6 @@ public class RequestOfferOverallWebSocketMessage extends BaseWebSocketMessage {
     @JsonField(name = "message")
     RequestOfferSignalingMessage requestOfferOverallWebSocketMessage;
 
-    public RequestOfferOverallWebSocketMessage() {
-    }
-
     public RequestOfferSignalingMessage getRequestOfferOverallWebSocketMessage() {
         return this.requestOfferOverallWebSocketMessage;
     }
@@ -55,10 +52,8 @@ public class RequestOfferOverallWebSocketMessage extends BaseWebSocketMessage {
         }
         final Object this$requestOfferOverallWebSocketMessage = this.getRequestOfferOverallWebSocketMessage();
         final Object other$requestOfferOverallWebSocketMessage = other.getRequestOfferOverallWebSocketMessage();
-        if (this$requestOfferOverallWebSocketMessage == null ? other$requestOfferOverallWebSocketMessage != null : !this$requestOfferOverallWebSocketMessage.equals(other$requestOfferOverallWebSocketMessage)) {
-            return false;
-        }
-        return true;
+
+        return this$requestOfferOverallWebSocketMessage == null ? other$requestOfferOverallWebSocketMessage == null : this$requestOfferOverallWebSocketMessage.equals(other$requestOfferOverallWebSocketMessage);
     }
 
     protected boolean canEqual(final Object other) {
diff --git a/app/src/main/java/com/nextcloud/talk/models/json/websocket/RequestOfferSignalingMessage.java b/app/src/main/java/com/nextcloud/talk/models/json/websocket/RequestOfferSignalingMessage.java
index 147d471e0..b79a705d1 100644
--- a/app/src/main/java/com/nextcloud/talk/models/json/websocket/RequestOfferSignalingMessage.java
+++ b/app/src/main/java/com/nextcloud/talk/models/json/websocket/RequestOfferSignalingMessage.java
@@ -34,9 +34,6 @@ public class RequestOfferSignalingMessage {
     @JsonField(name = "data")
     SignalingDataWebSocketMessageForOffer signalingDataWebSocketMessageForOffer;
 
-    public RequestOfferSignalingMessage() {
-    }
-
     public ActorWebSocketMessage getActorWebSocketMessage() {
         return this.actorWebSocketMessage;
     }
@@ -71,10 +68,8 @@ public class RequestOfferSignalingMessage {
         }
         final Object this$signalingDataWebSocketMessageForOffer = this.getSignalingDataWebSocketMessageForOffer();
         final Object other$signalingDataWebSocketMessageForOffer = other.getSignalingDataWebSocketMessageForOffer();
-        if (this$signalingDataWebSocketMessageForOffer == null ? other$signalingDataWebSocketMessageForOffer != null : !this$signalingDataWebSocketMessageForOffer.equals(other$signalingDataWebSocketMessageForOffer)) {
-            return false;
-        }
-        return true;
+
+        return this$signalingDataWebSocketMessageForOffer == null ? other$signalingDataWebSocketMessageForOffer == null : this$signalingDataWebSocketMessageForOffer.equals(other$signalingDataWebSocketMessageForOffer);
     }
 
     protected boolean canEqual(final Object other) {
diff --git a/app/src/main/java/com/nextcloud/talk/models/json/websocket/RoomOverallWebSocketMessage.java b/app/src/main/java/com/nextcloud/talk/models/json/websocket/RoomOverallWebSocketMessage.java
index 0048aa182..80f1b0d22 100644
--- a/app/src/main/java/com/nextcloud/talk/models/json/websocket/RoomOverallWebSocketMessage.java
+++ b/app/src/main/java/com/nextcloud/talk/models/json/websocket/RoomOverallWebSocketMessage.java
@@ -31,9 +31,6 @@ public class RoomOverallWebSocketMessage extends BaseWebSocketMessage {
     @JsonField(name = "room")
     RoomWebSocketMessage roomWebSocketMessage;
 
-    public RoomOverallWebSocketMessage() {
-    }
-
     public RoomWebSocketMessage getRoomWebSocketMessage() {
         return this.roomWebSocketMessage;
     }
@@ -55,10 +52,8 @@ public class RoomOverallWebSocketMessage extends BaseWebSocketMessage {
         }
         final Object this$roomWebSocketMessage = this.getRoomWebSocketMessage();
         final Object other$roomWebSocketMessage = other.getRoomWebSocketMessage();
-        if (this$roomWebSocketMessage == null ? other$roomWebSocketMessage != null : !this$roomWebSocketMessage.equals(other$roomWebSocketMessage)) {
-            return false;
-        }
-        return true;
+
+        return this$roomWebSocketMessage == null ? other$roomWebSocketMessage == null : this$roomWebSocketMessage.equals(other$roomWebSocketMessage);
     }
 
     protected boolean canEqual(final Object other) {
diff --git a/app/src/main/java/com/nextcloud/talk/models/json/websocket/RoomPropertiesWebSocketMessage.java b/app/src/main/java/com/nextcloud/talk/models/json/websocket/RoomPropertiesWebSocketMessage.java
index c31fcad0c..726404eb9 100644
--- a/app/src/main/java/com/nextcloud/talk/models/json/websocket/RoomPropertiesWebSocketMessage.java
+++ b/app/src/main/java/com/nextcloud/talk/models/json/websocket/RoomPropertiesWebSocketMessage.java
@@ -36,9 +36,6 @@ public class RoomPropertiesWebSocketMessage {
     @JsonField(name = "type", typeConverter = EnumRoomTypeConverter.class)
     Conversation.ConversationType roomType;
 
-    public RoomPropertiesWebSocketMessage() {
-    }
-
     public String getName() {
         return this.name;
     }
@@ -73,10 +70,8 @@ public class RoomPropertiesWebSocketMessage {
         }
         final Object this$roomType = this.getRoomType();
         final Object other$roomType = other.getRoomType();
-        if (this$roomType == null ? other$roomType != null : !this$roomType.equals(other$roomType)) {
-            return false;
-        }
-        return true;
+
+        return this$roomType == null ? other$roomType == null : this$roomType.equals(other$roomType);
     }
 
     protected boolean canEqual(final Object other) {
diff --git a/app/src/main/java/com/nextcloud/talk/models/json/websocket/RoomWebSocketMessage.java b/app/src/main/java/com/nextcloud/talk/models/json/websocket/RoomWebSocketMessage.java
index afdde6096..16168c6d8 100644
--- a/app/src/main/java/com/nextcloud/talk/models/json/websocket/RoomWebSocketMessage.java
+++ b/app/src/main/java/com/nextcloud/talk/models/json/websocket/RoomWebSocketMessage.java
@@ -37,9 +37,6 @@ public class RoomWebSocketMessage {
     @JsonField(name = "properties")
     RoomPropertiesWebSocketMessage roomPropertiesWebSocketMessage;
 
-    public RoomWebSocketMessage() {
-    }
-
     public String getRoomId() {
         return this.roomId;
     }
@@ -87,10 +84,8 @@ public class RoomWebSocketMessage {
         }
         final Object this$roomPropertiesWebSocketMessage = this.getRoomPropertiesWebSocketMessage();
         final Object other$roomPropertiesWebSocketMessage = other.getRoomPropertiesWebSocketMessage();
-        if (this$roomPropertiesWebSocketMessage == null ? other$roomPropertiesWebSocketMessage != null : !this$roomPropertiesWebSocketMessage.equals(other$roomPropertiesWebSocketMessage)) {
-            return false;
-        }
-        return true;
+
+        return this$roomPropertiesWebSocketMessage == null ? other$roomPropertiesWebSocketMessage == null : this$roomPropertiesWebSocketMessage.equals(other$roomPropertiesWebSocketMessage);
     }
 
     protected boolean canEqual(final Object other) {
diff --git a/app/src/main/java/com/nextcloud/talk/models/json/websocket/ServerHelloResponseFeaturesWebSocketMessage.java b/app/src/main/java/com/nextcloud/talk/models/json/websocket/ServerHelloResponseFeaturesWebSocketMessage.java
index bda8cb677..0ee622864 100644
--- a/app/src/main/java/com/nextcloud/talk/models/json/websocket/ServerHelloResponseFeaturesWebSocketMessage.java
+++ b/app/src/main/java/com/nextcloud/talk/models/json/websocket/ServerHelloResponseFeaturesWebSocketMessage.java
@@ -33,9 +33,6 @@ public class ServerHelloResponseFeaturesWebSocketMessage {
     @JsonField(name = "features")
     List<String> features;
 
-    public ServerHelloResponseFeaturesWebSocketMessage() {
-    }
-
     public List<String> getFeatures() {
         return this.features;
     }
@@ -57,10 +54,8 @@ public class ServerHelloResponseFeaturesWebSocketMessage {
         }
         final Object this$features = this.getFeatures();
         final Object other$features = other.getFeatures();
-        if (this$features == null ? other$features != null : !this$features.equals(other$features)) {
-            return false;
-        }
-        return true;
+
+        return this$features == null ? other$features == null : this$features.equals(other$features);
     }
 
     protected boolean canEqual(final Object other) {
diff --git a/app/src/main/java/com/nextcloud/talk/models/json/websocket/SignalingDataWebSocketMessageForOffer.java b/app/src/main/java/com/nextcloud/talk/models/json/websocket/SignalingDataWebSocketMessageForOffer.java
index cac3dd4b1..714aae569 100644
--- a/app/src/main/java/com/nextcloud/talk/models/json/websocket/SignalingDataWebSocketMessageForOffer.java
+++ b/app/src/main/java/com/nextcloud/talk/models/json/websocket/SignalingDataWebSocketMessageForOffer.java
@@ -34,9 +34,6 @@ public class SignalingDataWebSocketMessageForOffer {
     @JsonField(name = "roomType")
     String roomType;
 
-    public SignalingDataWebSocketMessageForOffer() {
-    }
-
     public String getType() {
         return this.type;
     }
@@ -71,10 +68,8 @@ public class SignalingDataWebSocketMessageForOffer {
         }
         final Object this$roomType = this.getRoomType();
         final Object other$roomType = other.getRoomType();
-        if (this$roomType == null ? other$roomType != null : !this$roomType.equals(other$roomType)) {
-            return false;
-        }
-        return true;
+
+        return this$roomType == null ? other$roomType == null : this$roomType.equals(other$roomType);
     }
 
     protected boolean canEqual(final Object other) {
diff --git a/app/src/main/java/com/nextcloud/talk/utils/text/Spans.java b/app/src/main/java/com/nextcloud/talk/utils/text/Spans.java
index 82ce39113..077ebe857 100644
--- a/app/src/main/java/com/nextcloud/talk/utils/text/Spans.java
+++ b/app/src/main/java/com/nextcloud/talk/utils/text/Spans.java
@@ -72,10 +72,8 @@ public class Spans {
             }
             final Object this$label = this.getLabel();
             final Object other$label = other.getLabel();
-            if (this$label == null ? other$label != null : !this$label.equals(other$label)) {
-                return false;
-            }
-            return true;
+
+            return this$label == null ? other$label == null : this$label.equals(other$label);
         }
 
         protected boolean canEqual(final Object other) {