From 61aaae4dc2dbd5032f058f96833e4cd75e245a26 Mon Sep 17 00:00:00 2001 From: Andy Scherzinger Date: Thu, 29 Apr 2021 00:46:35 +0200 Subject: [PATCH 01/18] Update code base for Android Studio 4.1.3 Remove lombock @Data annotations Replace FindBugs with SpotBugs Update Lombock version Signed-off-by: Andy Scherzinger --- app/build.gradle | 58 +-- .../filebrowser/models/BrowserFile.java | 214 +++++++++- .../filebrowser/models/DavResponse.java | 63 ++- .../models/properties/NCEncrypted.java | 20 +- .../models/properties/NCPermission.java | 12 +- .../models/properties/NCPreview.java | 20 +- .../models/properties/OCFavorite.java | 20 +- .../filebrowser/models/properties/OCId.java | 20 +- .../filebrowser/models/properties/OCSize.java | 19 +- .../talk/events/BottomSheetLockEvent.java | 74 +++- .../talk/events/ConfigurationChangeEvent.java | 32 +- .../nextcloud/talk/events/EventStatus.java | 71 +++- .../talk/events/MediaStreamEvent.java | 66 ++- .../talk/events/MoreMenuClickEvent.java | 41 +- .../nextcloud/talk/events/NetworkEvent.java | 42 +- .../talk/events/PeerConnectionEvent.java | 85 +++- .../events/SessionDescriptionSendEvent.java | 91 +++- .../talk/events/UserMentionClickEvent.java | 46 +- .../events/WebSocketCommunicationEvent.java | 62 ++- .../talk/models/ExternalSignalingServer.java | 64 ++- .../nextcloud/talk/models/ImportAccount.java | 76 +++- .../com/nextcloud/talk/models/LoginData.java | 78 +++- .../nextcloud/talk/models/RetrofitBucket.java | 63 ++- .../talk/models/RingtoneSettings.java | 69 ++- .../talk/models/SignatureVerification.java | 61 ++- .../json/autocomplete/AutocompleteOCS.java | 49 ++- .../autocomplete/AutocompleteOverall.java | 49 ++- .../json/autocomplete/AutocompleteUser.java | 79 +++- .../json/capabilities/Capabilities.java | 109 ++++- .../json/capabilities/CapabilitiesList.java | 49 ++- .../json/capabilities/CapabilitiesOCS.java | 49 ++- .../capabilities/CapabilitiesOverall.java | 49 ++- .../capabilities/NotificationsCapability.java | 49 ++- .../capabilities/ProvisioningCapability.java | 49 ++- .../json/capabilities/SpreedCapability.java | 64 ++- .../json/capabilities/ThemingCapability.java | 178 +++++++- .../talk/models/json/chat/ChatMessage.java | 293 ++++++++++++- .../talk/models/json/chat/ChatOCS.java | 49 ++- .../json/chat/ChatOCSSingleMessage.java | 49 ++- .../talk/models/json/chat/ChatOverall.java | 49 ++- .../json/chat/ChatOverallSingleMessage.java | 49 ++- .../json/conversations/Conversation.java | 398 +++++++++++++++++- .../models/json/conversations/RoomOCS.java | 48 ++- .../json/conversations/RoomOverall.java | 48 ++- .../models/json/conversations/RoomsOCS.java | 49 ++- .../json/conversations/RoomsOverall.java | 49 ++- .../talk/models/json/generic/GenericMeta.java | 76 +++- .../talk/models/json/generic/GenericOCS.java | 49 ++- .../models/json/generic/GenericOverall.java | 49 ++- .../talk/models/json/generic/Status.java | 130 +++++- .../talk/models/json/mention/Mention.java | 79 +++- .../talk/models/json/mention/MentionOCS.java | 49 ++- .../models/json/mention/MentionOverall.java | 49 ++- .../json/notifications/Notification.java | 257 ++++++++++- .../notifications/NotificationAction.java | 91 +++- .../json/notifications/NotificationOCS.java | 49 ++- .../notifications/NotificationOverall.java | 48 ++- .../notifications/NotificationRichObject.java | 79 +++- .../json/notifications/NotificationsOCS.java | 49 ++- .../notifications/NotificationsOverall.java | 48 ++- .../participants/AddParticipantOverall.java | 48 ++- .../models/json/participants/Participant.java | 177 +++++++- .../json/participants/ParticipantsOCS.java | 49 ++- .../participants/ParticipantsOverall.java | 49 ++- .../json/push/DecryptedPushMessage.java | 174 +++++++- .../models/json/push/NotificationUser.java | 79 +++- .../json/push/PushConfigurationState.java | 106 ++++- .../models/json/push/PushRegistration.java | 79 +++- .../models/json/push/PushRegistrationOCS.java | 49 ++- .../json/push/PushRegistrationOverall.java | 49 ++- .../json/search/ContactsByNumberOCS.java | 49 ++- .../json/search/ContactsByNumberOverall.java | 49 ++- .../models/json/sharees/ExactSharees.java | 49 ++- .../talk/models/json/sharees/Sharee.java | 79 +++- .../talk/models/json/sharees/ShareesOCS.java | 49 ++- .../models/json/sharees/ShareesOverall.java | 49 ++- .../talk/models/json/sharees/SharesData.java | 63 ++- .../talk/models/json/sharees/Value.java | 49 ++- .../json/signaling/DataChannelMessage.java | 61 ++- .../signaling/DataChannelMessageNick.java | 61 ++- .../models/json/signaling/NCIceCandidate.java | 76 +++- .../json/signaling/NCMessagePayload.java | 109 ++++- .../json/signaling/NCMessageWrapper.java | 79 +++- .../json/signaling/NCSignalingMessage.java | 139 +++++- .../talk/models/json/signaling/Signaling.java | 63 ++- .../models/json/signaling/SignalingOCS.java | 48 ++- .../json/signaling/SignalingOverall.java | 48 ++- .../json/signaling/settings/IceServer.java | 93 +++- .../json/signaling/settings/Settings.java | 93 +++- .../settings/SignalingSettingsOcs.java | 48 ++- .../settings/SignalingSettingsOverall.java | 48 ++- .../json/userprofile/UserProfileData.java | 244 ++++++++++- .../userprofile/UserProfileFieldsOCS.java | 54 ++- .../userprofile/UserProfileFieldsOverall.java | 49 ++- .../json/userprofile/UserProfileOCS.java | 49 ++- .../json/userprofile/UserProfileOverall.java | 49 ++- .../json/websocket/ActorWebSocketMessage.java | 79 +++- .../AuthParametersWebSocketMessage.java | 64 ++- .../json/websocket/AuthWebSocketMessage.java | 64 ++- .../json/websocket/BaseWebSocketMessage.java | 49 ++- .../json/websocket/ByeWebSocketMessage.java | 49 ++- .../CallOverallWebSocketMessage.java | 49 ++- .../json/websocket/CallWebSocketMessage.java | 79 +++- .../ErrorOverallWebSocketMessage.java | 49 ++- .../json/websocket/ErrorWebSocketMessage.java | 64 ++- .../EventOverallWebSocketMessage.java | 64 ++- .../HelloOverallWebSocketMessage.java | 49 ++- .../HelloResponseOverallWebSocketMessage.java | 49 ++- .../HelloResponseWebSocketMessage.java | 79 +++- .../json/websocket/HelloWebSocketMessage.java | 79 +++- .../JoinedRoomOverallWebSocketMessage.java | 49 ++- .../RequestOfferOverallWebSocketMessage.java | 49 ++- .../RequestOfferSignalingMessage.java | 64 ++- .../RoomOverallWebSocketMessage.java | 49 ++- .../RoomPropertiesWebSocketMessage.java | 66 ++- .../json/websocket/RoomWebSocketMessage.java | 79 +++- ...HelloResponseFeaturesWebSocketMessage.java | 49 ++- ...SignalingDataWebSocketMessageForOffer.java | 64 ++- .../com/nextcloud/talk/utils/text/Spans.java | 64 ++- build.gradle | 9 +- gradle/wrapper/gradle-wrapper.properties | 24 +- scripts/analysis/analysis-wrapper.sh | 18 +- 122 files changed, 8223 insertions(+), 356 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 94e16c1a9..941d085bc 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -17,12 +17,13 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ +import com.github.spotbugs.snom.SpotBugsTask apply plugin: 'com.android.application' apply plugin: 'kotlin-android' -apply plugin: 'findbugs' apply plugin: 'kotlin-kapt' apply plugin: 'kotlin-android-extensions' +apply plugin: 'com.github.spotbugs' apply plugin: 'io.gitlab.arturbosch.detekt' configurations { @@ -36,7 +37,7 @@ if (taskRequest.contains("Gplay") || taskRequest.contains("findbugs") || taskReq android { compileSdkVersion 29 - buildToolsVersion '28.0.3' + buildToolsVersion '29.0.2' defaultConfig { minSdkVersion 21 targetSdkVersion 29 @@ -107,6 +108,28 @@ android { exclude 'META-INF/rxjava.properties' } + android.applicationVariants.all { variant -> + String variantName = variant.name + String capVariantName = variantName.substring(0, 1).toUpperCase() + variantName.substring(1) + tasks.register("spotbugs${capVariantName}Report", SpotBugsTask) { + ignoreFailures = true // should continue checking + effort = "max" + reportLevel = "medium" + classes = fileTree("$project.buildDir/intermediates/javac/${variantName}/classes/") + excludeFilter = file("${project.rootDir}/spotbugs-filter.xml") + + reports { + xml.enabled = false + html { + enabled = true + destination = file("$project.buildDir/reports/spotbugs/spotbugs.html") + } + } + } + } + + check.dependsOn 'spotbugsGplayDebugReport', 'lint', 'ktlint', 'detekt' + compileOptions { sourceCompatibility JavaVersion.VERSION_1_8 targetCompatibility JavaVersion.VERSION_1_8 @@ -118,27 +141,6 @@ android { htmlOutput file("$project.buildDir/reports/lint/lint.html") disable 'MissingTranslation' } - - task findbugs(type: FindBugs) { - ignoreFailures = false - effort = "max" - reportLevel = "medium" - classes = fileTree("${project.rootDir}/app/build/intermediates/javac/gplayDebug/classes/com/nextcloud/") - excludeFilter = file("${project.rootDir}/findbugs-filter.xml") - source = fileTree('src/main/java') - pluginClasspath = project.configurations.findbugsPlugins - classpath = files() - include '**/*.java' - exclude '**/gen/**' - - reports { - xml.enabled = false - html.enabled = true - html { - destination = file("$project.buildDir/reports/findbugs/findbugs.html") - } - } - } } ext { @@ -146,7 +148,7 @@ ext { coilKtVersion = "1.2.0" daggerVersion = "2.34.1" okhttpVersion = "3.14.2" - lombokVersion = "1.18.10" + lombokVersion = "1.18.12" materialDialogsVersion = "3.3.0" parcelerVersion = "1.1.13" powermockVersion = "2.0.9" @@ -201,6 +203,7 @@ dependencies { implementation 'com.bluelinelabs:logansquare:1.3.7' implementation 'com.fasterxml.jackson.core:jackson-core:2.12.3' + annotationProcessor 'com.bluelinelabs:logansquare-compiler:1.3.7' kapt 'com.bluelinelabs:logansquare-compiler:1.3.7' implementation "com.squareup.retrofit2:retrofit:${retrofit2Version}" @@ -217,12 +220,15 @@ dependencies { implementation 'io.requery:requery:1.5.1' implementation 'io.requery:requery-android:1.6.1' implementation 'net.zetetic:android-database-sqlcipher:3.5.9' + annotationProcessor 'io.requery:requery-processor:1.6.1' kapt 'io.requery:requery-processor:1.6.1' implementation "org.parceler:parceler-api:$parcelerVersion" + annotationProcessor "org.parceler:parceler:$parcelerVersion" kapt "org.parceler:parceler:$parcelerVersion" implementation 'net.orange-box.storebox:storebox-lib:1.4.0' compileOnly "org.projectlombok:lombok:${lombokVersion}" annotationProcessor "org.projectlombok:lombok:${lombokVersion}" + kapt "org.projectlombok:lombok:${lombokVersion}" implementation "com.jakewharton:butterknife:${butterknifeVersion}" kapt "com.jakewharton:butterknife-compiler:${butterknifeVersion}" implementation 'com.github.HITGIF:TextFieldBoxes:1.4.5' @@ -285,8 +291,8 @@ dependencies { androidTestImplementation ('androidx.test.espresso:espresso-core:3.3.0', { exclude group: 'com.android.support', module: 'support-annotations' }) - findbugsPlugins 'com.h3xstream.findsecbugs:findsecbugs-plugin:1.11.0' - findbugsPlugins 'com.mebigfatguy.fb-contrib:fb-contrib:7.4.6' + spotbugsPlugins 'com.h3xstream.findsecbugs:findsecbugs-plugin:1.11.0' + spotbugsPlugins 'com.mebigfatguy.fb-contrib:fb-contrib:7.4.6' } task ktlint(type: JavaExec, group: "verification") { 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 fd710b711..026373a2c 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 @@ -22,21 +22,27 @@ package com.nextcloud.talk.components.filebrowser.models; import android.net.Uri; import android.text.TextUtils; + +import com.bluelinelabs.logansquare.annotation.JsonObject; +import com.nextcloud.talk.components.filebrowser.models.properties.NCEncrypted; +import com.nextcloud.talk.components.filebrowser.models.properties.NCPermission; +import com.nextcloud.talk.components.filebrowser.models.properties.NCPreview; +import com.nextcloud.talk.components.filebrowser.models.properties.OCFavorite; +import com.nextcloud.talk.components.filebrowser.models.properties.OCId; +import com.nextcloud.talk.components.filebrowser.models.properties.OCSize; + +import org.parceler.Parcel; + +import java.io.File; +import java.util.List; + import at.bitfire.dav4android.Property; import at.bitfire.dav4android.Response; import at.bitfire.dav4android.property.DisplayName; import at.bitfire.dav4android.property.GetContentType; import at.bitfire.dav4android.property.GetLastModified; import at.bitfire.dav4android.property.ResourceType; -import com.bluelinelabs.logansquare.annotation.JsonObject; -import com.nextcloud.talk.components.filebrowser.models.properties.*; -import lombok.Data; -import org.parceler.Parcel; -import java.io.File; -import java.util.List; - -@Data @JsonObject @Parcel public class BrowserFile { @@ -54,6 +60,9 @@ 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)); @@ -113,4 +122,193 @@ public class BrowserFile { return browserFile; } + + public String getPath() { + return this.path; + } + + public String getDisplayName() { + return this.displayName; + } + + public String getMimeType() { + return this.mimeType; + } + + public long getModifiedTimestamp() { + return this.modifiedTimestamp; + } + + public long getSize() { + return this.size; + } + + public boolean isFile() { + return this.isFile; + } + + public String getRemoteId() { + return this.remoteId; + } + + public boolean isHasPreview() { + return this.hasPreview; + } + + public boolean isFavorite() { + return this.favorite; + } + + public boolean isEncrypted() { + return this.encrypted; + } + + public String getPermissions() { + return this.permissions; + } + + public boolean isAllowedToReShare() { + return this.isAllowedToReShare; + } + + public void setPath(String path) { + this.path = path; + } + + public void setDisplayName(String displayName) { + this.displayName = displayName; + } + + public void setMimeType(String mimeType) { + this.mimeType = mimeType; + } + + public void setModifiedTimestamp(long modifiedTimestamp) { + this.modifiedTimestamp = modifiedTimestamp; + } + + public void setSize(long size) { + this.size = size; + } + + public void setFile(boolean isFile) { + this.isFile = isFile; + } + + public void setRemoteId(String remoteId) { + this.remoteId = remoteId; + } + + public void setHasPreview(boolean hasPreview) { + this.hasPreview = hasPreview; + } + + public void setFavorite(boolean favorite) { + this.favorite = favorite; + } + + public void setEncrypted(boolean encrypted) { + this.encrypted = encrypted; + } + + public void setPermissions(String permissions) { + this.permissions = permissions; + } + + public void setAllowedToReShare(boolean isAllowedToReShare) { + this.isAllowedToReShare = isAllowedToReShare; + } + + public boolean equals(final Object o) { + if (o == this) { + return true; + } + if (!(o instanceof BrowserFile)) { + return false; + } + final BrowserFile other = (BrowserFile) o; + if (!other.canEqual((Object) this)) { + return false; + } + final Object this$path = this.getPath(); + final Object other$path = other.getPath(); + if (this$path == null ? other$path != null : !this$path.equals(other$path)) { + return false; + } + final Object this$displayName = this.getDisplayName(); + final Object other$displayName = other.getDisplayName(); + if (this$displayName == null ? other$displayName != null : !this$displayName.equals(other$displayName)) { + return false; + } + final Object this$mimeType = this.getMimeType(); + final Object other$mimeType = other.getMimeType(); + if (this$mimeType == null ? other$mimeType != null : !this$mimeType.equals(other$mimeType)) { + return false; + } + if (this.getModifiedTimestamp() != other.getModifiedTimestamp()) { + return false; + } + if (this.getSize() != other.getSize()) { + return false; + } + if (this.isFile() != other.isFile()) { + return false; + } + final Object this$remoteId = this.getRemoteId(); + final Object other$remoteId = other.getRemoteId(); + if (this$remoteId == null ? other$remoteId != null : !this$remoteId.equals(other$remoteId)) { + return false; + } + if (this.isHasPreview() != other.isHasPreview()) { + return false; + } + if (this.isFavorite() != other.isFavorite()) { + return false; + } + if (this.isEncrypted() != other.isEncrypted()) { + return false; + } + final Object this$permissions = this.getPermissions(); + final Object other$permissions = other.getPermissions(); + if (this$permissions == null ? other$permissions != null : !this$permissions.equals(other$permissions)) { + return false; + } + if (this.isAllowedToReShare() != other.isAllowedToReShare()) { + return false; + } + return true; + } + + protected boolean canEqual(final Object other) { + return other instanceof BrowserFile; + } + + public int hashCode() { + final int PRIME = 59; + int result = 1; + final Object $path = this.getPath(); + result = result * PRIME + ($path == null ? 43 : $path.hashCode()); + final Object $displayName = this.getDisplayName(); + result = result * PRIME + ($displayName == null ? 43 : $displayName.hashCode()); + final Object $mimeType = this.getMimeType(); + result = result * PRIME + ($mimeType == null ? 43 : $mimeType.hashCode()); + final long $modifiedTimestamp = this.getModifiedTimestamp(); + result = result * PRIME + (int) ($modifiedTimestamp >>> 32 ^ $modifiedTimestamp); + final long $size = this.getSize(); + result = result * PRIME + (int) ($size >>> 32 ^ $size); + result = result * PRIME + (this.isFile() ? 79 : 97); + final Object $remoteId = this.getRemoteId(); + result = result * PRIME + ($remoteId == null ? 43 : $remoteId.hashCode()); + result = result * PRIME + (this.isHasPreview() ? 79 : 97); + result = result * PRIME + (this.isFavorite() ? 79 : 97); + result = result * PRIME + (this.isEncrypted() ? 79 : 97); + final Object $permissions = this.getPermissions(); + result = result * PRIME + ($permissions == null ? 43 : $permissions.hashCode()); + result = result * PRIME + (this.isAllowedToReShare() ? 79 : 97); + return result; + } + + public String toString() { + return "BrowserFile(path=" + this.getPath() + ", displayName=" + this.getDisplayName() + ", mimeType=" + this.getMimeType() + ", modifiedTimestamp=" + this.getModifiedTimestamp() + ", size=" + this.getSize() + ", isFile=" + this.isFile() + ", remoteId=" + this.getRemoteId() + ", hasPreview=" + this.isHasPreview() + ", favorite=" + this.isFavorite() + ", encrypted=" + this.isEncrypted() + ", permissions=" + this.getPermissions() + ", isAllowedToReShare=" + this.isAllowedToReShare() + ")"; + } } 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 bc2c1ef0e..7b277b218 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 @@ -21,10 +21,69 @@ package com.nextcloud.talk.components.filebrowser.models; import at.bitfire.dav4android.Response; -import lombok.Data; -@Data public class DavResponse { public Response response; public Object data; + + public DavResponse() { + } + + public Response getResponse() { + return this.response; + } + + public Object getData() { + return this.data; + } + + public void setResponse(Response response) { + this.response = response; + } + + public void setData(Object data) { + this.data = data; + } + + public boolean equals(final Object o) { + if (o == this) { + return true; + } + if (!(o instanceof DavResponse)) { + return false; + } + final DavResponse other = (DavResponse) o; + if (!other.canEqual((Object) this)) { + return false; + } + final Object this$response = this.getResponse(); + final Object other$response = other.getResponse(); + if (this$response == null ? other$response != null : !this$response.equals(other$response)) { + return false; + } + 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; + } + + protected boolean canEqual(final Object other) { + return other instanceof DavResponse; + } + + public int hashCode() { + final int PRIME = 59; + int result = 1; + final Object $response = this.getResponse(); + result = result * PRIME + ($response == null ? 43 : $response.hashCode()); + final Object $data = this.getData(); + result = result * PRIME + ($data == null ? 43 : $data.hashCode()); + return result; + } + + public String toString() { + return "DavResponse(response=" + this.getResponse() + ", data=" + this.getData() + ")"; + } } diff --git a/app/src/main/java/com/nextcloud/talk/components/filebrowser/models/properties/NCEncrypted.java b/app/src/main/java/com/nextcloud/talk/components/filebrowser/models/properties/NCEncrypted.java index f85d697dd..89f0b15ac 100644 --- a/app/src/main/java/com/nextcloud/talk/components/filebrowser/models/properties/NCEncrypted.java +++ b/app/src/main/java/com/nextcloud/talk/components/filebrowser/models/properties/NCEncrypted.java @@ -23,12 +23,8 @@ package com.nextcloud.talk.components.filebrowser.models.properties; import android.text.TextUtils; import android.util.Log; -import at.bitfire.dav4android.Property; -import at.bitfire.dav4android.PropertyFactory; -import at.bitfire.dav4android.XmlUtils; import com.nextcloud.talk.components.filebrowser.webdav.DavUtils; -import lombok.Getter; -import lombok.Setter; + import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.xmlpull.v1.XmlPullParser; @@ -36,17 +32,27 @@ import org.xmlpull.v1.XmlPullParserException; import java.io.IOException; +import at.bitfire.dav4android.Property; +import at.bitfire.dav4android.PropertyFactory; +import at.bitfire.dav4android.XmlUtils; + public class NCEncrypted implements Property { public static final Name NAME = new Name(DavUtils.NC_NAMESPACE, DavUtils.EXTENDED_PROPERTY_IS_ENCRYPTED); - @Getter - @Setter private boolean ncEncrypted; private NCEncrypted(boolean isEncrypted) { ncEncrypted = isEncrypted; } + public boolean isNcEncrypted() { + return this.ncEncrypted; + } + + public void setNcEncrypted(boolean ncEncrypted) { + this.ncEncrypted = ncEncrypted; + } + public static class Factory implements PropertyFactory { @Nullable diff --git a/app/src/main/java/com/nextcloud/talk/components/filebrowser/models/properties/NCPermission.java b/app/src/main/java/com/nextcloud/talk/components/filebrowser/models/properties/NCPermission.java index f907e7f29..92b3e10ea 100644 --- a/app/src/main/java/com/nextcloud/talk/components/filebrowser/models/properties/NCPermission.java +++ b/app/src/main/java/com/nextcloud/talk/components/filebrowser/models/properties/NCPermission.java @@ -37,20 +37,24 @@ import java.io.IOException; import at.bitfire.dav4android.Property; import at.bitfire.dav4android.PropertyFactory; import at.bitfire.dav4android.XmlUtils; -import lombok.Getter; -import lombok.Setter; public class NCPermission implements Property { public static final Name NAME = new Name(DavUtils.OC_NAMESPACE, DavUtils.EXTENDED_PROPERTY_NAME_PERMISSIONS); - @Getter - @Setter private String ncPermission; private NCPermission(String p) { ncPermission = p; } + public String getNcPermission() { + return this.ncPermission; + } + + public void setNcPermission(String ncPermission) { + this.ncPermission = ncPermission; + } + public static class Factory implements PropertyFactory { @Nullable diff --git a/app/src/main/java/com/nextcloud/talk/components/filebrowser/models/properties/NCPreview.java b/app/src/main/java/com/nextcloud/talk/components/filebrowser/models/properties/NCPreview.java index 78fb8695e..0c034ab86 100644 --- a/app/src/main/java/com/nextcloud/talk/components/filebrowser/models/properties/NCPreview.java +++ b/app/src/main/java/com/nextcloud/talk/components/filebrowser/models/properties/NCPreview.java @@ -23,12 +23,8 @@ package com.nextcloud.talk.components.filebrowser.models.properties; import android.text.TextUtils; import android.util.Log; -import at.bitfire.dav4android.Property; -import at.bitfire.dav4android.PropertyFactory; -import at.bitfire.dav4android.XmlUtils; import com.nextcloud.talk.components.filebrowser.webdav.DavUtils; -import lombok.Getter; -import lombok.Setter; + import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.xmlpull.v1.XmlPullParser; @@ -36,17 +32,27 @@ import org.xmlpull.v1.XmlPullParserException; import java.io.IOException; +import at.bitfire.dav4android.Property; +import at.bitfire.dav4android.PropertyFactory; +import at.bitfire.dav4android.XmlUtils; + public class NCPreview implements Property { public static final Property.Name NAME = new Property.Name(DavUtils.NC_NAMESPACE, DavUtils.EXTENDED_PROPERTY_HAS_PREVIEW); - @Getter - @Setter private boolean ncPreview; private NCPreview(boolean hasPreview) { ncPreview = hasPreview; } + public boolean isNcPreview() { + return this.ncPreview; + } + + public void setNcPreview(boolean ncPreview) { + this.ncPreview = ncPreview; + } + public static class Factory implements PropertyFactory { @Nullable diff --git a/app/src/main/java/com/nextcloud/talk/components/filebrowser/models/properties/OCFavorite.java b/app/src/main/java/com/nextcloud/talk/components/filebrowser/models/properties/OCFavorite.java index a233cf17b..85182119c 100644 --- a/app/src/main/java/com/nextcloud/talk/components/filebrowser/models/properties/OCFavorite.java +++ b/app/src/main/java/com/nextcloud/talk/components/filebrowser/models/properties/OCFavorite.java @@ -23,12 +23,8 @@ package com.nextcloud.talk.components.filebrowser.models.properties; import android.text.TextUtils; import android.util.Log; -import at.bitfire.dav4android.Property; -import at.bitfire.dav4android.PropertyFactory; -import at.bitfire.dav4android.XmlUtils; import com.nextcloud.talk.components.filebrowser.webdav.DavUtils; -import lombok.Getter; -import lombok.Setter; + import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.xmlpull.v1.XmlPullParser; @@ -36,17 +32,27 @@ import org.xmlpull.v1.XmlPullParserException; import java.io.IOException; +import at.bitfire.dav4android.Property; +import at.bitfire.dav4android.PropertyFactory; +import at.bitfire.dav4android.XmlUtils; + public class OCFavorite implements Property { public static final Property.Name NAME = new Property.Name(DavUtils.OC_NAMESPACE, DavUtils.EXTENDED_PROPERTY_FAVORITE); - @Getter - @Setter private boolean ocFavorite; OCFavorite(boolean isFavorite) { ocFavorite = isFavorite; } + public boolean isOcFavorite() { + return this.ocFavorite; + } + + public void setOcFavorite(boolean ocFavorite) { + this.ocFavorite = ocFavorite; + } + public static class Factory implements PropertyFactory { @Nullable diff --git a/app/src/main/java/com/nextcloud/talk/components/filebrowser/models/properties/OCId.java b/app/src/main/java/com/nextcloud/talk/components/filebrowser/models/properties/OCId.java index f52b09fe3..a90ac2e04 100644 --- a/app/src/main/java/com/nextcloud/talk/components/filebrowser/models/properties/OCId.java +++ b/app/src/main/java/com/nextcloud/talk/components/filebrowser/models/properties/OCId.java @@ -23,12 +23,8 @@ package com.nextcloud.talk.components.filebrowser.models.properties; import android.text.TextUtils; import android.util.Log; -import at.bitfire.dav4android.Property; -import at.bitfire.dav4android.PropertyFactory; -import at.bitfire.dav4android.XmlUtils; import com.nextcloud.talk.components.filebrowser.webdav.DavUtils; -import lombok.Getter; -import lombok.Setter; + import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.xmlpull.v1.XmlPullParser; @@ -36,17 +32,27 @@ import org.xmlpull.v1.XmlPullParserException; import java.io.IOException; +import at.bitfire.dav4android.Property; +import at.bitfire.dav4android.PropertyFactory; +import at.bitfire.dav4android.XmlUtils; + public class OCId implements Property { public static final Name NAME = new Name(DavUtils.OC_NAMESPACE, DavUtils.EXTENDED_PROPERTY_NAME_REMOTE_ID); - @Getter - @Setter private String ocId; private OCId(String id) { ocId = id; } + public String getOcId() { + return this.ocId; + } + + public void setOcId(String ocId) { + this.ocId = ocId; + } + public static class Factory implements PropertyFactory { @Nullable diff --git a/app/src/main/java/com/nextcloud/talk/components/filebrowser/models/properties/OCSize.java b/app/src/main/java/com/nextcloud/talk/components/filebrowser/models/properties/OCSize.java index ae60867be..188fc3c3b 100644 --- a/app/src/main/java/com/nextcloud/talk/components/filebrowser/models/properties/OCSize.java +++ b/app/src/main/java/com/nextcloud/talk/components/filebrowser/models/properties/OCSize.java @@ -23,13 +23,8 @@ package com.nextcloud.talk.components.filebrowser.models.properties; import android.text.TextUtils; import android.util.Log; -import at.bitfire.dav4android.Property; -import at.bitfire.dav4android.PropertyFactory; -import at.bitfire.dav4android.XmlUtils; import com.nextcloud.talk.components.filebrowser.webdav.DavUtils; -import lombok.Getter; -import lombok.Setter; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.xmlpull.v1.XmlPullParser; @@ -37,17 +32,27 @@ import org.xmlpull.v1.XmlPullParserException; import java.io.IOException; +import at.bitfire.dav4android.Property; +import at.bitfire.dav4android.PropertyFactory; +import at.bitfire.dav4android.XmlUtils; + public class OCSize implements Property { public static final Property.Name NAME = new Property.Name(DavUtils.OC_NAMESPACE, DavUtils.EXTENDED_PROPERTY_NAME_SIZE); - @Getter - @Setter private long ocSize; private OCSize(long size) { ocSize = size; } + public long getOcSize() { + return this.ocSize; + } + + public void setOcSize(long ocSize) { + this.ocSize = ocSize; + } + public static class Factory implements PropertyFactory { @Nullable 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 299cb02f6..e5bf4b84d 100644 --- a/app/src/main/java/com/nextcloud/talk/events/BottomSheetLockEvent.java +++ b/app/src/main/java/com/nextcloud/talk/events/BottomSheetLockEvent.java @@ -20,9 +20,6 @@ package com.nextcloud.talk.events; -import lombok.Data; - -@Data public class BottomSheetLockEvent { private final boolean cancelable; private final int delay; @@ -47,4 +44,75 @@ public class BottomSheetLockEvent { this.dismissView = dismissView; } + public boolean isCancelable() { + return this.cancelable; + } + + public int getDelay() { + return this.delay; + } + + public boolean isShouldRefreshData() { + return this.shouldRefreshData; + } + + public boolean isCancel() { + return this.cancel; + } + + public boolean isDismissView() { + return this.dismissView; + } + + public void setDismissView(boolean dismissView) { + this.dismissView = dismissView; + } + + public boolean equals(final Object o) { + if (o == this) { + return true; + } + if (!(o instanceof BottomSheetLockEvent)) { + return false; + } + final BottomSheetLockEvent other = (BottomSheetLockEvent) o; + if (!other.canEqual((Object) this)) { + return false; + } + if (this.isCancelable() != other.isCancelable()) { + return false; + } + if (this.getDelay() != other.getDelay()) { + return false; + } + if (this.isShouldRefreshData() != other.isShouldRefreshData()) { + return false; + } + if (this.isCancel() != other.isCancel()) { + return false; + } + if (this.isDismissView() != other.isDismissView()) { + return false; + } + return true; + } + + protected boolean canEqual(final Object other) { + return other instanceof BottomSheetLockEvent; + } + + public int hashCode() { + final int PRIME = 59; + int result = 1; + result = result * PRIME + (this.isCancelable() ? 79 : 97); + result = result * PRIME + this.getDelay(); + result = result * PRIME + (this.isShouldRefreshData() ? 79 : 97); + result = result * PRIME + (this.isCancel() ? 79 : 97); + result = result * PRIME + (this.isDismissView() ? 79 : 97); + return result; + } + + public String toString() { + return "BottomSheetLockEvent(cancelable=" + this.isCancelable() + ", delay=" + this.getDelay() + ", shouldRefreshData=" + this.isShouldRefreshData() + ", cancel=" + this.isCancel() + ", dismissView=" + this.isDismissView() + ")"; + } } 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 b8c86a201..bb58558e8 100644 --- a/app/src/main/java/com/nextcloud/talk/events/ConfigurationChangeEvent.java +++ b/app/src/main/java/com/nextcloud/talk/events/ConfigurationChangeEvent.java @@ -20,8 +20,34 @@ package com.nextcloud.talk.events; -import lombok.Data; - -@Data public class ConfigurationChangeEvent { + public ConfigurationChangeEvent() { + } + + public boolean equals(final Object o) { + if (o == this) { + return true; + } + if (!(o instanceof ConfigurationChangeEvent)) { + return false; + } + final ConfigurationChangeEvent other = (ConfigurationChangeEvent) o; + if (!other.canEqual((Object) this)) { + return false; + } + return true; + } + + protected boolean canEqual(final Object other) { + return other instanceof ConfigurationChangeEvent; + } + + public int hashCode() { + int result = 1; + return result; + } + + public String toString() { + return "ConfigurationChangeEvent()"; + } } 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 ef3e72b15..d0adeac7f 100644 --- a/app/src/main/java/com/nextcloud/talk/events/EventStatus.java +++ b/app/src/main/java/com/nextcloud/talk/events/EventStatus.java @@ -20,9 +20,6 @@ package com.nextcloud.talk.events; -import lombok.Data; - -@Data public class EventStatus { private long userId; private EventType eventType; @@ -34,6 +31,74 @@ public class EventStatus { this.allGood = allGood; } + public long getUserId() { + return this.userId; + } + + public EventType getEventType() { + return this.eventType; + } + + public boolean isAllGood() { + return this.allGood; + } + + public void setUserId(long userId) { + this.userId = userId; + } + + public void setEventType(EventType eventType) { + this.eventType = eventType; + } + + public void setAllGood(boolean allGood) { + this.allGood = allGood; + } + + public boolean equals(final Object o) { + if (o == this) { + return true; + } + if (!(o instanceof EventStatus)) { + return false; + } + final EventStatus other = (EventStatus) o; + if (!other.canEqual((Object) this)) { + return false; + } + if (this.getUserId() != other.getUserId()) { + return false; + } + final Object this$eventType = this.getEventType(); + final Object other$eventType = other.getEventType(); + if (this$eventType == null ? other$eventType != null : !this$eventType.equals(other$eventType)) { + return false; + } + if (this.isAllGood() != other.isAllGood()) { + return false; + } + return true; + } + + protected boolean canEqual(final Object other) { + return other instanceof EventStatus; + } + + public int hashCode() { + final int PRIME = 59; + int result = 1; + final long $userId = this.getUserId(); + result = result * PRIME + (int) ($userId >>> 32 ^ $userId); + final Object $eventType = this.getEventType(); + result = result * PRIME + ($eventType == null ? 43 : $eventType.hashCode()); + result = result * PRIME + (this.isAllGood() ? 79 : 97); + return result; + } + + public String toString() { + return "EventStatus(userId=" + this.getUserId() + ", eventType=" + this.getEventType() + ", allGood=" + this.isAllGood() + ")"; + } + public enum EventType { PUSH_REGISTRATION, CAPABILITIES_FETCH, SIGNALING_SETTINGS, CONVERSATION_UPDATE, PARTICIPANTS_UPDATE } 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 3b9afaad7..23b0ca84d 100644 --- a/app/src/main/java/com/nextcloud/talk/events/MediaStreamEvent.java +++ b/app/src/main/java/com/nextcloud/talk/events/MediaStreamEvent.java @@ -20,11 +20,10 @@ package com.nextcloud.talk.events; -import androidx.annotation.Nullable; -import lombok.Data; import org.webrtc.MediaStream; -@Data +import androidx.annotation.Nullable; + public class MediaStreamEvent { private final MediaStream mediaStream; private final String session; @@ -35,4 +34,65 @@ public class MediaStreamEvent { this.session = session; this.videoStreamType = videoStreamType; } + + public MediaStream getMediaStream() { + return this.mediaStream; + } + + public String getSession() { + return this.session; + } + + public String getVideoStreamType() { + return this.videoStreamType; + } + + public boolean equals(final Object o) { + if (o == this) { + return true; + } + if (!(o instanceof MediaStreamEvent)) { + return false; + } + final MediaStreamEvent other = (MediaStreamEvent) o; + if (!other.canEqual((Object) this)) { + return false; + } + final Object this$mediaStream = this.getMediaStream(); + final Object other$mediaStream = other.getMediaStream(); + if (this$mediaStream == null ? other$mediaStream != null : !this$mediaStream.equals(other$mediaStream)) { + return false; + } + final Object this$session = this.getSession(); + final Object other$session = other.getSession(); + if (this$session == null ? other$session != null : !this$session.equals(other$session)) { + return false; + } + 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; + } + + protected boolean canEqual(final Object other) { + return other instanceof MediaStreamEvent; + } + + public int hashCode() { + final int PRIME = 59; + int result = 1; + final Object $mediaStream = this.getMediaStream(); + result = result * PRIME + ($mediaStream == null ? 43 : $mediaStream.hashCode()); + final Object $session = this.getSession(); + result = result * PRIME + ($session == null ? 43 : $session.hashCode()); + final Object $videoStreamType = this.getVideoStreamType(); + result = result * PRIME + ($videoStreamType == null ? 43 : $videoStreamType.hashCode()); + return result; + } + + public String toString() { + return "MediaStreamEvent(mediaStream=" + this.getMediaStream() + ", session=" + this.getSession() + ", videoStreamType=" + this.getVideoStreamType() + ")"; + } } 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 bca88d9e4..6b15ae856 100644 --- a/app/src/main/java/com/nextcloud/talk/events/MoreMenuClickEvent.java +++ b/app/src/main/java/com/nextcloud/talk/events/MoreMenuClickEvent.java @@ -21,13 +21,50 @@ package com.nextcloud.talk.events; import com.nextcloud.talk.models.json.conversations.Conversation; -import lombok.Data; -@Data public class MoreMenuClickEvent { private final Conversation conversation; public MoreMenuClickEvent(Conversation conversation) { this.conversation = conversation; } + + public Conversation getConversation() { + return this.conversation; + } + + public boolean equals(final Object o) { + if (o == this) { + return true; + } + if (!(o instanceof MoreMenuClickEvent)) { + return false; + } + final MoreMenuClickEvent other = (MoreMenuClickEvent) o; + if (!other.canEqual((Object) this)) { + return false; + } + 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; + } + + protected boolean canEqual(final Object other) { + return other instanceof MoreMenuClickEvent; + } + + public int hashCode() { + final int PRIME = 59; + int result = 1; + final Object $conversation = this.getConversation(); + result = result * PRIME + ($conversation == null ? 43 : $conversation.hashCode()); + return result; + } + + public String toString() { + return "MoreMenuClickEvent(conversation=" + this.getConversation() + ")"; + } } 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 76406661d..e54ca6547 100644 --- a/app/src/main/java/com/nextcloud/talk/events/NetworkEvent.java +++ b/app/src/main/java/com/nextcloud/talk/events/NetworkEvent.java @@ -20,10 +20,46 @@ package com.nextcloud.talk.events; -import lombok.Data; - -@Data public class NetworkEvent { + public NetworkConnectionEvent getNetworkConnectionEvent() { + return this.networkConnectionEvent; + } + + public boolean equals(final Object o) { + if (o == this) { + return true; + } + if (!(o instanceof NetworkEvent)) { + return false; + } + final NetworkEvent other = (NetworkEvent) o; + if (!other.canEqual((Object) this)) { + return false; + } + 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; + } + + protected boolean canEqual(final Object other) { + return other instanceof NetworkEvent; + } + + public int hashCode() { + final int PRIME = 59; + int result = 1; + final Object $networkConnectionEvent = this.getNetworkConnectionEvent(); + result = result * PRIME + ($networkConnectionEvent == null ? 43 : $networkConnectionEvent.hashCode()); + return result; + } + + public String toString() { + return "NetworkEvent(networkConnectionEvent=" + this.getNetworkConnectionEvent() + ")"; + } + public enum NetworkConnectionEvent { NETWORK_CONNECTED, NETWORK_DISCONNECTED } 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 c6ef6e0e8..0e83e3110 100644 --- a/app/src/main/java/com/nextcloud/talk/events/PeerConnectionEvent.java +++ b/app/src/main/java/com/nextcloud/talk/events/PeerConnectionEvent.java @@ -21,9 +21,7 @@ package com.nextcloud.talk.events; import androidx.annotation.Nullable; -import lombok.Data; -@Data public class PeerConnectionEvent { private final PeerConnectionEventType peerConnectionEventType; private final String sessionId; @@ -40,6 +38,89 @@ public class PeerConnectionEvent { this.videoStreamType = videoStreamType; } + public PeerConnectionEventType getPeerConnectionEventType() { + return this.peerConnectionEventType; + } + + public String getSessionId() { + return this.sessionId; + } + + public String getNick() { + return this.nick; + } + + public Boolean getChangeValue() { + return this.changeValue; + } + + public String getVideoStreamType() { + return this.videoStreamType; + } + + public boolean equals(final Object o) { + if (o == this) { + return true; + } + if (!(o instanceof PeerConnectionEvent)) { + return false; + } + final PeerConnectionEvent other = (PeerConnectionEvent) o; + if (!other.canEqual((Object) this)) { + return false; + } + final Object this$peerConnectionEventType = this.getPeerConnectionEventType(); + final Object other$peerConnectionEventType = other.getPeerConnectionEventType(); + if (this$peerConnectionEventType == null ? other$peerConnectionEventType != null : !this$peerConnectionEventType.equals(other$peerConnectionEventType)) { + return false; + } + 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; + } + final Object this$nick = this.getNick(); + final Object other$nick = other.getNick(); + if (this$nick == null ? other$nick != null : !this$nick.equals(other$nick)) { + return false; + } + final Object this$changeValue = this.getChangeValue(); + final Object other$changeValue = other.getChangeValue(); + if (this$changeValue == null ? other$changeValue != null : !this$changeValue.equals(other$changeValue)) { + return false; + } + 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; + } + + protected boolean canEqual(final Object other) { + return other instanceof PeerConnectionEvent; + } + + public int hashCode() { + final int PRIME = 59; + int result = 1; + final Object $peerConnectionEventType = this.getPeerConnectionEventType(); + result = result * PRIME + ($peerConnectionEventType == null ? 43 : $peerConnectionEventType.hashCode()); + final Object $sessionId = this.getSessionId(); + result = result * PRIME + ($sessionId == null ? 43 : $sessionId.hashCode()); + final Object $nick = this.getNick(); + result = result * PRIME + ($nick == null ? 43 : $nick.hashCode()); + final Object $changeValue = this.getChangeValue(); + result = result * PRIME + ($changeValue == null ? 43 : $changeValue.hashCode()); + final Object $videoStreamType = this.getVideoStreamType(); + result = result * PRIME + ($videoStreamType == null ? 43 : $videoStreamType.hashCode()); + return result; + } + + public String toString() { + return "PeerConnectionEvent(peerConnectionEventType=" + this.getPeerConnectionEventType() + ", sessionId=" + this.getSessionId() + ", nick=" + this.getNick() + ", changeValue=" + this.getChangeValue() + ", videoStreamType=" + this.getVideoStreamType() + ")"; + } + public enum PeerConnectionEventType { PEER_CONNECTED, PEER_CLOSED, SENSOR_FAR, SENSOR_NEAR, NICK_CHANGE, AUDIO_CHANGE, VIDEO_CHANGE, PUBLISHER_FAILED } 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 4fd81563f..c6030f49b 100644 --- a/app/src/main/java/com/nextcloud/talk/events/SessionDescriptionSendEvent.java +++ b/app/src/main/java/com/nextcloud/talk/events/SessionDescriptionSendEvent.java @@ -20,12 +20,12 @@ package com.nextcloud.talk.events; -import androidx.annotation.Nullable; import com.nextcloud.talk.models.json.signaling.NCIceCandidate; -import lombok.Data; + import org.webrtc.SessionDescription; -@Data +import androidx.annotation.Nullable; + public class SessionDescriptionSendEvent { @Nullable private final SessionDescription sessionDescription; @@ -43,4 +43,89 @@ public class SessionDescriptionSendEvent { this.ncIceCandidate = ncIceCandidate; this.videoStreamType = videoStreamType; } + + @Nullable + public SessionDescription getSessionDescription() { + return this.sessionDescription; + } + + public String getPeerId() { + return this.peerId; + } + + public String getType() { + return this.type; + } + + @Nullable + public NCIceCandidate getNcIceCandidate() { + return this.ncIceCandidate; + } + + public String getVideoStreamType() { + return this.videoStreamType; + } + + public boolean equals(final Object o) { + if (o == this) { + return true; + } + if (!(o instanceof SessionDescriptionSendEvent)) { + return false; + } + final SessionDescriptionSendEvent other = (SessionDescriptionSendEvent) o; + if (!other.canEqual((Object) this)) { + return false; + } + final Object this$sessionDescription = this.getSessionDescription(); + final Object other$sessionDescription = other.getSessionDescription(); + if (this$sessionDescription == null ? other$sessionDescription != null : !this$sessionDescription.equals(other$sessionDescription)) { + return false; + } + final Object this$peerId = this.getPeerId(); + final Object other$peerId = other.getPeerId(); + if (this$peerId == null ? other$peerId != null : !this$peerId.equals(other$peerId)) { + return false; + } + 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; + } + final Object this$ncIceCandidate = this.getNcIceCandidate(); + final Object other$ncIceCandidate = other.getNcIceCandidate(); + if (this$ncIceCandidate == null ? other$ncIceCandidate != null : !this$ncIceCandidate.equals(other$ncIceCandidate)) { + return false; + } + 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; + } + + protected boolean canEqual(final Object other) { + return other instanceof SessionDescriptionSendEvent; + } + + public int hashCode() { + final int PRIME = 59; + int result = 1; + final Object $sessionDescription = this.getSessionDescription(); + result = result * PRIME + ($sessionDescription == null ? 43 : $sessionDescription.hashCode()); + final Object $peerId = this.getPeerId(); + result = result * PRIME + ($peerId == null ? 43 : $peerId.hashCode()); + final Object $type = this.getType(); + result = result * PRIME + ($type == null ? 43 : $type.hashCode()); + final Object $ncIceCandidate = this.getNcIceCandidate(); + result = result * PRIME + ($ncIceCandidate == null ? 43 : $ncIceCandidate.hashCode()); + final Object $videoStreamType = this.getVideoStreamType(); + result = result * PRIME + ($videoStreamType == null ? 43 : $videoStreamType.hashCode()); + return result; + } + + public String toString() { + return "SessionDescriptionSendEvent(sessionDescription=" + this.getSessionDescription() + ", peerId=" + this.getPeerId() + ", type=" + this.getType() + ", ncIceCandidate=" + this.getNcIceCandidate() + ", videoStreamType=" + this.getVideoStreamType() + ")"; + } } 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 351fa39e0..8e3d0f087 100644 --- a/app/src/main/java/com/nextcloud/talk/events/UserMentionClickEvent.java +++ b/app/src/main/java/com/nextcloud/talk/events/UserMentionClickEvent.java @@ -20,9 +20,49 @@ package com.nextcloud.talk.events; -import lombok.Data; - -@Data public class UserMentionClickEvent { public final String userId; + + public UserMentionClickEvent(String userId) { + this.userId = userId; + } + + public String getUserId() { + return this.userId; + } + + public boolean equals(final Object o) { + if (o == this) { + return true; + } + if (!(o instanceof UserMentionClickEvent)) { + return false; + } + final UserMentionClickEvent other = (UserMentionClickEvent) o; + if (!other.canEqual((Object) this)) { + return false; + } + 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; + } + + protected boolean canEqual(final Object other) { + return other instanceof UserMentionClickEvent; + } + + public int hashCode() { + final int PRIME = 59; + int result = 1; + final Object $userId = this.getUserId(); + result = result * PRIME + ($userId == null ? 43 : $userId.hashCode()); + return result; + } + + public String toString() { + return "UserMentionClickEvent(userId=" + this.getUserId() + ")"; + } } 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 c801af4b2..1a31582c1 100644 --- a/app/src/main/java/com/nextcloud/talk/events/WebSocketCommunicationEvent.java +++ b/app/src/main/java/com/nextcloud/talk/events/WebSocketCommunicationEvent.java @@ -20,14 +20,68 @@ package com.nextcloud.talk.events; -import androidx.annotation.Nullable; -import lombok.Data; - import java.util.HashMap; -@Data +import androidx.annotation.Nullable; + public class WebSocketCommunicationEvent { public final String type; @Nullable public final HashMap hashMap; + + public WebSocketCommunicationEvent(String type, HashMap hashMap) { + this.type = type; + this.hashMap = hashMap; + } + + public String getType() { + return this.type; + } + + @Nullable + public HashMap getHashMap() { + return this.hashMap; + } + + public boolean equals(final Object o) { + if (o == this) { + return true; + } + if (!(o instanceof WebSocketCommunicationEvent)) { + return false; + } + final WebSocketCommunicationEvent other = (WebSocketCommunicationEvent) o; + if (!other.canEqual((Object) this)) { + return false; + } + 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; + } + 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; + } + + protected boolean canEqual(final Object other) { + return other instanceof WebSocketCommunicationEvent; + } + + public int hashCode() { + final int PRIME = 59; + int result = 1; + final Object $type = this.getType(); + result = result * PRIME + ($type == null ? 43 : $type.hashCode()); + final Object $hashMap = this.getHashMap(); + result = result * PRIME + ($hashMap == null ? 43 : $hashMap.hashCode()); + return result; + } + + public String toString() { + return "WebSocketCommunicationEvent(type=" + this.getType() + ", hashMap=" + this.getHashMap() + ")"; + } } \ No newline at end of file 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 4871421b2..095a5cb3f 100644 --- a/app/src/main/java/com/nextcloud/talk/models/ExternalSignalingServer.java +++ b/app/src/main/java/com/nextcloud/talk/models/ExternalSignalingServer.java @@ -22,10 +22,9 @@ package com.nextcloud.talk.models; import com.bluelinelabs.logansquare.annotation.JsonField; import com.bluelinelabs.logansquare.annotation.JsonObject; -import lombok.Data; + import org.parceler.Parcel; -@Data @Parcel @JsonObject public class ExternalSignalingServer { @@ -33,4 +32,65 @@ public class ExternalSignalingServer { String externalSignalingServer; @JsonField(name = "externalSignalingTicket") String externalSignalingTicket; + + public ExternalSignalingServer() { + } + + public String getExternalSignalingServer() { + return this.externalSignalingServer; + } + + public String getExternalSignalingTicket() { + return this.externalSignalingTicket; + } + + public void setExternalSignalingServer(String externalSignalingServer) { + this.externalSignalingServer = externalSignalingServer; + } + + public void setExternalSignalingTicket(String externalSignalingTicket) { + this.externalSignalingTicket = externalSignalingTicket; + } + + public boolean equals(final Object o) { + if (o == this) { + return true; + } + if (!(o instanceof ExternalSignalingServer)) { + return false; + } + final ExternalSignalingServer other = (ExternalSignalingServer) o; + if (!other.canEqual((Object) this)) { + return false; + } + final Object this$externalSignalingServer = this.getExternalSignalingServer(); + final Object other$externalSignalingServer = other.getExternalSignalingServer(); + if (this$externalSignalingServer == null ? other$externalSignalingServer != null : !this$externalSignalingServer.equals(other$externalSignalingServer)) { + return false; + } + 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; + } + + protected boolean canEqual(final Object other) { + return other instanceof ExternalSignalingServer; + } + + public int hashCode() { + final int PRIME = 59; + int result = 1; + final Object $externalSignalingServer = this.getExternalSignalingServer(); + result = result * PRIME + ($externalSignalingServer == null ? 43 : $externalSignalingServer.hashCode()); + final Object $externalSignalingTicket = this.getExternalSignalingTicket(); + result = result * PRIME + ($externalSignalingTicket == null ? 43 : $externalSignalingTicket.hashCode()); + return result; + } + + public String toString() { + return "ExternalSignalingServer(externalSignalingServer=" + this.getExternalSignalingServer() + ", externalSignalingTicket=" + this.getExternalSignalingTicket() + ")"; + } } 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 b2f40f90e..202ace338 100644 --- a/app/src/main/java/com/nextcloud/talk/models/ImportAccount.java +++ b/app/src/main/java/com/nextcloud/talk/models/ImportAccount.java @@ -21,9 +21,7 @@ package com.nextcloud.talk.models; import androidx.annotation.Nullable; -import lombok.Data; -@Data public class ImportAccount { public String username; @Nullable @@ -35,4 +33,78 @@ public class ImportAccount { this.token = token; this.baseUrl = baseUrl; } + + public String getUsername() { + return this.username; + } + + @Nullable + public String getToken() { + return this.token; + } + + public String getBaseUrl() { + return this.baseUrl; + } + + public void setUsername(String username) { + this.username = username; + } + + public void setToken(@Nullable String token) { + this.token = token; + } + + public void setBaseUrl(String baseUrl) { + this.baseUrl = baseUrl; + } + + public boolean equals(final Object o) { + if (o == this) { + return true; + } + if (!(o instanceof ImportAccount)) { + return false; + } + final ImportAccount other = (ImportAccount) o; + if (!other.canEqual((Object) this)) { + return false; + } + final Object this$username = this.getUsername(); + final Object other$username = other.getUsername(); + if (this$username == null ? other$username != null : !this$username.equals(other$username)) { + return false; + } + 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; + } + 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; + } + + protected boolean canEqual(final Object other) { + return other instanceof ImportAccount; + } + + public int hashCode() { + final int PRIME = 59; + int result = 1; + final Object $username = this.getUsername(); + result = result * PRIME + ($username == null ? 43 : $username.hashCode()); + final Object $token = this.getToken(); + result = result * PRIME + ($token == null ? 43 : $token.hashCode()); + final Object $baseUrl = this.getBaseUrl(); + result = result * PRIME + ($baseUrl == null ? 43 : $baseUrl.hashCode()); + return result; + } + + public String toString() { + return "ImportAccount(username=" + this.getUsername() + ", token=" + this.getToken() + ", baseUrl=" + this.getBaseUrl() + ")"; + } } 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 74b4b56e9..203598be1 100644 --- a/app/src/main/java/com/nextcloud/talk/models/LoginData.java +++ b/app/src/main/java/com/nextcloud/talk/models/LoginData.java @@ -20,13 +20,87 @@ */ package com.nextcloud.talk.models; -import lombok.Data; import org.parceler.Parcel; @Parcel -@Data public class LoginData { String serverUrl; String username; String token; + + public LoginData() { + } + + public String getServerUrl() { + return this.serverUrl; + } + + public String getUsername() { + return this.username; + } + + public String getToken() { + return this.token; + } + + public void setServerUrl(String serverUrl) { + this.serverUrl = serverUrl; + } + + public void setUsername(String username) { + this.username = username; + } + + public void setToken(String token) { + this.token = token; + } + + public boolean equals(final Object o) { + if (o == this) { + return true; + } + if (!(o instanceof LoginData)) { + return false; + } + final LoginData other = (LoginData) o; + if (!other.canEqual((Object) this)) { + return false; + } + final Object this$serverUrl = this.getServerUrl(); + final Object other$serverUrl = other.getServerUrl(); + if (this$serverUrl == null ? other$serverUrl != null : !this$serverUrl.equals(other$serverUrl)) { + return false; + } + final Object this$username = this.getUsername(); + final Object other$username = other.getUsername(); + if (this$username == null ? other$username != null : !this$username.equals(other$username)) { + return false; + } + 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; + } + + protected boolean canEqual(final Object other) { + return other instanceof LoginData; + } + + public int hashCode() { + final int PRIME = 59; + int result = 1; + final Object $serverUrl = this.getServerUrl(); + result = result * PRIME + ($serverUrl == null ? 43 : $serverUrl.hashCode()); + final Object $username = this.getUsername(); + result = result * PRIME + ($username == null ? 43 : $username.hashCode()); + final Object $token = this.getToken(); + result = result * PRIME + ($token == null ? 43 : $token.hashCode()); + return result; + } + + public String toString() { + return "LoginData(serverUrl=" + this.getServerUrl() + ", username=" + this.getUsername() + ", token=" + this.getToken() + ")"; + } } 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 8ea7a07e8..051ac0b7a 100644 --- a/app/src/main/java/com/nextcloud/talk/models/RetrofitBucket.java +++ b/app/src/main/java/com/nextcloud/talk/models/RetrofitBucket.java @@ -19,14 +19,73 @@ */ package com.nextcloud.talk.models; -import lombok.Data; import org.parceler.Parcel; import java.util.Map; @Parcel -@Data public class RetrofitBucket { public String url; public Map queryMap; + + public RetrofitBucket() { + } + + public String getUrl() { + return this.url; + } + + public Map getQueryMap() { + return this.queryMap; + } + + public void setUrl(String url) { + this.url = url; + } + + public void setQueryMap(Map queryMap) { + this.queryMap = queryMap; + } + + public boolean equals(final Object o) { + if (o == this) { + return true; + } + if (!(o instanceof RetrofitBucket)) { + return false; + } + final RetrofitBucket other = (RetrofitBucket) o; + if (!other.canEqual((Object) this)) { + return false; + } + final Object this$url = this.getUrl(); + final Object other$url = other.getUrl(); + if (this$url == null ? other$url != null : !this$url.equals(other$url)) { + return false; + } + 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; + } + + protected boolean canEqual(final Object other) { + return other instanceof RetrofitBucket; + } + + public int hashCode() { + final int PRIME = 59; + int result = 1; + final Object $url = this.getUrl(); + result = result * PRIME + ($url == null ? 43 : $url.hashCode()); + final Object $queryMap = this.getQueryMap(); + result = result * PRIME + ($queryMap == null ? 43 : $queryMap.hashCode()); + return result; + } + + public String toString() { + return "RetrofitBucket(url=" + this.getUrl() + ", queryMap=" + this.getQueryMap() + ")"; + } } 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 b62f77b51..585367bfc 100644 --- a/app/src/main/java/com/nextcloud/talk/models/RingtoneSettings.java +++ b/app/src/main/java/com/nextcloud/talk/models/RingtoneSettings.java @@ -21,20 +21,83 @@ package com.nextcloud.talk.models; import android.net.Uri; -import androidx.annotation.Nullable; + import com.bluelinelabs.logansquare.annotation.JsonField; import com.bluelinelabs.logansquare.annotation.JsonObject; import com.nextcloud.talk.models.json.converters.UriTypeConverter; -import lombok.Data; + import org.parceler.Parcel; +import androidx.annotation.Nullable; + @Parcel @JsonObject -@Data public class RingtoneSettings { @JsonField(name = "ringtoneUri", typeConverter = UriTypeConverter.class) @Nullable public Uri ringtoneUri; @JsonField(name = "ringtoneName") public String ringtoneName; + + public RingtoneSettings() { + } + + @Nullable + public Uri getRingtoneUri() { + return this.ringtoneUri; + } + + public String getRingtoneName() { + return this.ringtoneName; + } + + public void setRingtoneUri(@Nullable Uri ringtoneUri) { + this.ringtoneUri = ringtoneUri; + } + + public void setRingtoneName(String ringtoneName) { + this.ringtoneName = ringtoneName; + } + + public boolean equals(final Object o) { + if (o == this) { + return true; + } + if (!(o instanceof RingtoneSettings)) { + return false; + } + final RingtoneSettings other = (RingtoneSettings) o; + if (!other.canEqual((Object) this)) { + return false; + } + final Object this$ringtoneUri = this.getRingtoneUri(); + final Object other$ringtoneUri = other.getRingtoneUri(); + if (this$ringtoneUri == null ? other$ringtoneUri != null : !this$ringtoneUri.equals(other$ringtoneUri)) { + return false; + } + 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; + } + + protected boolean canEqual(final Object other) { + return other instanceof RingtoneSettings; + } + + public int hashCode() { + final int PRIME = 59; + int result = 1; + final Object $ringtoneUri = this.getRingtoneUri(); + result = result * PRIME + ($ringtoneUri == null ? 43 : $ringtoneUri.hashCode()); + final Object $ringtoneName = this.getRingtoneName(); + result = result * PRIME + ($ringtoneName == null ? 43 : $ringtoneName.hashCode()); + return result; + } + + public String toString() { + return "RingtoneSettings(ringtoneUri=" + this.getRingtoneUri() + ", ringtoneName=" + this.getRingtoneName() + ")"; + } } 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 d308f9c34..1e8895027 100644 --- a/app/src/main/java/com/nextcloud/talk/models/SignatureVerification.java +++ b/app/src/main/java/com/nextcloud/talk/models/SignatureVerification.java @@ -22,12 +22,69 @@ package com.nextcloud.talk.models; import com.nextcloud.talk.models.database.UserEntity; -import lombok.Data; + import org.parceler.Parcel; -@Data @Parcel public class SignatureVerification { public boolean signatureValid; public UserEntity userEntity; + + public SignatureVerification() { + } + + public boolean isSignatureValid() { + return this.signatureValid; + } + + public UserEntity getUserEntity() { + return this.userEntity; + } + + public void setSignatureValid(boolean signatureValid) { + this.signatureValid = signatureValid; + } + + public void setUserEntity(UserEntity userEntity) { + this.userEntity = userEntity; + } + + public boolean equals(final Object o) { + if (o == this) { + return true; + } + if (!(o instanceof SignatureVerification)) { + return false; + } + final SignatureVerification other = (SignatureVerification) o; + if (!other.canEqual((Object) this)) { + return false; + } + if (this.isSignatureValid() != other.isSignatureValid()) { + return false; + } + 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; + } + + protected boolean canEqual(final Object other) { + return other instanceof SignatureVerification; + } + + public int hashCode() { + final int PRIME = 59; + int result = 1; + result = result * PRIME + (this.isSignatureValid() ? 79 : 97); + final Object $userEntity = this.getUserEntity(); + result = result * PRIME + ($userEntity == null ? 43 : $userEntity.hashCode()); + return result; + } + + public String toString() { + return "SignatureVerification(signatureValid=" + this.isSignatureValid() + ", userEntity=" + this.getUserEntity() + ")"; + } } 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 934911627..4e00f6e57 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 @@ -23,15 +23,60 @@ package com.nextcloud.talk.models.json.autocomplete; import com.bluelinelabs.logansquare.annotation.JsonField; import com.bluelinelabs.logansquare.annotation.JsonObject; import com.nextcloud.talk.models.json.generic.GenericOCS; -import lombok.Data; + import org.parceler.Parcel; import java.util.List; @Parcel -@Data @JsonObject public class AutocompleteOCS extends GenericOCS { @JsonField(name = "data") List data; + + public AutocompleteOCS() { + } + + public List getData() { + return this.data; + } + + public void setData(List data) { + this.data = data; + } + + public boolean equals(final Object o) { + if (o == this) { + return true; + } + if (!(o instanceof AutocompleteOCS)) { + return false; + } + final AutocompleteOCS other = (AutocompleteOCS) o; + if (!other.canEqual((Object) this)) { + return false; + } + 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; + } + + protected boolean canEqual(final Object other) { + return other instanceof AutocompleteOCS; + } + + public int hashCode() { + final int PRIME = 59; + int result = 1; + final Object $data = this.getData(); + result = result * PRIME + ($data == null ? 43 : $data.hashCode()); + return result; + } + + public String toString() { + return "AutocompleteOCS(data=" + this.getData() + ")"; + } } 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 eaeb87aca..599d96eb4 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 @@ -22,13 +22,58 @@ package com.nextcloud.talk.models.json.autocomplete; import com.bluelinelabs.logansquare.annotation.JsonField; import com.bluelinelabs.logansquare.annotation.JsonObject; -import lombok.Data; + import org.parceler.Parcel; @Parcel -@Data @JsonObject public class AutocompleteOverall { @JsonField(name = "ocs") AutocompleteOCS ocs; + + public AutocompleteOverall() { + } + + public AutocompleteOCS getOcs() { + return this.ocs; + } + + public void setOcs(AutocompleteOCS ocs) { + this.ocs = ocs; + } + + public boolean equals(final Object o) { + if (o == this) { + return true; + } + if (!(o instanceof AutocompleteOverall)) { + return false; + } + final AutocompleteOverall other = (AutocompleteOverall) o; + if (!other.canEqual((Object) this)) { + return false; + } + 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; + } + + protected boolean canEqual(final Object other) { + return other instanceof AutocompleteOverall; + } + + public int hashCode() { + final int PRIME = 59; + int result = 1; + final Object $ocs = this.getOcs(); + result = result * PRIME + ($ocs == null ? 43 : $ocs.hashCode()); + return result; + } + + public String toString() { + return "AutocompleteOverall(ocs=" + this.getOcs() + ")"; + } } 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 271563233..35ac80555 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 @@ -22,11 +22,10 @@ package com.nextcloud.talk.models.json.autocomplete; import com.bluelinelabs.logansquare.annotation.JsonField; import com.bluelinelabs.logansquare.annotation.JsonObject; -import lombok.Data; + import org.parceler.Parcel; @Parcel -@Data @JsonObject public class AutocompleteUser { @JsonField(name = "id") @@ -37,4 +36,80 @@ public class AutocompleteUser { @JsonField(name = "source") String source; + + public AutocompleteUser() { + } + + public String getId() { + return this.id; + } + + public String getLabel() { + return this.label; + } + + public String getSource() { + return this.source; + } + + public void setId(String id) { + this.id = id; + } + + public void setLabel(String label) { + this.label = label; + } + + public void setSource(String source) { + this.source = source; + } + + public boolean equals(final Object o) { + if (o == this) { + return true; + } + if (!(o instanceof AutocompleteUser)) { + return false; + } + final AutocompleteUser other = (AutocompleteUser) o; + if (!other.canEqual((Object) this)) { + return false; + } + final Object this$id = this.getId(); + final Object other$id = other.getId(); + if (this$id == null ? other$id != null : !this$id.equals(other$id)) { + return false; + } + 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; + } + 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; + } + + protected boolean canEqual(final Object other) { + return other instanceof AutocompleteUser; + } + + public int hashCode() { + final int PRIME = 59; + int result = 1; + final Object $id = this.getId(); + result = result * PRIME + ($id == null ? 43 : $id.hashCode()); + final Object $label = this.getLabel(); + result = result * PRIME + ($label == null ? 43 : $label.hashCode()); + final Object $source = this.getSource(); + result = result * PRIME + ($source == null ? 43 : $source.hashCode()); + return result; + } + + public String toString() { + return "AutocompleteUser(id=" + this.getId() + ", label=" + this.getLabel() + ", source=" + this.getSource() + ")"; + } } 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 ca22ab4c6..eccd9f1a2 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 @@ -28,10 +28,7 @@ import org.parceler.Parcel; import java.util.HashMap; import java.util.List; -import lombok.Data; - @Parcel -@Data @JsonObject public class Capabilities { @JsonField(name = "spreed") @@ -48,4 +45,110 @@ public class Capabilities { @JsonField(name = "provisioning_api") ProvisioningCapability provisioningCapability; + + public Capabilities() { + } + + public SpreedCapability getSpreedCapability() { + return this.spreedCapability; + } + + public NotificationsCapability getNotificationsCapability() { + return this.notificationsCapability; + } + + public ThemingCapability getThemingCapability() { + return this.themingCapability; + } + + public HashMap> getExternalCapability() { + return this.externalCapability; + } + + public ProvisioningCapability getProvisioningCapability() { + return this.provisioningCapability; + } + + public void setSpreedCapability(SpreedCapability spreedCapability) { + this.spreedCapability = spreedCapability; + } + + public void setNotificationsCapability(NotificationsCapability notificationsCapability) { + this.notificationsCapability = notificationsCapability; + } + + public void setThemingCapability(ThemingCapability themingCapability) { + this.themingCapability = themingCapability; + } + + public void setExternalCapability(HashMap> externalCapability) { + this.externalCapability = externalCapability; + } + + public void setProvisioningCapability(ProvisioningCapability provisioningCapability) { + this.provisioningCapability = provisioningCapability; + } + + public boolean equals(final Object o) { + if (o == this) { + return true; + } + if (!(o instanceof Capabilities)) { + return false; + } + final Capabilities other = (Capabilities) o; + if (!other.canEqual((Object) this)) { + return false; + } + final Object this$spreedCapability = this.getSpreedCapability(); + final Object other$spreedCapability = other.getSpreedCapability(); + if (this$spreedCapability == null ? other$spreedCapability != null : !this$spreedCapability.equals(other$spreedCapability)) { + return false; + } + final Object this$notificationsCapability = this.getNotificationsCapability(); + final Object other$notificationsCapability = other.getNotificationsCapability(); + if (this$notificationsCapability == null ? other$notificationsCapability != null : !this$notificationsCapability.equals(other$notificationsCapability)) { + return false; + } + final Object this$themingCapability = this.getThemingCapability(); + final Object other$themingCapability = other.getThemingCapability(); + if (this$themingCapability == null ? other$themingCapability != null : !this$themingCapability.equals(other$themingCapability)) { + return false; + } + final Object this$externalCapability = this.getExternalCapability(); + final Object other$externalCapability = other.getExternalCapability(); + if (this$externalCapability == null ? other$externalCapability != null : !this$externalCapability.equals(other$externalCapability)) { + return false; + } + 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; + } + + protected boolean canEqual(final Object other) { + return other instanceof Capabilities; + } + + public int hashCode() { + final int PRIME = 59; + int result = 1; + final Object $spreedCapability = this.getSpreedCapability(); + result = result * PRIME + ($spreedCapability == null ? 43 : $spreedCapability.hashCode()); + final Object $notificationsCapability = this.getNotificationsCapability(); + result = result * PRIME + ($notificationsCapability == null ? 43 : $notificationsCapability.hashCode()); + final Object $themingCapability = this.getThemingCapability(); + result = result * PRIME + ($themingCapability == null ? 43 : $themingCapability.hashCode()); + final Object $externalCapability = this.getExternalCapability(); + result = result * PRIME + ($externalCapability == null ? 43 : $externalCapability.hashCode()); + final Object $provisioningCapability = this.getProvisioningCapability(); + result = result * PRIME + ($provisioningCapability == null ? 43 : $provisioningCapability.hashCode()); + return result; + } + + public String toString() { + return "Capabilities(spreedCapability=" + this.getSpreedCapability() + ", notificationsCapability=" + this.getNotificationsCapability() + ", themingCapability=" + this.getThemingCapability() + ", externalCapability=" + this.getExternalCapability() + ", provisioningCapability=" + this.getProvisioningCapability() + ")"; + } } 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 056610225..4c5771ed0 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 @@ -22,13 +22,58 @@ package com.nextcloud.talk.models.json.capabilities; import com.bluelinelabs.logansquare.annotation.JsonField; import com.bluelinelabs.logansquare.annotation.JsonObject; -import lombok.Data; + import org.parceler.Parcel; @Parcel -@Data @JsonObject public class CapabilitiesList { @JsonField(name = "capabilities") Capabilities capabilities; + + public CapabilitiesList() { + } + + public Capabilities getCapabilities() { + return this.capabilities; + } + + public void setCapabilities(Capabilities capabilities) { + this.capabilities = capabilities; + } + + public boolean equals(final Object o) { + if (o == this) { + return true; + } + if (!(o instanceof CapabilitiesList)) { + return false; + } + final CapabilitiesList other = (CapabilitiesList) o; + if (!other.canEqual((Object) this)) { + return false; + } + 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; + } + + protected boolean canEqual(final Object other) { + return other instanceof CapabilitiesList; + } + + public int hashCode() { + final int PRIME = 59; + int result = 1; + final Object $capabilities = this.getCapabilities(); + result = result * PRIME + ($capabilities == null ? 43 : $capabilities.hashCode()); + return result; + } + + public String toString() { + return "CapabilitiesList(capabilities=" + this.getCapabilities() + ")"; + } } 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 c2a43fd0a..e81d93bcb 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 @@ -22,13 +22,58 @@ package com.nextcloud.talk.models.json.capabilities; import com.bluelinelabs.logansquare.annotation.JsonField; import com.bluelinelabs.logansquare.annotation.JsonObject; import com.nextcloud.talk.models.json.generic.GenericOCS; -import lombok.Data; + import org.parceler.Parcel; -@Data @Parcel @JsonObject public class CapabilitiesOCS extends GenericOCS { @JsonField(name = "data") CapabilitiesList data; + + public CapabilitiesOCS() { + } + + public CapabilitiesList getData() { + return this.data; + } + + public void setData(CapabilitiesList data) { + this.data = data; + } + + public boolean equals(final Object o) { + if (o == this) { + return true; + } + if (!(o instanceof CapabilitiesOCS)) { + return false; + } + final CapabilitiesOCS other = (CapabilitiesOCS) o; + if (!other.canEqual((Object) this)) { + return false; + } + 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; + } + + protected boolean canEqual(final Object other) { + return other instanceof CapabilitiesOCS; + } + + public int hashCode() { + final int PRIME = 59; + int result = 1; + final Object $data = this.getData(); + result = result * PRIME + ($data == null ? 43 : $data.hashCode()); + return result; + } + + public String toString() { + return "CapabilitiesOCS(data=" + this.getData() + ")"; + } } 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 673aebbdf..9d1b3eb9d 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 @@ -21,13 +21,58 @@ package com.nextcloud.talk.models.json.capabilities; import com.bluelinelabs.logansquare.annotation.JsonField; import com.bluelinelabs.logansquare.annotation.JsonObject; -import lombok.Data; + import org.parceler.Parcel; -@Data @Parcel @JsonObject public class CapabilitiesOverall { @JsonField(name = "ocs") CapabilitiesOCS ocs; + + public CapabilitiesOverall() { + } + + public CapabilitiesOCS getOcs() { + return this.ocs; + } + + public void setOcs(CapabilitiesOCS ocs) { + this.ocs = ocs; + } + + public boolean equals(final Object o) { + if (o == this) { + return true; + } + if (!(o instanceof CapabilitiesOverall)) { + return false; + } + final CapabilitiesOverall other = (CapabilitiesOverall) o; + if (!other.canEqual((Object) this)) { + return false; + } + 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; + } + + protected boolean canEqual(final Object other) { + return other instanceof CapabilitiesOverall; + } + + public int hashCode() { + final int PRIME = 59; + int result = 1; + final Object $ocs = this.getOcs(); + result = result * PRIME + ($ocs == null ? 43 : $ocs.hashCode()); + return result; + } + + public String toString() { + return "CapabilitiesOverall(ocs=" + this.getOcs() + ")"; + } } 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 1e413cfee..f4f2f7847 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 @@ -22,15 +22,60 @@ package com.nextcloud.talk.models.json.capabilities; import com.bluelinelabs.logansquare.annotation.JsonField; import com.bluelinelabs.logansquare.annotation.JsonObject; -import lombok.Data; + import org.parceler.Parcel; import java.util.List; @Parcel -@Data @JsonObject public class NotificationsCapability { @JsonField(name = "ocs-endpoints") List features; + + public NotificationsCapability() { + } + + public List getFeatures() { + return this.features; + } + + public void setFeatures(List features) { + this.features = features; + } + + public boolean equals(final Object o) { + if (o == this) { + return true; + } + if (!(o instanceof NotificationsCapability)) { + return false; + } + final NotificationsCapability other = (NotificationsCapability) o; + if (!other.canEqual((Object) this)) { + return false; + } + 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; + } + + protected boolean canEqual(final Object other) { + return other instanceof NotificationsCapability; + } + + public int hashCode() { + final int PRIME = 59; + int result = 1; + final Object $features = this.getFeatures(); + result = result * PRIME + ($features == null ? 43 : $features.hashCode()); + return result; + } + + public String toString() { + return "NotificationsCapability(features=" + this.getFeatures() + ")"; + } } 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 0dee10903..39d2da48a 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 @@ -25,12 +25,55 @@ import com.bluelinelabs.logansquare.annotation.JsonObject; import org.parceler.Parcel; -import lombok.Data; - @Parcel -@Data @JsonObject public class ProvisioningCapability { @JsonField(name = "AccountPropertyScopesVersion") Integer accountPropertyScopesVersion; + + public ProvisioningCapability() { + } + + public Integer getAccountPropertyScopesVersion() { + return this.accountPropertyScopesVersion; + } + + public void setAccountPropertyScopesVersion(Integer accountPropertyScopesVersion) { + this.accountPropertyScopesVersion = accountPropertyScopesVersion; + } + + public boolean equals(final Object o) { + if (o == this) { + return true; + } + if (!(o instanceof ProvisioningCapability)) { + return false; + } + final ProvisioningCapability other = (ProvisioningCapability) o; + if (!other.canEqual((Object) this)) { + return false; + } + 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; + } + + protected boolean canEqual(final Object other) { + return other instanceof ProvisioningCapability; + } + + public int hashCode() { + final int PRIME = 59; + int result = 1; + final Object $accountPropertyScopesVersion = this.getAccountPropertyScopesVersion(); + result = result * PRIME + ($accountPropertyScopesVersion == null ? 43 : $accountPropertyScopesVersion.hashCode()); + return result; + } + + public String toString() { + return "ProvisioningCapability(accountPropertyScopesVersion=" + this.getAccountPropertyScopesVersion() + ")"; + } } 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 8a15515f6..79b40a0ca 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 @@ -22,14 +22,13 @@ package com.nextcloud.talk.models.json.capabilities; import com.bluelinelabs.logansquare.annotation.JsonField; import com.bluelinelabs.logansquare.annotation.JsonObject; -import lombok.Data; + import org.parceler.Parcel; import java.util.HashMap; import java.util.List; @Parcel -@Data @JsonObject public class SpreedCapability { @JsonField(name = "features") @@ -37,4 +36,65 @@ public class SpreedCapability { @JsonField(name = "config") HashMap> config; + + public SpreedCapability() { + } + + public List getFeatures() { + return this.features; + } + + public HashMap> getConfig() { + return this.config; + } + + public void setFeatures(List features) { + this.features = features; + } + + public void setConfig(HashMap> config) { + this.config = config; + } + + public boolean equals(final Object o) { + if (o == this) { + return true; + } + if (!(o instanceof SpreedCapability)) { + return false; + } + final SpreedCapability other = (SpreedCapability) o; + if (!other.canEqual((Object) this)) { + return false; + } + 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; + } + 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; + } + + protected boolean canEqual(final Object other) { + return other instanceof SpreedCapability; + } + + public int hashCode() { + final int PRIME = 59; + int result = 1; + final Object $features = this.getFeatures(); + result = result * PRIME + ($features == null ? 43 : $features.hashCode()); + final Object $config = this.getConfig(); + result = result * PRIME + ($config == null ? 43 : $config.hashCode()); + return result; + } + + public String toString() { + return "SpreedCapability(features=" + this.getFeatures() + ", config=" + this.getConfig() + ")"; + } } 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 1e0454d82..804a1d252 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 @@ -22,11 +22,10 @@ package com.nextcloud.talk.models.json.capabilities; import com.bluelinelabs.logansquare.annotation.JsonField; import com.bluelinelabs.logansquare.annotation.JsonObject; -import lombok.Data; + import org.parceler.Parcel; @Parcel -@Data @JsonObject public class ThemingCapability { @JsonField(name = "name") @@ -58,4 +57,179 @@ public class ThemingCapability { @JsonField(name = "background-default") boolean backgroundDefault; + + public ThemingCapability() { + } + + public String getName() { + return this.name; + } + + public String getUrl() { + return this.url; + } + + public String getSlogan() { + return this.slogan; + } + + public String getColor() { + return this.color; + } + + public String getColorText() { + return this.colorText; + } + + public String getColorElement() { + return this.colorElement; + } + + public String getLogo() { + return this.logo; + } + + public String getBackground() { + return this.background; + } + + public boolean isBackgroundPlain() { + return this.backgroundPlain; + } + + public boolean isBackgroundDefault() { + return this.backgroundDefault; + } + + public void setName(String name) { + this.name = name; + } + + public void setUrl(String url) { + this.url = url; + } + + public void setSlogan(String slogan) { + this.slogan = slogan; + } + + public void setColor(String color) { + this.color = color; + } + + public void setColorText(String colorText) { + this.colorText = colorText; + } + + public void setColorElement(String colorElement) { + this.colorElement = colorElement; + } + + public void setLogo(String logo) { + this.logo = logo; + } + + public void setBackground(String background) { + this.background = background; + } + + public void setBackgroundPlain(boolean backgroundPlain) { + this.backgroundPlain = backgroundPlain; + } + + public void setBackgroundDefault(boolean backgroundDefault) { + this.backgroundDefault = backgroundDefault; + } + + public boolean equals(final Object o) { + if (o == this) { + return true; + } + if (!(o instanceof ThemingCapability)) { + return false; + } + final ThemingCapability other = (ThemingCapability) o; + if (!other.canEqual((Object) this)) { + return false; + } + 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; + } + final Object this$url = this.getUrl(); + final Object other$url = other.getUrl(); + if (this$url == null ? other$url != null : !this$url.equals(other$url)) { + return false; + } + final Object this$slogan = this.getSlogan(); + final Object other$slogan = other.getSlogan(); + if (this$slogan == null ? other$slogan != null : !this$slogan.equals(other$slogan)) { + return false; + } + final Object this$color = this.getColor(); + final Object other$color = other.getColor(); + if (this$color == null ? other$color != null : !this$color.equals(other$color)) { + return false; + } + final Object this$colorText = this.getColorText(); + final Object other$colorText = other.getColorText(); + if (this$colorText == null ? other$colorText != null : !this$colorText.equals(other$colorText)) { + return false; + } + final Object this$colorElement = this.getColorElement(); + final Object other$colorElement = other.getColorElement(); + if (this$colorElement == null ? other$colorElement != null : !this$colorElement.equals(other$colorElement)) { + return false; + } + final Object this$logo = this.getLogo(); + final Object other$logo = other.getLogo(); + if (this$logo == null ? other$logo != null : !this$logo.equals(other$logo)) { + return false; + } + final Object this$background = this.getBackground(); + final Object other$background = other.getBackground(); + if (this$background == null ? other$background != null : !this$background.equals(other$background)) { + return false; + } + if (this.isBackgroundPlain() != other.isBackgroundPlain()) { + return false; + } + if (this.isBackgroundDefault() != other.isBackgroundDefault()) { + return false; + } + return true; + } + + protected boolean canEqual(final Object other) { + return other instanceof ThemingCapability; + } + + public int hashCode() { + final int PRIME = 59; + int result = 1; + final Object $name = this.getName(); + result = result * PRIME + ($name == null ? 43 : $name.hashCode()); + final Object $url = this.getUrl(); + result = result * PRIME + ($url == null ? 43 : $url.hashCode()); + final Object $slogan = this.getSlogan(); + result = result * PRIME + ($slogan == null ? 43 : $slogan.hashCode()); + final Object $color = this.getColor(); + result = result * PRIME + ($color == null ? 43 : $color.hashCode()); + final Object $colorText = this.getColorText(); + result = result * PRIME + ($colorText == null ? 43 : $colorText.hashCode()); + final Object $colorElement = this.getColorElement(); + result = result * PRIME + ($colorElement == null ? 43 : $colorElement.hashCode()); + final Object $logo = this.getLogo(); + result = result * PRIME + ($logo == null ? 43 : $logo.hashCode()); + final Object $background = this.getBackground(); + result = result * PRIME + ($background == null ? 43 : $background.hashCode()); + result = result * PRIME + (this.isBackgroundPlain() ? 79 : 97); + result = result * PRIME + (this.isBackgroundDefault() ? 79 : 97); + return result; + } + + public String toString() { + return "ThemingCapability(name=" + this.getName() + ", url=" + this.getUrl() + ", slogan=" + this.getSlogan() + ", color=" + this.getColor() + ", colorText=" + this.getColorText() + ", colorElement=" + this.getColorElement() + ", logo=" + this.getLogo() + ", background=" + this.getBackground() + ", backgroundPlain=" + this.isBackgroundPlain() + ", backgroundDefault=" + this.isBackgroundDefault() + ")"; + } } 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 b1cfb3470..f92e3d66c 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 @@ -21,8 +21,6 @@ package com.nextcloud.talk.models.json.chat; import android.text.TextUtils; -import androidx.annotation.Nullable; - import com.bluelinelabs.logansquare.annotation.JsonField; import com.bluelinelabs.logansquare.annotation.JsonIgnore; import com.bluelinelabs.logansquare.annotation.JsonObject; @@ -44,10 +42,9 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import lombok.Data; +import androidx.annotation.Nullable; @Parcel -@Data @JsonObject public class ChatMessage implements IMessage, MessageContentType, MessageContentType.Image { @JsonIgnore @@ -94,6 +91,9 @@ 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()) { @@ -254,6 +254,291 @@ public class ChatMessage implements IMessage, MessageContentType, MessageContent return new EnumSystemMessageTypeConverter().convertToString(getSystemMessageType()); } + public boolean isGrouped() { + return this.isGrouped; + } + + public boolean isOneToOneConversation() { + return this.isOneToOneConversation; + } + + public UserEntity getActiveUser() { + return this.activeUser; + } + + public boolean isLinkPreviewAllowed() { + return this.isLinkPreviewAllowed; + } + + public boolean isDeleted() { + return this.isDeleted; + } + + public int getJsonMessageId() { + return this.jsonMessageId; + } + + public String getToken() { + return this.token; + } + + public String getActorType() { + return this.actorType; + } + + public String getActorId() { + return this.actorId; + } + + public String getActorDisplayName() { + return this.actorDisplayName; + } + + public long getTimestamp() { + return this.timestamp; + } + + public String getMessage() { + return this.message; + } + + public HashMap> getMessageParameters() { + return this.messageParameters; + } + + public SystemMessageType getSystemMessageType() { + return this.systemMessageType; + } + + public boolean isReplyable() { + return this.replyable; + } + + public ChatMessage getParentMessage() { + return this.parentMessage; + } + + public Enum getReadStatus() { + return this.readStatus; + } + + public List getMessageTypesToIgnore() { + return this.messageTypesToIgnore; + } + + public void setGrouped(boolean isGrouped) { + this.isGrouped = isGrouped; + } + + public void setOneToOneConversation(boolean isOneToOneConversation) { + this.isOneToOneConversation = isOneToOneConversation; + } + + public void setActiveUser(UserEntity activeUser) { + this.activeUser = activeUser; + } + + public void setLinkPreviewAllowed(boolean isLinkPreviewAllowed) { + this.isLinkPreviewAllowed = isLinkPreviewAllowed; + } + + public void setDeleted(boolean isDeleted) { + this.isDeleted = isDeleted; + } + + public void setJsonMessageId(int jsonMessageId) { + this.jsonMessageId = jsonMessageId; + } + + public void setToken(String token) { + this.token = token; + } + + public void setActorType(String actorType) { + this.actorType = actorType; + } + + public void setActorId(String actorId) { + this.actorId = actorId; + } + + public void setActorDisplayName(String actorDisplayName) { + this.actorDisplayName = actorDisplayName; + } + + public void setTimestamp(long timestamp) { + this.timestamp = timestamp; + } + + public void setMessage(String message) { + this.message = message; + } + + public void setMessageParameters(HashMap> messageParameters) { + this.messageParameters = messageParameters; + } + + public void setSystemMessageType(SystemMessageType systemMessageType) { + this.systemMessageType = systemMessageType; + } + + public void setReplyable(boolean replyable) { + this.replyable = replyable; + } + + public void setParentMessage(ChatMessage parentMessage) { + this.parentMessage = parentMessage; + } + + public void setReadStatus(Enum readStatus) { + this.readStatus = readStatus; + } + + public void setMessageTypesToIgnore(List messageTypesToIgnore) { + this.messageTypesToIgnore = messageTypesToIgnore; + } + + public boolean equals(final Object o) { + if (o == this) { + return true; + } + if (!(o instanceof ChatMessage)) { + return false; + } + final ChatMessage other = (ChatMessage) o; + if (!other.canEqual((Object) this)) { + return false; + } + if (this.isGrouped() != other.isGrouped()) { + return false; + } + if (this.isOneToOneConversation() != other.isOneToOneConversation()) { + return false; + } + final Object this$activeUser = this.getActiveUser(); + final Object other$activeUser = other.getActiveUser(); + if (this$activeUser == null ? other$activeUser != null : !this$activeUser.equals(other$activeUser)) { + return false; + } + final Object this$selectedIndividualHashMap = this.getSelectedIndividualHashMap(); + final Object other$selectedIndividualHashMap = other.getSelectedIndividualHashMap(); + if (this$selectedIndividualHashMap == null ? other$selectedIndividualHashMap != null : !this$selectedIndividualHashMap.equals(other$selectedIndividualHashMap)) { + return false; + } + if (this.isLinkPreviewAllowed() != other.isLinkPreviewAllowed()) { + return false; + } + if (this.isDeleted() != other.isDeleted()) { + return false; + } + if (this.getJsonMessageId() != other.getJsonMessageId()) { + return false; + } + 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; + } + final Object this$actorType = this.getActorType(); + final Object other$actorType = other.getActorType(); + if (this$actorType == null ? other$actorType != null : !this$actorType.equals(other$actorType)) { + return false; + } + final Object this$actorId = this.getActorId(); + final Object other$actorId = other.getActorId(); + if (this$actorId == null ? other$actorId != null : !this$actorId.equals(other$actorId)) { + return false; + } + final Object this$actorDisplayName = this.getActorDisplayName(); + final Object other$actorDisplayName = other.getActorDisplayName(); + if (this$actorDisplayName == null ? other$actorDisplayName != null : !this$actorDisplayName.equals(other$actorDisplayName)) { + return false; + } + if (this.getTimestamp() != other.getTimestamp()) { + return false; + } + 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; + } + final Object this$messageParameters = this.getMessageParameters(); + final Object other$messageParameters = other.getMessageParameters(); + if (this$messageParameters == null ? other$messageParameters != null : !this$messageParameters.equals(other$messageParameters)) { + return false; + } + final Object this$systemMessageType = this.getSystemMessageType(); + final Object other$systemMessageType = other.getSystemMessageType(); + if (this$systemMessageType == null ? other$systemMessageType != null : !this$systemMessageType.equals(other$systemMessageType)) { + return false; + } + if (this.isReplyable() != other.isReplyable()) { + return false; + } + final Object this$parentMessage = this.getParentMessage(); + final Object other$parentMessage = other.getParentMessage(); + if (this$parentMessage == null ? other$parentMessage != null : !this$parentMessage.equals(other$parentMessage)) { + return false; + } + final Object this$readStatus = this.getReadStatus(); + final Object other$readStatus = other.getReadStatus(); + if (this$readStatus == null ? other$readStatus != null : !this$readStatus.equals(other$readStatus)) { + return false; + } + 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; + } + + protected boolean canEqual(final Object other) { + return other instanceof ChatMessage; + } + + public int hashCode() { + final int PRIME = 59; + int result = 1; + result = result * PRIME + (this.isGrouped() ? 79 : 97); + result = result * PRIME + (this.isOneToOneConversation() ? 79 : 97); + final Object $activeUser = this.getActiveUser(); + result = result * PRIME + ($activeUser == null ? 43 : $activeUser.hashCode()); + final Object $selectedIndividualHashMap = this.getSelectedIndividualHashMap(); + result = result * PRIME + ($selectedIndividualHashMap == null ? 43 : $selectedIndividualHashMap.hashCode()); + result = result * PRIME + (this.isLinkPreviewAllowed() ? 79 : 97); + result = result * PRIME + (this.isDeleted() ? 79 : 97); + result = result * PRIME + this.getJsonMessageId(); + final Object $token = this.getToken(); + result = result * PRIME + ($token == null ? 43 : $token.hashCode()); + final Object $actorType = this.getActorType(); + result = result * PRIME + ($actorType == null ? 43 : $actorType.hashCode()); + final Object $actorId = this.getActorId(); + result = result * PRIME + ($actorId == null ? 43 : $actorId.hashCode()); + final Object $actorDisplayName = this.getActorDisplayName(); + result = result * PRIME + ($actorDisplayName == null ? 43 : $actorDisplayName.hashCode()); + final long $timestamp = this.getTimestamp(); + result = result * PRIME + (int) ($timestamp >>> 32 ^ $timestamp); + final Object $message = this.getMessage(); + result = result * PRIME + ($message == null ? 43 : $message.hashCode()); + final Object $messageParameters = this.getMessageParameters(); + result = result * PRIME + ($messageParameters == null ? 43 : $messageParameters.hashCode()); + final Object $systemMessageType = this.getSystemMessageType(); + result = result * PRIME + ($systemMessageType == null ? 43 : $systemMessageType.hashCode()); + result = result * PRIME + (this.isReplyable() ? 79 : 97); + final Object $parentMessage = this.getParentMessage(); + result = result * PRIME + ($parentMessage == null ? 43 : $parentMessage.hashCode()); + final Object $readStatus = this.getReadStatus(); + result = result * PRIME + ($readStatus == null ? 43 : $readStatus.hashCode()); + final Object $messageTypesToIgnore = this.getMessageTypesToIgnore(); + result = result * PRIME + ($messageTypesToIgnore == null ? 43 : $messageTypesToIgnore.hashCode()); + return result; + } + + public String toString() { + return "ChatMessage(isGrouped=" + this.isGrouped() + ", isOneToOneConversation=" + this.isOneToOneConversation() + ", activeUser=" + this.getActiveUser() + ", selectedIndividualHashMap=" + this.getSelectedIndividualHashMap() + ", isLinkPreviewAllowed=" + this.isLinkPreviewAllowed() + ", isDeleted=" + this.isDeleted() + ", jsonMessageId=" + this.getJsonMessageId() + ", token=" + this.getToken() + ", actorType=" + this.getActorType() + ", actorId=" + this.getActorId() + ", actorDisplayName=" + this.getActorDisplayName() + ", timestamp=" + this.getTimestamp() + ", message=" + this.getMessage() + ", messageParameters=" + this.getMessageParameters() + ", systemMessageType=" + this.getSystemMessageType() + ", replyable=" + this.isReplyable() + ", parentMessage=" + this.getParentMessage() + ", readStatus=" + this.getReadStatus() + ", messageTypesToIgnore=" + this.getMessageTypesToIgnore() + ")"; + } + public enum MessageType { REGULAR_TEXT_MESSAGE, SYSTEM_MESSAGE, 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 b5cf0cd7d..be5a2959b 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 @@ -22,15 +22,60 @@ package com.nextcloud.talk.models.json.chat; import com.bluelinelabs.logansquare.annotation.JsonField; import com.bluelinelabs.logansquare.annotation.JsonObject; import com.nextcloud.talk.models.json.generic.GenericOCS; -import lombok.Data; + import org.parceler.Parcel; import java.util.List; -@Data @Parcel @JsonObject public class ChatOCS extends GenericOCS { @JsonField(name = "data") public List data; + + public ChatOCS() { + } + + public List getData() { + return this.data; + } + + public void setData(List data) { + this.data = data; + } + + public boolean equals(final Object o) { + if (o == this) { + return true; + } + if (!(o instanceof ChatOCS)) { + return false; + } + final ChatOCS other = (ChatOCS) o; + if (!other.canEqual((Object) this)) { + return false; + } + 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; + } + + protected boolean canEqual(final Object other) { + return other instanceof ChatOCS; + } + + public int hashCode() { + final int PRIME = 59; + int result = 1; + final Object $data = this.getData(); + result = result * PRIME + ($data == null ? 43 : $data.hashCode()); + return result; + } + + public String toString() { + return "ChatOCS(data=" + this.getData() + ")"; + } } 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 408a9329b..c5678dd1d 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 @@ -25,12 +25,55 @@ import com.nextcloud.talk.models.json.generic.GenericOCS; import org.parceler.Parcel; -import lombok.Data; - -@Data @Parcel @JsonObject public class ChatOCSSingleMessage extends GenericOCS { @JsonField(name = "data") public ChatMessage data; + + public ChatOCSSingleMessage() { + } + + public ChatMessage getData() { + return this.data; + } + + public void setData(ChatMessage data) { + this.data = data; + } + + public boolean equals(final Object o) { + if (o == this) { + return true; + } + if (!(o instanceof ChatOCSSingleMessage)) { + return false; + } + final ChatOCSSingleMessage other = (ChatOCSSingleMessage) o; + if (!other.canEqual((Object) this)) { + return false; + } + 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; + } + + protected boolean canEqual(final Object other) { + return other instanceof ChatOCSSingleMessage; + } + + public int hashCode() { + final int PRIME = 59; + int result = 1; + final Object $data = this.getData(); + result = result * PRIME + ($data == null ? 43 : $data.hashCode()); + return result; + } + + public String toString() { + return "ChatOCSSingleMessage(data=" + this.getData() + ")"; + } } 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 b89831f76..00493fdb8 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 @@ -22,13 +22,58 @@ package com.nextcloud.talk.models.json.chat; import com.bluelinelabs.logansquare.annotation.JsonField; import com.bluelinelabs.logansquare.annotation.JsonObject; -import lombok.Data; + import org.parceler.Parcel; -@Data @Parcel @JsonObject public class ChatOverall { @JsonField(name = "ocs") public ChatOCS ocs; + + public ChatOverall() { + } + + public ChatOCS getOcs() { + return this.ocs; + } + + public void setOcs(ChatOCS ocs) { + this.ocs = ocs; + } + + public boolean equals(final Object o) { + if (o == this) { + return true; + } + if (!(o instanceof ChatOverall)) { + return false; + } + final ChatOverall other = (ChatOverall) o; + if (!other.canEqual((Object) this)) { + return false; + } + 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; + } + + protected boolean canEqual(final Object other) { + return other instanceof ChatOverall; + } + + public int hashCode() { + final int PRIME = 59; + int result = 1; + final Object $ocs = this.getOcs(); + result = result * PRIME + ($ocs == null ? 43 : $ocs.hashCode()); + return result; + } + + public String toString() { + return "ChatOverall(ocs=" + this.getOcs() + ")"; + } } 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 3918779aa..7a895e4e0 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 @@ -25,12 +25,55 @@ import com.bluelinelabs.logansquare.annotation.JsonObject; import org.parceler.Parcel; -import lombok.Data; - -@Data @Parcel @JsonObject public class ChatOverallSingleMessage { @JsonField(name = "ocs") public ChatOCSSingleMessage ocs; + + public ChatOverallSingleMessage() { + } + + public ChatOCSSingleMessage getOcs() { + return this.ocs; + } + + public void setOcs(ChatOCSSingleMessage ocs) { + this.ocs = ocs; + } + + public boolean equals(final Object o) { + if (o == this) { + return true; + } + if (!(o instanceof ChatOverallSingleMessage)) { + return false; + } + final ChatOverallSingleMessage other = (ChatOverallSingleMessage) o; + if (!other.canEqual((Object) this)) { + return false; + } + 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; + } + + protected boolean canEqual(final Object other) { + return other instanceof ChatOverallSingleMessage; + } + + public int hashCode() { + final int PRIME = 59; + int result = 1; + final Object $ocs = this.getOcs(); + result = result * PRIME + ($ocs == null ? 43 : $ocs.hashCode()); + return result; + } + + public String toString() { + return "ChatOverallSingleMessage(ocs=" + this.getOcs() + ")"; + } } 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 e42e309ae..5a6a02d61 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 @@ -39,10 +39,7 @@ import org.parceler.Parcel; import java.util.HashMap; -import lombok.Data; - @Parcel -@Data @JsonObject public class Conversation { @JsonField(name = "id") @@ -97,6 +94,9 @@ public class Conversation { @JsonField(name = "callFlag") public int callFlag; + public Conversation() { + } + public boolean isPublic() { return (ConversationType.ROOM_PUBLIC_CALL.equals(type)); } @@ -151,6 +151,398 @@ public class Conversation { return resources.getString(R.string.nc_delete_conversation_default); } + public String getRoomId() { + return this.roomId; + } + + public String getToken() { + return this.token; + } + + public String getName() { + return this.name; + } + + public String getDisplayName() { + return this.displayName; + } + + public ConversationType getType() { + return this.type; + } + + public long getCount() { + return this.count; + } + + public long getLastPing() { + return this.lastPing; + } + + public long getNumberOfGuests() { + return this.numberOfGuests; + } + + public HashMap> getGuestList() { + return this.guestList; + } + + public HashMap> getParticipants() { + return this.participants; + } + + public Participant.ParticipantType getParticipantType() { + return this.participantType; + } + + public boolean isHasPassword() { + return this.hasPassword; + } + + public String getSessionId() { + return this.sessionId; + } + + public String getPassword() { + return this.password; + } + + public boolean isFavorite() { + return this.isFavorite; + } + + public long getLastActivity() { + return this.lastActivity; + } + + public int getUnreadMessages() { + return this.unreadMessages; + } + + public boolean isUnreadMention() { + return this.unreadMention; + } + + public ChatMessage getLastMessage() { + return this.lastMessage; + } + + public String getObjectType() { + return this.objectType; + } + + public NotificationLevel getNotificationLevel() { + return this.notificationLevel; + } + + public ConversationReadOnlyState getConversationReadOnlyState() { + return this.conversationReadOnlyState; + } + + public LobbyState getLobbyState() { + return this.lobbyState; + } + + public Long getLobbyTimer() { + return this.lobbyTimer; + } + + public int getLastReadMessage() { + return this.lastReadMessage; + } + + public int getCallFlag() { + return this.callFlag; + } + + public void setRoomId(String roomId) { + this.roomId = roomId; + } + + public void setToken(String token) { + this.token = token; + } + + public void setName(String name) { + this.name = name; + } + + public void setDisplayName(String displayName) { + this.displayName = displayName; + } + + public void setType(ConversationType type) { + this.type = type; + } + + public void setCount(long count) { + this.count = count; + } + + public void setLastPing(long lastPing) { + this.lastPing = lastPing; + } + + public void setNumberOfGuests(long numberOfGuests) { + this.numberOfGuests = numberOfGuests; + } + + public void setGuestList(HashMap> guestList) { + this.guestList = guestList; + } + + public void setParticipants(HashMap> participants) { + this.participants = participants; + } + + public void setParticipantType(Participant.ParticipantType participantType) { + this.participantType = participantType; + } + + public void setHasPassword(boolean hasPassword) { + this.hasPassword = hasPassword; + } + + public void setSessionId(String sessionId) { + this.sessionId = sessionId; + } + + public void setPassword(String password) { + this.password = password; + } + + public void setFavorite(boolean isFavorite) { + this.isFavorite = isFavorite; + } + + public void setLastActivity(long lastActivity) { + this.lastActivity = lastActivity; + } + + public void setUnreadMessages(int unreadMessages) { + this.unreadMessages = unreadMessages; + } + + public void setUnreadMention(boolean unreadMention) { + this.unreadMention = unreadMention; + } + + public void setLastMessage(ChatMessage lastMessage) { + this.lastMessage = lastMessage; + } + + public void setObjectType(String objectType) { + this.objectType = objectType; + } + + public void setNotificationLevel(NotificationLevel notificationLevel) { + this.notificationLevel = notificationLevel; + } + + public void setConversationReadOnlyState(ConversationReadOnlyState conversationReadOnlyState) { + this.conversationReadOnlyState = conversationReadOnlyState; + } + + public void setLobbyState(LobbyState lobbyState) { + this.lobbyState = lobbyState; + } + + public void setLobbyTimer(Long lobbyTimer) { + this.lobbyTimer = lobbyTimer; + } + + public void setLastReadMessage(int lastReadMessage) { + this.lastReadMessage = lastReadMessage; + } + + public void setCallFlag(int callFlag) { + this.callFlag = callFlag; + } + + public boolean equals(final Object o) { + if (o == this) { + return true; + } + if (!(o instanceof Conversation)) { + return false; + } + final Conversation other = (Conversation) o; + if (!other.canEqual((Object) this)) { + return false; + } + final Object this$roomId = this.getRoomId(); + final Object other$roomId = other.getRoomId(); + if (this$roomId == null ? other$roomId != null : !this$roomId.equals(other$roomId)) { + return false; + } + 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; + } + 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; + } + final Object this$displayName = this.getDisplayName(); + final Object other$displayName = other.getDisplayName(); + if (this$displayName == null ? other$displayName != null : !this$displayName.equals(other$displayName)) { + return false; + } + 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; + } + if (this.getCount() != other.getCount()) { + return false; + } + if (this.getLastPing() != other.getLastPing()) { + return false; + } + if (this.getNumberOfGuests() != other.getNumberOfGuests()) { + return false; + } + final Object this$guestList = this.getGuestList(); + final Object other$guestList = other.getGuestList(); + if (this$guestList == null ? other$guestList != null : !this$guestList.equals(other$guestList)) { + return false; + } + final Object this$participants = this.getParticipants(); + final Object other$participants = other.getParticipants(); + if (this$participants == null ? other$participants != null : !this$participants.equals(other$participants)) { + return false; + } + final Object this$participantType = this.getParticipantType(); + final Object other$participantType = other.getParticipantType(); + if (this$participantType == null ? other$participantType != null : !this$participantType.equals(other$participantType)) { + return false; + } + if (this.isHasPassword() != other.isHasPassword()) { + return false; + } + 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; + } + final Object this$password = this.getPassword(); + final Object other$password = other.getPassword(); + if (this$password == null ? other$password != null : !this$password.equals(other$password)) { + return false; + } + if (this.isFavorite() != other.isFavorite()) { + return false; + } + if (this.getLastActivity() != other.getLastActivity()) { + return false; + } + if (this.getUnreadMessages() != other.getUnreadMessages()) { + return false; + } + if (this.isUnreadMention() != other.isUnreadMention()) { + return false; + } + final Object this$lastMessage = this.getLastMessage(); + final Object other$lastMessage = other.getLastMessage(); + if (this$lastMessage == null ? other$lastMessage != null : !this$lastMessage.equals(other$lastMessage)) { + return false; + } + final Object this$objectType = this.getObjectType(); + final Object other$objectType = other.getObjectType(); + if (this$objectType == null ? other$objectType != null : !this$objectType.equals(other$objectType)) { + return false; + } + final Object this$notificationLevel = this.getNotificationLevel(); + final Object other$notificationLevel = other.getNotificationLevel(); + if (this$notificationLevel == null ? other$notificationLevel != null : !this$notificationLevel.equals(other$notificationLevel)) { + return false; + } + final Object this$conversationReadOnlyState = this.getConversationReadOnlyState(); + final Object other$conversationReadOnlyState = other.getConversationReadOnlyState(); + if (this$conversationReadOnlyState == null ? other$conversationReadOnlyState != null : !this$conversationReadOnlyState.equals(other$conversationReadOnlyState)) { + return false; + } + final Object this$lobbyState = this.getLobbyState(); + final Object other$lobbyState = other.getLobbyState(); + if (this$lobbyState == null ? other$lobbyState != null : !this$lobbyState.equals(other$lobbyState)) { + return false; + } + final Object this$lobbyTimer = this.getLobbyTimer(); + final Object other$lobbyTimer = other.getLobbyTimer(); + if (this$lobbyTimer == null ? other$lobbyTimer != null : !this$lobbyTimer.equals(other$lobbyTimer)) { + return false; + } + if (this.getLastReadMessage() != other.getLastReadMessage()) { + return false; + } + if (this.getCallFlag() != other.getCallFlag()) { + return false; + } + return true; + } + + protected boolean canEqual(final Object other) { + return other instanceof Conversation; + } + + public int hashCode() { + final int PRIME = 59; + int result = 1; + final Object $roomId = this.getRoomId(); + result = result * PRIME + ($roomId == null ? 43 : $roomId.hashCode()); + final Object $token = this.getToken(); + result = result * PRIME + ($token == null ? 43 : $token.hashCode()); + final Object $name = this.getName(); + result = result * PRIME + ($name == null ? 43 : $name.hashCode()); + final Object $displayName = this.getDisplayName(); + result = result * PRIME + ($displayName == null ? 43 : $displayName.hashCode()); + final Object $type = this.getType(); + result = result * PRIME + ($type == null ? 43 : $type.hashCode()); + final long $count = this.getCount(); + result = result * PRIME + (int) ($count >>> 32 ^ $count); + final long $lastPing = this.getLastPing(); + result = result * PRIME + (int) ($lastPing >>> 32 ^ $lastPing); + final long $numberOfGuests = this.getNumberOfGuests(); + result = result * PRIME + (int) ($numberOfGuests >>> 32 ^ $numberOfGuests); + final Object $guestList = this.getGuestList(); + result = result * PRIME + ($guestList == null ? 43 : $guestList.hashCode()); + final Object $participants = this.getParticipants(); + result = result * PRIME + ($participants == null ? 43 : $participants.hashCode()); + final Object $participantType = this.getParticipantType(); + result = result * PRIME + ($participantType == null ? 43 : $participantType.hashCode()); + result = result * PRIME + (this.isHasPassword() ? 79 : 97); + final Object $sessionId = this.getSessionId(); + result = result * PRIME + ($sessionId == null ? 43 : $sessionId.hashCode()); + final Object $password = this.getPassword(); + result = result * PRIME + ($password == null ? 43 : $password.hashCode()); + result = result * PRIME + (this.isFavorite() ? 79 : 97); + final long $lastActivity = this.getLastActivity(); + result = result * PRIME + (int) ($lastActivity >>> 32 ^ $lastActivity); + result = result * PRIME + this.getUnreadMessages(); + result = result * PRIME + (this.isUnreadMention() ? 79 : 97); + final Object $lastMessage = this.getLastMessage(); + result = result * PRIME + ($lastMessage == null ? 43 : $lastMessage.hashCode()); + final Object $objectType = this.getObjectType(); + result = result * PRIME + ($objectType == null ? 43 : $objectType.hashCode()); + final Object $notificationLevel = this.getNotificationLevel(); + result = result * PRIME + ($notificationLevel == null ? 43 : $notificationLevel.hashCode()); + final Object $conversationReadOnlyState = this.getConversationReadOnlyState(); + result = result * PRIME + ($conversationReadOnlyState == null ? 43 : $conversationReadOnlyState.hashCode()); + final Object $lobbyState = this.getLobbyState(); + result = result * PRIME + ($lobbyState == null ? 43 : $lobbyState.hashCode()); + final Object $lobbyTimer = this.getLobbyTimer(); + result = result * PRIME + ($lobbyTimer == null ? 43 : $lobbyTimer.hashCode()); + result = result * PRIME + this.getLastReadMessage(); + result = result * PRIME + this.getCallFlag(); + return result; + } + + public String toString() { + return "Conversation(roomId=" + this.getRoomId() + ", token=" + this.getToken() + ", name=" + this.getName() + ", displayName=" + this.getDisplayName() + ", type=" + this.getType() + ", count=" + this.getCount() + ", lastPing=" + this.getLastPing() + ", numberOfGuests=" + this.getNumberOfGuests() + ", guestList=" + this.getGuestList() + ", participants=" + this.getParticipants() + ", participantType=" + this.getParticipantType() + ", hasPassword=" + this.isHasPassword() + ", sessionId=" + this.getSessionId() + ", password=" + this.getPassword() + ", isFavorite=" + this.isFavorite() + ", lastActivity=" + this.getLastActivity() + ", unreadMessages=" + this.getUnreadMessages() + ", unreadMention=" + this.isUnreadMention() + ", lastMessage=" + this.getLastMessage() + ", objectType=" + this.getObjectType() + ", notificationLevel=" + this.getNotificationLevel() + ", conversationReadOnlyState=" + this.getConversationReadOnlyState() + ", lobbyState=" + this.getLobbyState() + ", lobbyTimer=" + this.getLobbyTimer() + ", lastReadMessage=" + this.getLastReadMessage() + ", callFlag=" + this.getCallFlag() + ")"; + } + public enum NotificationLevel { DEFAULT, ALWAYS, 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 b57698357..48242d382 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 @@ -23,11 +23,55 @@ package com.nextcloud.talk.models.json.conversations; import com.bluelinelabs.logansquare.annotation.JsonField; import com.bluelinelabs.logansquare.annotation.JsonObject; import com.nextcloud.talk.models.json.generic.GenericOCS; -import lombok.Data; -@Data @JsonObject public class RoomOCS extends GenericOCS { @JsonField(name = "data") public Conversation data; + + public RoomOCS() { + } + + public Conversation getData() { + return this.data; + } + + public void setData(Conversation data) { + this.data = data; + } + + public boolean equals(final Object o) { + if (o == this) { + return true; + } + if (!(o instanceof RoomOCS)) { + return false; + } + final RoomOCS other = (RoomOCS) o; + if (!other.canEqual((Object) this)) { + return false; + } + 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; + } + + protected boolean canEqual(final Object other) { + return other instanceof RoomOCS; + } + + public int hashCode() { + final int PRIME = 59; + int result = 1; + final Object $data = this.getData(); + result = result * PRIME + ($data == null ? 43 : $data.hashCode()); + return result; + } + + public String toString() { + return "RoomOCS(data=" + this.getData() + ")"; + } } 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 ef0a0e720..f62320126 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 @@ -22,11 +22,55 @@ package com.nextcloud.talk.models.json.conversations; import com.bluelinelabs.logansquare.annotation.JsonField; import com.bluelinelabs.logansquare.annotation.JsonObject; -import lombok.Data; -@Data @JsonObject public class RoomOverall { @JsonField(name = "ocs") public RoomOCS ocs; + + public RoomOverall() { + } + + public RoomOCS getOcs() { + return this.ocs; + } + + public void setOcs(RoomOCS ocs) { + this.ocs = ocs; + } + + public boolean equals(final Object o) { + if (o == this) { + return true; + } + if (!(o instanceof RoomOverall)) { + return false; + } + final RoomOverall other = (RoomOverall) o; + if (!other.canEqual((Object) this)) { + return false; + } + 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; + } + + protected boolean canEqual(final Object other) { + return other instanceof RoomOverall; + } + + public int hashCode() { + final int PRIME = 59; + int result = 1; + final Object $ocs = this.getOcs(); + result = result * PRIME + ($ocs == null ? 43 : $ocs.hashCode()); + return result; + } + + public String toString() { + return "RoomOverall(ocs=" + this.getOcs() + ")"; + } } 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 2aa2b35a6..181cb2db8 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 @@ -23,15 +23,60 @@ package com.nextcloud.talk.models.json.conversations; import com.bluelinelabs.logansquare.annotation.JsonField; import com.bluelinelabs.logansquare.annotation.JsonObject; import com.nextcloud.talk.models.json.generic.GenericOCS; -import lombok.Data; + import org.parceler.Parcel; import java.util.List; -@Data @Parcel @JsonObject public class RoomsOCS extends GenericOCS { @JsonField(name = "data") public List data; + + public RoomsOCS() { + } + + public List getData() { + return this.data; + } + + public void setData(List data) { + this.data = data; + } + + public boolean equals(final Object o) { + if (o == this) { + return true; + } + if (!(o instanceof RoomsOCS)) { + return false; + } + final RoomsOCS other = (RoomsOCS) o; + if (!other.canEqual((Object) this)) { + return false; + } + 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; + } + + protected boolean canEqual(final Object other) { + return other instanceof RoomsOCS; + } + + public int hashCode() { + final int PRIME = 59; + int result = 1; + final Object $data = this.getData(); + result = result * PRIME + ($data == null ? 43 : $data.hashCode()); + return result; + } + + public String toString() { + return "RoomsOCS(data=" + this.getData() + ")"; + } } 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 db70df2f9..69891687b 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 @@ -22,13 +22,58 @@ package com.nextcloud.talk.models.json.conversations; import com.bluelinelabs.logansquare.annotation.JsonField; import com.bluelinelabs.logansquare.annotation.JsonObject; -import lombok.Data; + import org.parceler.Parcel; -@Data @Parcel @JsonObject public class RoomsOverall { @JsonField(name = "ocs") public RoomsOCS ocs; + + public RoomsOverall() { + } + + public RoomsOCS getOcs() { + return this.ocs; + } + + public void setOcs(RoomsOCS ocs) { + this.ocs = ocs; + } + + public boolean equals(final Object o) { + if (o == this) { + return true; + } + if (!(o instanceof RoomsOverall)) { + return false; + } + final RoomsOverall other = (RoomsOverall) o; + if (!other.canEqual((Object) this)) { + return false; + } + 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; + } + + protected boolean canEqual(final Object other) { + return other instanceof RoomsOverall; + } + + public int hashCode() { + final int PRIME = 59; + int result = 1; + final Object $ocs = this.getOcs(); + result = result * PRIME + ($ocs == null ? 43 : $ocs.hashCode()); + return result; + } + + public String toString() { + return "RoomsOverall(ocs=" + this.getOcs() + ")"; + } } 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 490bf7acc..45105701c 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 @@ -22,11 +22,10 @@ package com.nextcloud.talk.models.json.generic; import com.bluelinelabs.logansquare.annotation.JsonField; import com.bluelinelabs.logansquare.annotation.JsonObject; -import lombok.Data; + import org.parceler.Parcel; @Parcel -@Data @JsonObject(serializeNullObjects = true) public class GenericMeta { @JsonField(name = "status") @@ -37,4 +36,77 @@ public class GenericMeta { @JsonField(name = "message") public String message; + + public GenericMeta() { + } + + public String getStatus() { + return this.status; + } + + public int getStatusCode() { + return this.statusCode; + } + + public String getMessage() { + return this.message; + } + + public void setStatus(String status) { + this.status = status; + } + + public void setStatusCode(int statusCode) { + this.statusCode = statusCode; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean equals(final Object o) { + if (o == this) { + return true; + } + if (!(o instanceof GenericMeta)) { + return false; + } + final GenericMeta other = (GenericMeta) o; + if (!other.canEqual((Object) this)) { + return false; + } + final Object this$status = this.getStatus(); + final Object other$status = other.getStatus(); + if (this$status == null ? other$status != null : !this$status.equals(other$status)) { + return false; + } + if (this.getStatusCode() != other.getStatusCode()) { + return false; + } + 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; + } + + protected boolean canEqual(final Object other) { + return other instanceof GenericMeta; + } + + public int hashCode() { + final int PRIME = 59; + int result = 1; + final Object $status = this.getStatus(); + result = result * PRIME + ($status == null ? 43 : $status.hashCode()); + result = result * PRIME + this.getStatusCode(); + final Object $message = this.getMessage(); + result = result * PRIME + ($message == null ? 43 : $message.hashCode()); + return result; + } + + public String toString() { + return "GenericMeta(status=" + this.getStatus() + ", statusCode=" + this.getStatusCode() + ", message=" + this.getMessage() + ")"; + } } 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 335ed52cf..5da62d212 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 @@ -22,13 +22,58 @@ package com.nextcloud.talk.models.json.generic; import com.bluelinelabs.logansquare.annotation.JsonField; import com.bluelinelabs.logansquare.annotation.JsonObject; -import lombok.Data; + import org.parceler.Parcel; @Parcel -@Data @JsonObject public class GenericOCS { @JsonField(name = "meta") public GenericMeta meta; + + public GenericOCS() { + } + + public GenericMeta getMeta() { + return this.meta; + } + + public void setMeta(GenericMeta meta) { + this.meta = meta; + } + + public boolean equals(final Object o) { + if (o == this) { + return true; + } + if (!(o instanceof GenericOCS)) { + return false; + } + final GenericOCS other = (GenericOCS) o; + if (!other.canEqual((Object) this)) { + return false; + } + 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; + } + + protected boolean canEqual(final Object other) { + return other instanceof GenericOCS; + } + + public int hashCode() { + final int PRIME = 59; + int result = 1; + final Object $meta = this.getMeta(); + result = result * PRIME + ($meta == null ? 43 : $meta.hashCode()); + return result; + } + + public String toString() { + return "GenericOCS(meta=" + this.getMeta() + ")"; + } } 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 d750a6255..1c8063471 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 @@ -22,13 +22,58 @@ package com.nextcloud.talk.models.json.generic; import com.bluelinelabs.logansquare.annotation.JsonField; import com.bluelinelabs.logansquare.annotation.JsonObject; -import lombok.Data; + import org.parceler.Parcel; @Parcel -@Data @JsonObject public class GenericOverall { @JsonField(name = "ocs") public GenericOCS ocs; + + public GenericOverall() { + } + + public GenericOCS getOcs() { + return this.ocs; + } + + public void setOcs(GenericOCS ocs) { + this.ocs = ocs; + } + + public boolean equals(final Object o) { + if (o == this) { + return true; + } + if (!(o instanceof GenericOverall)) { + return false; + } + final GenericOverall other = (GenericOverall) o; + if (!other.canEqual((Object) this)) { + return false; + } + 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; + } + + protected boolean canEqual(final Object other) { + return other instanceof GenericOverall; + } + + public int hashCode() { + final int PRIME = 59; + int result = 1; + final Object $ocs = this.getOcs(); + result = result * PRIME + ($ocs == null ? 43 : $ocs.hashCode()); + return result; + } + + public String toString() { + return "GenericOverall(ocs=" + this.getOcs() + ")"; + } } 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 11904b76d..265b0251e 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 @@ -22,11 +22,10 @@ package com.nextcloud.talk.models.json.generic; import com.bluelinelabs.logansquare.annotation.JsonField; import com.bluelinelabs.logansquare.annotation.JsonObject; -import lombok.Data; + import org.parceler.Parcel; @Parcel -@Data @JsonObject public class Status { @JsonField(name = "installed") @@ -49,4 +48,131 @@ public class Status { @JsonField(name = "productname") public String productName; + + public Status() { + } + + public boolean isInstalled() { + return this.installed; + } + + public boolean isMaintenance() { + return this.maintenance; + } + + public boolean isNeedsUpgrade() { + return this.needsUpgrade; + } + + public String getVersion() { + return this.version; + } + + public String getVersionString() { + return this.versionString; + } + + public String getEdition() { + return this.edition; + } + + public String getProductName() { + return this.productName; + } + + public void setInstalled(boolean installed) { + this.installed = installed; + } + + public void setMaintenance(boolean maintenance) { + this.maintenance = maintenance; + } + + public void setNeedsUpgrade(boolean needsUpgrade) { + this.needsUpgrade = needsUpgrade; + } + + public void setVersion(String version) { + this.version = version; + } + + public void setVersionString(String versionString) { + this.versionString = versionString; + } + + public void setEdition(String edition) { + this.edition = edition; + } + + public void setProductName(String productName) { + this.productName = productName; + } + + public boolean equals(final Object o) { + if (o == this) { + return true; + } + if (!(o instanceof Status)) { + return false; + } + final Status other = (Status) o; + if (!other.canEqual((Object) this)) { + return false; + } + if (this.isInstalled() != other.isInstalled()) { + return false; + } + if (this.isMaintenance() != other.isMaintenance()) { + return false; + } + if (this.isNeedsUpgrade() != other.isNeedsUpgrade()) { + return false; + } + final Object this$version = this.getVersion(); + final Object other$version = other.getVersion(); + if (this$version == null ? other$version != null : !this$version.equals(other$version)) { + return false; + } + final Object this$versionString = this.getVersionString(); + final Object other$versionString = other.getVersionString(); + if (this$versionString == null ? other$versionString != null : !this$versionString.equals(other$versionString)) { + return false; + } + final Object this$edition = this.getEdition(); + final Object other$edition = other.getEdition(); + if (this$edition == null ? other$edition != null : !this$edition.equals(other$edition)) { + return false; + } + 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; + } + + protected boolean canEqual(final Object other) { + return other instanceof Status; + } + + public int hashCode() { + final int PRIME = 59; + int result = 1; + result = result * PRIME + (this.isInstalled() ? 79 : 97); + result = result * PRIME + (this.isMaintenance() ? 79 : 97); + result = result * PRIME + (this.isNeedsUpgrade() ? 79 : 97); + final Object $version = this.getVersion(); + result = result * PRIME + ($version == null ? 43 : $version.hashCode()); + final Object $versionString = this.getVersionString(); + result = result * PRIME + ($versionString == null ? 43 : $versionString.hashCode()); + final Object $edition = this.getEdition(); + result = result * PRIME + ($edition == null ? 43 : $edition.hashCode()); + final Object $productName = this.getProductName(); + result = result * PRIME + ($productName == null ? 43 : $productName.hashCode()); + return result; + } + + public String toString() { + return "Status(installed=" + this.isInstalled() + ", maintenance=" + this.isMaintenance() + ", needsUpgrade=" + this.isNeedsUpgrade() + ", version=" + this.getVersion() + ", versionString=" + this.getVersionString() + ", edition=" + this.getEdition() + ", productName=" + this.getProductName() + ")"; + } } 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 23a4d65f2..763dc54dc 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 @@ -21,11 +21,10 @@ package com.nextcloud.talk.models.json.mention; import com.bluelinelabs.logansquare.annotation.JsonField; import com.bluelinelabs.logansquare.annotation.JsonObject; -import lombok.Data; + import org.parceler.Parcel; @Parcel -@Data @JsonObject public class Mention { @JsonField(name = "id") @@ -37,4 +36,80 @@ public class Mention { // type of user (guests or users or calls) @JsonField(name = "source") String source; + + public Mention() { + } + + public String getId() { + return this.id; + } + + public String getLabel() { + return this.label; + } + + public String getSource() { + return this.source; + } + + public void setId(String id) { + this.id = id; + } + + public void setLabel(String label) { + this.label = label; + } + + public void setSource(String source) { + this.source = source; + } + + public boolean equals(final Object o) { + if (o == this) { + return true; + } + if (!(o instanceof Mention)) { + return false; + } + final Mention other = (Mention) o; + if (!other.canEqual((Object) this)) { + return false; + } + final Object this$id = this.getId(); + final Object other$id = other.getId(); + if (this$id == null ? other$id != null : !this$id.equals(other$id)) { + return false; + } + 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; + } + 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; + } + + protected boolean canEqual(final Object other) { + return other instanceof Mention; + } + + public int hashCode() { + final int PRIME = 59; + int result = 1; + final Object $id = this.getId(); + result = result * PRIME + ($id == null ? 43 : $id.hashCode()); + final Object $label = this.getLabel(); + result = result * PRIME + ($label == null ? 43 : $label.hashCode()); + final Object $source = this.getSource(); + result = result * PRIME + ($source == null ? 43 : $source.hashCode()); + return result; + } + + public String toString() { + return "Mention(id=" + this.getId() + ", label=" + this.getLabel() + ", source=" + this.getSource() + ")"; + } } 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 5180635c1..28658345e 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 @@ -22,15 +22,60 @@ package com.nextcloud.talk.models.json.mention; import com.bluelinelabs.logansquare.annotation.JsonField; import com.bluelinelabs.logansquare.annotation.JsonObject; import com.nextcloud.talk.models.json.generic.GenericOCS; -import lombok.Data; + import org.parceler.Parcel; import java.util.List; -@Data @Parcel @JsonObject public class MentionOCS extends GenericOCS { @JsonField(name = "data") List data; + + public MentionOCS() { + } + + public List getData() { + return this.data; + } + + public void setData(List data) { + this.data = data; + } + + public boolean equals(final Object o) { + if (o == this) { + return true; + } + if (!(o instanceof MentionOCS)) { + return false; + } + final MentionOCS other = (MentionOCS) o; + if (!other.canEqual((Object) this)) { + return false; + } + 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; + } + + protected boolean canEqual(final Object other) { + return other instanceof MentionOCS; + } + + public int hashCode() { + final int PRIME = 59; + int result = 1; + final Object $data = this.getData(); + result = result * PRIME + ($data == null ? 43 : $data.hashCode()); + return result; + } + + public String toString() { + return "MentionOCS(data=" + this.getData() + ")"; + } } 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 beecb50d3..ee53821e9 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 @@ -21,13 +21,58 @@ package com.nextcloud.talk.models.json.mention; import com.bluelinelabs.logansquare.annotation.JsonField; import com.bluelinelabs.logansquare.annotation.JsonObject; -import lombok.Data; + import org.parceler.Parcel; -@Data @Parcel @JsonObject public class MentionOverall { @JsonField(name = "ocs") MentionOCS ocs; + + public MentionOverall() { + } + + public MentionOCS getOcs() { + return this.ocs; + } + + public void setOcs(MentionOCS ocs) { + this.ocs = ocs; + } + + public boolean equals(final Object o) { + if (o == this) { + return true; + } + if (!(o instanceof MentionOverall)) { + return false; + } + final MentionOverall other = (MentionOverall) o; + if (!other.canEqual((Object) this)) { + return false; + } + 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; + } + + protected boolean canEqual(final Object other) { + return other instanceof MentionOverall; + } + + public int hashCode() { + final int PRIME = 59; + int result = 1; + final Object $ocs = this.getOcs(); + result = result * PRIME + ($ocs == null ? 43 : $ocs.hashCode()); + return result; + } + + public String toString() { + return "MentionOverall(ocs=" + this.getOcs() + ")"; + } } 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 e14c5bfd5..61b0c7f4c 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 @@ -27,13 +27,9 @@ import com.nextcloud.talk.models.json.converters.LoganSquareJodaTimeConverter; import org.joda.time.DateTime; import org.parceler.Parcel; -import java.util.Date; import java.util.HashMap; import java.util.List; -import lombok.Data; - -@Data @Parcel @JsonObject public class Notification { @@ -67,4 +63,257 @@ public class Notification { String link; @JsonField(name = "actions") List actions; + + public Notification() { + } + + public String getIcon() { + return this.icon; + } + + public int getNotificationId() { + return this.notificationId; + } + + public String getApp() { + return this.app; + } + + public String getUser() { + return this.user; + } + + public DateTime getDatetime() { + return this.datetime; + } + + public String getObjectType() { + return this.objectType; + } + + public String getObjectId() { + return this.objectId; + } + + public String getSubject() { + return this.subject; + } + + public String getSubjectRich() { + return this.subjectRich; + } + + public HashMap> getSubjectRichParameters() { + return this.subjectRichParameters; + } + + public String getMessage() { + return this.message; + } + + public String getMessageRich() { + return this.messageRich; + } + + public HashMap> getMessageRichParameters() { + return this.messageRichParameters; + } + + public String getLink() { + return this.link; + } + + public List getActions() { + return this.actions; + } + + public void setIcon(String icon) { + this.icon = icon; + } + + public void setNotificationId(int notificationId) { + this.notificationId = notificationId; + } + + public void setApp(String app) { + this.app = app; + } + + public void setUser(String user) { + this.user = user; + } + + public void setDatetime(DateTime datetime) { + this.datetime = datetime; + } + + public void setObjectType(String objectType) { + this.objectType = objectType; + } + + public void setObjectId(String objectId) { + this.objectId = objectId; + } + + public void setSubject(String subject) { + this.subject = subject; + } + + public void setSubjectRich(String subjectRich) { + this.subjectRich = subjectRich; + } + + public void setSubjectRichParameters(HashMap> subjectRichParameters) { + this.subjectRichParameters = subjectRichParameters; + } + + public void setMessage(String message) { + this.message = message; + } + + public void setMessageRich(String messageRich) { + this.messageRich = messageRich; + } + + public void setMessageRichParameters(HashMap> messageRichParameters) { + this.messageRichParameters = messageRichParameters; + } + + public void setLink(String link) { + this.link = link; + } + + public void setActions(List actions) { + this.actions = actions; + } + + public boolean equals(final Object o) { + if (o == this) { + return true; + } + if (!(o instanceof Notification)) { + return false; + } + final Notification other = (Notification) o; + if (!other.canEqual((Object) this)) { + return false; + } + final Object this$icon = this.getIcon(); + final Object other$icon = other.getIcon(); + if (this$icon == null ? other$icon != null : !this$icon.equals(other$icon)) { + return false; + } + if (this.getNotificationId() != other.getNotificationId()) { + return false; + } + final Object this$app = this.getApp(); + final Object other$app = other.getApp(); + if (this$app == null ? other$app != null : !this$app.equals(other$app)) { + return false; + } + final Object this$user = this.getUser(); + final Object other$user = other.getUser(); + if (this$user == null ? other$user != null : !this$user.equals(other$user)) { + return false; + } + final Object this$datetime = this.getDatetime(); + final Object other$datetime = other.getDatetime(); + if (this$datetime == null ? other$datetime != null : !this$datetime.equals(other$datetime)) { + return false; + } + final Object this$objectType = this.getObjectType(); + final Object other$objectType = other.getObjectType(); + if (this$objectType == null ? other$objectType != null : !this$objectType.equals(other$objectType)) { + return false; + } + final Object this$objectId = this.getObjectId(); + final Object other$objectId = other.getObjectId(); + if (this$objectId == null ? other$objectId != null : !this$objectId.equals(other$objectId)) { + return false; + } + final Object this$subject = this.getSubject(); + final Object other$subject = other.getSubject(); + if (this$subject == null ? other$subject != null : !this$subject.equals(other$subject)) { + return false; + } + final Object this$subjectRich = this.getSubjectRich(); + final Object other$subjectRich = other.getSubjectRich(); + if (this$subjectRich == null ? other$subjectRich != null : !this$subjectRich.equals(other$subjectRich)) { + return false; + } + final Object this$subjectRichParameters = this.getSubjectRichParameters(); + final Object other$subjectRichParameters = other.getSubjectRichParameters(); + if (this$subjectRichParameters == null ? other$subjectRichParameters != null : !this$subjectRichParameters.equals(other$subjectRichParameters)) { + return false; + } + 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; + } + final Object this$messageRich = this.getMessageRich(); + final Object other$messageRich = other.getMessageRich(); + if (this$messageRich == null ? other$messageRich != null : !this$messageRich.equals(other$messageRich)) { + return false; + } + final Object this$messageRichParameters = this.getMessageRichParameters(); + final Object other$messageRichParameters = other.getMessageRichParameters(); + if (this$messageRichParameters == null ? other$messageRichParameters != null : !this$messageRichParameters.equals(other$messageRichParameters)) { + return false; + } + final Object this$link = this.getLink(); + final Object other$link = other.getLink(); + if (this$link == null ? other$link != null : !this$link.equals(other$link)) { + return false; + } + 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; + } + + protected boolean canEqual(final Object other) { + return other instanceof Notification; + } + + public int hashCode() { + final int PRIME = 59; + int result = 1; + final Object $icon = this.getIcon(); + result = result * PRIME + ($icon == null ? 43 : $icon.hashCode()); + result = result * PRIME + this.getNotificationId(); + final Object $app = this.getApp(); + result = result * PRIME + ($app == null ? 43 : $app.hashCode()); + final Object $user = this.getUser(); + result = result * PRIME + ($user == null ? 43 : $user.hashCode()); + final Object $datetime = this.getDatetime(); + result = result * PRIME + ($datetime == null ? 43 : $datetime.hashCode()); + final Object $objectType = this.getObjectType(); + result = result * PRIME + ($objectType == null ? 43 : $objectType.hashCode()); + final Object $objectId = this.getObjectId(); + result = result * PRIME + ($objectId == null ? 43 : $objectId.hashCode()); + final Object $subject = this.getSubject(); + result = result * PRIME + ($subject == null ? 43 : $subject.hashCode()); + final Object $subjectRich = this.getSubjectRich(); + result = result * PRIME + ($subjectRich == null ? 43 : $subjectRich.hashCode()); + final Object $subjectRichParameters = this.getSubjectRichParameters(); + result = result * PRIME + ($subjectRichParameters == null ? 43 : $subjectRichParameters.hashCode()); + final Object $message = this.getMessage(); + result = result * PRIME + ($message == null ? 43 : $message.hashCode()); + final Object $messageRich = this.getMessageRich(); + result = result * PRIME + ($messageRich == null ? 43 : $messageRich.hashCode()); + final Object $messageRichParameters = this.getMessageRichParameters(); + result = result * PRIME + ($messageRichParameters == null ? 43 : $messageRichParameters.hashCode()); + final Object $link = this.getLink(); + result = result * PRIME + ($link == null ? 43 : $link.hashCode()); + final Object $actions = this.getActions(); + result = result * PRIME + ($actions == null ? 43 : $actions.hashCode()); + return result; + } + + public String toString() { + return "Notification(icon=" + this.getIcon() + ", notificationId=" + this.getNotificationId() + ", app=" + this.getApp() + ", user=" + this.getUser() + ", datetime=" + this.getDatetime() + ", objectType=" + this.getObjectType() + ", objectId=" + this.getObjectId() + ", subject=" + this.getSubject() + ", subjectRich=" + this.getSubjectRich() + ", subjectRichParameters=" + this.getSubjectRichParameters() + ", message=" + this.getMessage() + ", messageRich=" + this.getMessageRich() + ", messageRichParameters=" + this.getMessageRichParameters() + ", link=" + this.getLink() + ", actions=" + this.getActions() + ")"; + } } 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 dcca6db0a..ad969305f 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 @@ -22,10 +22,9 @@ package com.nextcloud.talk.models.json.notifications; import com.bluelinelabs.logansquare.annotation.JsonField; import com.bluelinelabs.logansquare.annotation.JsonObject; -import lombok.Data; + import org.parceler.Parcel; -@Data @Parcel @JsonObject public class NotificationAction { @@ -40,4 +39,92 @@ public class NotificationAction { @JsonField(name = "primary") boolean primary; + + public NotificationAction() { + } + + public String getLabel() { + return this.label; + } + + public String getLink() { + return this.link; + } + + public String getType() { + return this.type; + } + + public boolean isPrimary() { + return this.primary; + } + + public void setLabel(String label) { + this.label = label; + } + + public void setLink(String link) { + this.link = link; + } + + public void setType(String type) { + this.type = type; + } + + public void setPrimary(boolean primary) { + this.primary = primary; + } + + public boolean equals(final Object o) { + if (o == this) { + return true; + } + if (!(o instanceof NotificationAction)) { + return false; + } + final NotificationAction other = (NotificationAction) o; + if (!other.canEqual((Object) this)) { + return false; + } + 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; + } + final Object this$link = this.getLink(); + final Object other$link = other.getLink(); + if (this$link == null ? other$link != null : !this$link.equals(other$link)) { + return false; + } + 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; + } + if (this.isPrimary() != other.isPrimary()) { + return false; + } + return true; + } + + protected boolean canEqual(final Object other) { + return other instanceof NotificationAction; + } + + public int hashCode() { + final int PRIME = 59; + int result = 1; + final Object $label = this.getLabel(); + result = result * PRIME + ($label == null ? 43 : $label.hashCode()); + final Object $link = this.getLink(); + result = result * PRIME + ($link == null ? 43 : $link.hashCode()); + final Object $type = this.getType(); + result = result * PRIME + ($type == null ? 43 : $type.hashCode()); + result = result * PRIME + (this.isPrimary() ? 79 : 97); + return result; + } + + public String toString() { + return "NotificationAction(label=" + this.getLabel() + ", link=" + this.getLink() + ", type=" + this.getType() + ", primary=" + this.isPrimary() + ")"; + } } 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 1a20d2f72..de24ca04a 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 @@ -23,13 +23,58 @@ package com.nextcloud.talk.models.json.notifications; import com.bluelinelabs.logansquare.annotation.JsonField; import com.bluelinelabs.logansquare.annotation.JsonObject; import com.nextcloud.talk.models.json.generic.GenericOCS; -import lombok.Data; + import org.parceler.Parcel; -@Data @Parcel @JsonObject public class NotificationOCS extends GenericOCS { @JsonField(name = "data") Notification notification; + + public NotificationOCS() { + } + + public Notification getNotification() { + return this.notification; + } + + public void setNotification(Notification notification) { + this.notification = notification; + } + + public boolean equals(final Object o) { + if (o == this) { + return true; + } + if (!(o instanceof NotificationOCS)) { + return false; + } + final NotificationOCS other = (NotificationOCS) o; + if (!other.canEqual((Object) this)) { + return false; + } + 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; + } + + protected boolean canEqual(final Object other) { + return other instanceof NotificationOCS; + } + + public int hashCode() { + final int PRIME = 59; + int result = 1; + final Object $notification = this.getNotification(); + result = result * PRIME + ($notification == null ? 43 : $notification.hashCode()); + return result; + } + + public String toString() { + return "NotificationOCS(notification=" + this.getNotification() + ")"; + } } 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 46bcd828d..6de5a43df 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 @@ -21,11 +21,55 @@ package com.nextcloud.talk.models.json.notifications; import com.bluelinelabs.logansquare.annotation.JsonField; import com.bluelinelabs.logansquare.annotation.JsonObject; -import lombok.Data; -@Data @JsonObject public class NotificationOverall { @JsonField(name = "ocs") NotificationOCS ocs; + + public NotificationOverall() { + } + + public NotificationOCS getOcs() { + return this.ocs; + } + + public void setOcs(NotificationOCS ocs) { + this.ocs = ocs; + } + + public boolean equals(final Object o) { + if (o == this) { + return true; + } + if (!(o instanceof NotificationOverall)) { + return false; + } + final NotificationOverall other = (NotificationOverall) o; + if (!other.canEqual((Object) this)) { + return false; + } + 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; + } + + protected boolean canEqual(final Object other) { + return other instanceof NotificationOverall; + } + + public int hashCode() { + final int PRIME = 59; + int result = 1; + final Object $ocs = this.getOcs(); + result = result * PRIME + ($ocs == null ? 43 : $ocs.hashCode()); + return result; + } + + public String toString() { + return "NotificationOverall(ocs=" + this.getOcs() + ")"; + } } 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 6c42ece1b..39bdf33c6 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 @@ -22,10 +22,9 @@ package com.nextcloud.talk.models.json.notifications; import com.bluelinelabs.logansquare.annotation.JsonField; import com.bluelinelabs.logansquare.annotation.JsonObject; -import lombok.Data; + import org.parceler.Parcel; -@Data @Parcel @JsonObject public class NotificationRichObject { @@ -37,4 +36,80 @@ public class NotificationRichObject { @JsonField(name = "name") String name; + + public NotificationRichObject() { + } + + public String getLabel() { + return this.label; + } + + public String getType() { + return this.type; + } + + public String getName() { + return this.name; + } + + public void setLabel(String label) { + this.label = label; + } + + public void setType(String type) { + this.type = type; + } + + public void setName(String name) { + this.name = name; + } + + public boolean equals(final Object o) { + if (o == this) { + return true; + } + if (!(o instanceof NotificationRichObject)) { + return false; + } + final NotificationRichObject other = (NotificationRichObject) o; + if (!other.canEqual((Object) this)) { + return false; + } + 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; + } + 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; + } + 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; + } + + protected boolean canEqual(final Object other) { + return other instanceof NotificationRichObject; + } + + public int hashCode() { + final int PRIME = 59; + int result = 1; + final Object $label = this.getLabel(); + result = result * PRIME + ($label == null ? 43 : $label.hashCode()); + final Object $type = this.getType(); + result = result * PRIME + ($type == null ? 43 : $type.hashCode()); + final Object $name = this.getName(); + result = result * PRIME + ($name == null ? 43 : $name.hashCode()); + return result; + } + + public String toString() { + return "NotificationRichObject(label=" + this.getLabel() + ", type=" + this.getType() + ", name=" + this.getName() + ")"; + } } 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 f2e792326..a5f20d065 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 @@ -23,15 +23,60 @@ package com.nextcloud.talk.models.json.notifications; import com.bluelinelabs.logansquare.annotation.JsonField; import com.bluelinelabs.logansquare.annotation.JsonObject; import com.nextcloud.talk.models.json.generic.GenericOCS; -import lombok.Data; + import org.parceler.Parcel; import java.util.List; -@Data @Parcel @JsonObject public class NotificationsOCS extends GenericOCS { @JsonField(name = "data") List notificationsList; + + public NotificationsOCS() { + } + + public List getNotificationsList() { + return this.notificationsList; + } + + public void setNotificationsList(List notificationsList) { + this.notificationsList = notificationsList; + } + + public boolean equals(final Object o) { + if (o == this) { + return true; + } + if (!(o instanceof NotificationsOCS)) { + return false; + } + final NotificationsOCS other = (NotificationsOCS) o; + if (!other.canEqual((Object) this)) { + return false; + } + 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; + } + + protected boolean canEqual(final Object other) { + return other instanceof NotificationsOCS; + } + + public int hashCode() { + final int PRIME = 59; + int result = 1; + final Object $notificationsList = this.getNotificationsList(); + result = result * PRIME + ($notificationsList == null ? 43 : $notificationsList.hashCode()); + return result; + } + + public String toString() { + return "NotificationsOCS(notificationsList=" + this.getNotificationsList() + ")"; + } } 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 88a77c51d..fbb8933b3 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 @@ -21,11 +21,55 @@ package com.nextcloud.talk.models.json.notifications; import com.bluelinelabs.logansquare.annotation.JsonField; import com.bluelinelabs.logansquare.annotation.JsonObject; -import lombok.Data; -@Data @JsonObject public class NotificationsOverall { @JsonField(name = "ocs") NotificationsOCS ocs; + + public NotificationsOverall() { + } + + public NotificationsOCS getOcs() { + return this.ocs; + } + + public void setOcs(NotificationsOCS ocs) { + this.ocs = ocs; + } + + public boolean equals(final Object o) { + if (o == this) { + return true; + } + if (!(o instanceof NotificationsOverall)) { + return false; + } + final NotificationsOverall other = (NotificationsOverall) o; + if (!other.canEqual((Object) this)) { + return false; + } + 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; + } + + protected boolean canEqual(final Object other) { + return other instanceof NotificationsOverall; + } + + public int hashCode() { + final int PRIME = 59; + int result = 1; + final Object $ocs = this.getOcs(); + result = result * PRIME + ($ocs == null ? 43 : $ocs.hashCode()); + return result; + } + + public String toString() { + return "NotificationsOverall(ocs=" + this.getOcs() + ")"; + } } 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 d7bb38b7d..348d52393 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 @@ -23,11 +23,55 @@ package com.nextcloud.talk.models.json.participants; import com.bluelinelabs.logansquare.annotation.JsonField; import com.bluelinelabs.logansquare.annotation.JsonObject; import com.nextcloud.talk.models.json.conversations.RoomsOCS; -import lombok.Data; -@Data @JsonObject public class AddParticipantOverall { @JsonField(name = "ocs") RoomsOCS ocs; + + public AddParticipantOverall() { + } + + public RoomsOCS getOcs() { + return this.ocs; + } + + public void setOcs(RoomsOCS ocs) { + this.ocs = ocs; + } + + public boolean equals(final Object o) { + if (o == this) { + return true; + } + if (!(o instanceof AddParticipantOverall)) { + return false; + } + final AddParticipantOverall other = (AddParticipantOverall) o; + if (!other.canEqual((Object) this)) { + return false; + } + 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; + } + + protected boolean canEqual(final Object other) { + return other instanceof AddParticipantOverall; + } + + public int hashCode() { + final int PRIME = 59; + int result = 1; + final Object $ocs = this.getOcs(); + result = result * PRIME + ($ocs == null ? 43 : $ocs.hashCode()); + return result; + } + + public String toString() { + return "AddParticipantOverall(ocs=" + this.getOcs() + ")"; + } } 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 0cc2188ec..cf0cc05b6 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 @@ -24,12 +24,11 @@ import com.bluelinelabs.logansquare.annotation.JsonField; import com.bluelinelabs.logansquare.annotation.JsonObject; import com.nextcloud.talk.models.json.converters.EnumParticipantTypeConverter; import com.nextcloud.talk.models.json.converters.ObjectParcelConverter; -import lombok.Data; + import org.parceler.Parcel; import org.parceler.ParcelPropertyConverter; @Parcel -@Data @JsonObject public class Participant { @JsonField(name = "userId") @@ -60,6 +59,9 @@ public class Participant { public boolean selected; + public Participant() { + } + public ParticipantFlags getParticipantFlags() { ParticipantFlags participantFlags = ParticipantFlags.NOT_IN_CALL; @@ -78,6 +80,177 @@ public class Participant { return participantFlags; } + public String getUserId() { + return this.userId; + } + + public ParticipantType getType() { + return this.type; + } + + public String getName() { + return this.name; + } + + public String getDisplayName() { + return this.displayName; + } + + public long getLastPing() { + return this.lastPing; + } + + public String getSessionId() { + return this.sessionId; + } + + public long getRoomId() { + return this.roomId; + } + + public Object getInCall() { + return this.inCall; + } + + public String getSource() { + return this.source; + } + + public boolean isSelected() { + return this.selected; + } + + public void setUserId(String userId) { + this.userId = userId; + } + + public void setType(ParticipantType type) { + this.type = type; + } + + public void setName(String name) { + this.name = name; + } + + public void setDisplayName(String displayName) { + this.displayName = displayName; + } + + public void setLastPing(long lastPing) { + this.lastPing = lastPing; + } + + public void setSessionId(String sessionId) { + this.sessionId = sessionId; + } + + public void setRoomId(long roomId) { + this.roomId = roomId; + } + + public void setInCall(Object inCall) { + this.inCall = inCall; + } + + public void setSource(String source) { + this.source = source; + } + + public void setSelected(boolean selected) { + this.selected = selected; + } + + public boolean equals(final Object o) { + if (o == this) { + return true; + } + if (!(o instanceof Participant)) { + return false; + } + final Participant other = (Participant) o; + if (!other.canEqual((Object) this)) { + return false; + } + 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; + } + 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; + } + 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; + } + final Object this$displayName = this.getDisplayName(); + final Object other$displayName = other.getDisplayName(); + if (this$displayName == null ? other$displayName != null : !this$displayName.equals(other$displayName)) { + return false; + } + if (this.getLastPing() != other.getLastPing()) { + return false; + } + 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; + } + if (this.getRoomId() != other.getRoomId()) { + return false; + } + final Object this$inCall = this.getInCall(); + final Object other$inCall = other.getInCall(); + if (this$inCall == null ? other$inCall != null : !this$inCall.equals(other$inCall)) { + return false; + } + 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; + } + if (this.isSelected() != other.isSelected()) { + return false; + } + return true; + } + + protected boolean canEqual(final Object other) { + return other instanceof Participant; + } + + public int hashCode() { + final int PRIME = 59; + int result = 1; + final Object $userId = this.getUserId(); + result = result * PRIME + ($userId == null ? 43 : $userId.hashCode()); + final Object $type = this.getType(); + result = result * PRIME + ($type == null ? 43 : $type.hashCode()); + final Object $name = this.getName(); + result = result * PRIME + ($name == null ? 43 : $name.hashCode()); + final Object $displayName = this.getDisplayName(); + result = result * PRIME + ($displayName == null ? 43 : $displayName.hashCode()); + final long $lastPing = this.getLastPing(); + result = result * PRIME + (int) ($lastPing >>> 32 ^ $lastPing); + final Object $sessionId = this.getSessionId(); + result = result * PRIME + ($sessionId == null ? 43 : $sessionId.hashCode()); + final long $roomId = this.getRoomId(); + result = result * PRIME + (int) ($roomId >>> 32 ^ $roomId); + final Object $inCall = this.getInCall(); + result = result * PRIME + ($inCall == null ? 43 : $inCall.hashCode()); + final Object $source = this.getSource(); + result = result * PRIME + ($source == null ? 43 : $source.hashCode()); + result = result * PRIME + (this.isSelected() ? 79 : 97); + return result; + } + + public String toString() { + return "Participant(userId=" + this.getUserId() + ", type=" + this.getType() + ", name=" + this.getName() + ", displayName=" + this.getDisplayName() + ", lastPing=" + this.getLastPing() + ", sessionId=" + this.getSessionId() + ", roomId=" + this.getRoomId() + ", inCall=" + this.getInCall() + ", source=" + this.getSource() + ", selected=" + this.isSelected() + ")"; + } + public enum ParticipantType { DUMMY, OWNER, 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 b27fdd088..3fd00a8df 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 @@ -23,15 +23,60 @@ package com.nextcloud.talk.models.json.participants; import com.bluelinelabs.logansquare.annotation.JsonField; import com.bluelinelabs.logansquare.annotation.JsonObject; import com.nextcloud.talk.models.json.generic.GenericOCS; -import lombok.Data; + import org.parceler.Parcel; import java.util.List; @Parcel -@Data @JsonObject public class ParticipantsOCS extends GenericOCS { @JsonField(name = "data") public List data; + + public ParticipantsOCS() { + } + + public List getData() { + return this.data; + } + + public void setData(List data) { + this.data = data; + } + + public boolean equals(final Object o) { + if (o == this) { + return true; + } + if (!(o instanceof ParticipantsOCS)) { + return false; + } + final ParticipantsOCS other = (ParticipantsOCS) o; + if (!other.canEqual((Object) this)) { + return false; + } + 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; + } + + protected boolean canEqual(final Object other) { + return other instanceof ParticipantsOCS; + } + + public int hashCode() { + final int PRIME = 59; + int result = 1; + final Object $data = this.getData(); + result = result * PRIME + ($data == null ? 43 : $data.hashCode()); + return result; + } + + public String toString() { + return "ParticipantsOCS(data=" + this.getData() + ")"; + } } 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 6ab2b97a5..e57ad1e21 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 @@ -22,13 +22,58 @@ package com.nextcloud.talk.models.json.participants; import com.bluelinelabs.logansquare.annotation.JsonField; import com.bluelinelabs.logansquare.annotation.JsonObject; -import lombok.Data; + import org.parceler.Parcel; @Parcel -@Data @JsonObject public class ParticipantsOverall { @JsonField(name = "ocs") public ParticipantsOCS ocs; + + public ParticipantsOverall() { + } + + public ParticipantsOCS getOcs() { + return this.ocs; + } + + public void setOcs(ParticipantsOCS ocs) { + this.ocs = ocs; + } + + public boolean equals(final Object o) { + if (o == this) { + return true; + } + if (!(o instanceof ParticipantsOverall)) { + return false; + } + final ParticipantsOverall other = (ParticipantsOverall) o; + if (!other.canEqual((Object) this)) { + return false; + } + 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; + } + + protected boolean canEqual(final Object other) { + return other instanceof ParticipantsOverall; + } + + public int hashCode() { + final int PRIME = 59; + int result = 1; + final Object $ocs = this.getOcs(); + result = result * PRIME + ($ocs == null ? 43 : $ocs.hashCode()); + return result; + } + + public String toString() { + return "ParticipantsOverall(ocs=" + this.getOcs() + ")"; + } } 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 1c873ffde..0e004ec80 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 @@ -23,10 +23,9 @@ package com.nextcloud.talk.models.json.push; import com.bluelinelabs.logansquare.annotation.JsonField; import com.bluelinelabs.logansquare.annotation.JsonIgnore; import com.bluelinelabs.logansquare.annotation.JsonObject; -import lombok.Data; + import org.parceler.Parcel; -@Data @Parcel @JsonObject public class DecryptedPushMessage { @@ -59,4 +58,175 @@ public class DecryptedPushMessage { @JsonIgnore public long timestamp; + + public DecryptedPushMessage() { + } + + public String getApp() { + return this.app; + } + + public String getType() { + return this.type; + } + + public String getSubject() { + return this.subject; + } + + public String getId() { + return this.id; + } + + public long getNotificationId() { + return this.notificationId; + } + + public boolean isDelete() { + return this.delete; + } + + public boolean isDeleteAll() { + return this.deleteAll; + } + + public NotificationUser getNotificationUser() { + return this.notificationUser; + } + + public String getText() { + return this.text; + } + + public long getTimestamp() { + return this.timestamp; + } + + public void setApp(String app) { + this.app = app; + } + + public void setType(String type) { + this.type = type; + } + + public void setSubject(String subject) { + this.subject = subject; + } + + public void setId(String id) { + this.id = id; + } + + public void setNotificationId(long notificationId) { + this.notificationId = notificationId; + } + + public void setDelete(boolean delete) { + this.delete = delete; + } + + public void setDeleteAll(boolean deleteAll) { + this.deleteAll = deleteAll; + } + + public void setNotificationUser(NotificationUser notificationUser) { + this.notificationUser = notificationUser; + } + + public void setText(String text) { + this.text = text; + } + + public void setTimestamp(long timestamp) { + this.timestamp = timestamp; + } + + public boolean equals(final Object o) { + if (o == this) { + return true; + } + if (!(o instanceof DecryptedPushMessage)) { + return false; + } + final DecryptedPushMessage other = (DecryptedPushMessage) o; + if (!other.canEqual((Object) this)) { + return false; + } + final Object this$app = this.getApp(); + final Object other$app = other.getApp(); + if (this$app == null ? other$app != null : !this$app.equals(other$app)) { + return false; + } + 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; + } + final Object this$subject = this.getSubject(); + final Object other$subject = other.getSubject(); + if (this$subject == null ? other$subject != null : !this$subject.equals(other$subject)) { + return false; + } + final Object this$id = this.getId(); + final Object other$id = other.getId(); + if (this$id == null ? other$id != null : !this$id.equals(other$id)) { + return false; + } + if (this.getNotificationId() != other.getNotificationId()) { + return false; + } + if (this.isDelete() != other.isDelete()) { + return false; + } + if (this.isDeleteAll() != other.isDeleteAll()) { + return false; + } + final Object this$notificationUser = this.getNotificationUser(); + final Object other$notificationUser = other.getNotificationUser(); + if (this$notificationUser == null ? other$notificationUser != null : !this$notificationUser.equals(other$notificationUser)) { + return false; + } + final Object this$text = this.getText(); + final Object other$text = other.getText(); + if (this$text == null ? other$text != null : !this$text.equals(other$text)) { + return false; + } + if (this.getTimestamp() != other.getTimestamp()) { + return false; + } + return true; + } + + protected boolean canEqual(final Object other) { + return other instanceof DecryptedPushMessage; + } + + public int hashCode() { + final int PRIME = 59; + int result = 1; + final Object $app = this.getApp(); + result = result * PRIME + ($app == null ? 43 : $app.hashCode()); + final Object $type = this.getType(); + result = result * PRIME + ($type == null ? 43 : $type.hashCode()); + final Object $subject = this.getSubject(); + result = result * PRIME + ($subject == null ? 43 : $subject.hashCode()); + final Object $id = this.getId(); + result = result * PRIME + ($id == null ? 43 : $id.hashCode()); + final long $notificationId = this.getNotificationId(); + result = result * PRIME + (int) ($notificationId >>> 32 ^ $notificationId); + result = result * PRIME + (this.isDelete() ? 79 : 97); + result = result * PRIME + (this.isDeleteAll() ? 79 : 97); + final Object $notificationUser = this.getNotificationUser(); + result = result * PRIME + ($notificationUser == null ? 43 : $notificationUser.hashCode()); + final Object $text = this.getText(); + result = result * PRIME + ($text == null ? 43 : $text.hashCode()); + final long $timestamp = this.getTimestamp(); + result = result * PRIME + (int) ($timestamp >>> 32 ^ $timestamp); + return result; + } + + public String toString() { + return "DecryptedPushMessage(app=" + this.getApp() + ", type=" + this.getType() + ", subject=" + this.getSubject() + ", id=" + this.getId() + ", notificationId=" + this.getNotificationId() + ", delete=" + this.isDelete() + ", deleteAll=" + this.isDeleteAll() + ", notificationUser=" + this.getNotificationUser() + ", text=" + this.getText() + ", timestamp=" + this.getTimestamp() + ")"; + } } 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 ab09d45ca..9cff9e689 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 @@ -22,10 +22,9 @@ package com.nextcloud.talk.models.json.push; import com.bluelinelabs.logansquare.annotation.JsonField; import com.bluelinelabs.logansquare.annotation.JsonObject; -import lombok.Data; + import org.parceler.Parcel; -@Data @Parcel @JsonObject public class NotificationUser { @@ -37,4 +36,80 @@ public class NotificationUser { @JsonField(name = "name") String name; + + public NotificationUser() { + } + + public String getType() { + return this.type; + } + + public String getId() { + return this.id; + } + + public String getName() { + return this.name; + } + + public void setType(String type) { + this.type = type; + } + + public void setId(String id) { + this.id = id; + } + + public void setName(String name) { + this.name = name; + } + + public boolean equals(final Object o) { + if (o == this) { + return true; + } + if (!(o instanceof NotificationUser)) { + return false; + } + final NotificationUser other = (NotificationUser) o; + if (!other.canEqual((Object) this)) { + return false; + } + 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; + } + final Object this$id = this.getId(); + final Object other$id = other.getId(); + if (this$id == null ? other$id != null : !this$id.equals(other$id)) { + return false; + } + 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; + } + + protected boolean canEqual(final Object other) { + return other instanceof NotificationUser; + } + + public int hashCode() { + final int PRIME = 59; + int result = 1; + final Object $type = this.getType(); + result = result * PRIME + ($type == null ? 43 : $type.hashCode()); + final Object $id = this.getId(); + result = result * PRIME + ($id == null ? 43 : $id.hashCode()); + final Object $name = this.getName(); + result = result * PRIME + ($name == null ? 43 : $name.hashCode()); + return result; + } + + public String toString() { + return "NotificationUser(type=" + this.getType() + ", id=" + this.getId() + ", name=" + this.getName() + ")"; + } } 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 5b78951b0..a692c17fa 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 @@ -22,11 +22,10 @@ package com.nextcloud.talk.models.json.push; import com.bluelinelabs.logansquare.annotation.JsonField; import com.bluelinelabs.logansquare.annotation.JsonObject; -import lombok.Data; + import org.parceler.Parcel; @Parcel -@Data @JsonObject public class PushConfigurationState { @JsonField(name = "pushToken") @@ -43,4 +42,107 @@ public class PushConfigurationState { @JsonField(name = "usesRegularPass") public boolean usesRegularPass; + + public PushConfigurationState() { + } + + public String getPushToken() { + return this.pushToken; + } + + public String getDeviceIdentifier() { + return this.deviceIdentifier; + } + + public String getDeviceIdentifierSignature() { + return this.deviceIdentifierSignature; + } + + public String getUserPublicKey() { + return this.userPublicKey; + } + + public boolean isUsesRegularPass() { + return this.usesRegularPass; + } + + public void setPushToken(String pushToken) { + this.pushToken = pushToken; + } + + public void setDeviceIdentifier(String deviceIdentifier) { + this.deviceIdentifier = deviceIdentifier; + } + + public void setDeviceIdentifierSignature(String deviceIdentifierSignature) { + this.deviceIdentifierSignature = deviceIdentifierSignature; + } + + public void setUserPublicKey(String userPublicKey) { + this.userPublicKey = userPublicKey; + } + + public void setUsesRegularPass(boolean usesRegularPass) { + this.usesRegularPass = usesRegularPass; + } + + public boolean equals(final Object o) { + if (o == this) { + return true; + } + if (!(o instanceof PushConfigurationState)) { + return false; + } + final PushConfigurationState other = (PushConfigurationState) o; + if (!other.canEqual((Object) this)) { + return false; + } + final Object this$pushToken = this.getPushToken(); + final Object other$pushToken = other.getPushToken(); + if (this$pushToken == null ? other$pushToken != null : !this$pushToken.equals(other$pushToken)) { + return false; + } + final Object this$deviceIdentifier = this.getDeviceIdentifier(); + final Object other$deviceIdentifier = other.getDeviceIdentifier(); + if (this$deviceIdentifier == null ? other$deviceIdentifier != null : !this$deviceIdentifier.equals(other$deviceIdentifier)) { + return false; + } + final Object this$deviceIdentifierSignature = this.getDeviceIdentifierSignature(); + final Object other$deviceIdentifierSignature = other.getDeviceIdentifierSignature(); + if (this$deviceIdentifierSignature == null ? other$deviceIdentifierSignature != null : !this$deviceIdentifierSignature.equals(other$deviceIdentifierSignature)) { + return false; + } + final Object this$userPublicKey = this.getUserPublicKey(); + final Object other$userPublicKey = other.getUserPublicKey(); + if (this$userPublicKey == null ? other$userPublicKey != null : !this$userPublicKey.equals(other$userPublicKey)) { + return false; + } + if (this.isUsesRegularPass() != other.isUsesRegularPass()) { + return false; + } + return true; + } + + protected boolean canEqual(final Object other) { + return other instanceof PushConfigurationState; + } + + public int hashCode() { + final int PRIME = 59; + int result = 1; + final Object $pushToken = this.getPushToken(); + result = result * PRIME + ($pushToken == null ? 43 : $pushToken.hashCode()); + final Object $deviceIdentifier = this.getDeviceIdentifier(); + result = result * PRIME + ($deviceIdentifier == null ? 43 : $deviceIdentifier.hashCode()); + final Object $deviceIdentifierSignature = this.getDeviceIdentifierSignature(); + result = result * PRIME + ($deviceIdentifierSignature == null ? 43 : $deviceIdentifierSignature.hashCode()); + final Object $userPublicKey = this.getUserPublicKey(); + result = result * PRIME + ($userPublicKey == null ? 43 : $userPublicKey.hashCode()); + result = result * PRIME + (this.isUsesRegularPass() ? 79 : 97); + return result; + } + + public String toString() { + return "PushConfigurationState(pushToken=" + this.getPushToken() + ", deviceIdentifier=" + this.getDeviceIdentifier() + ", deviceIdentifierSignature=" + this.getDeviceIdentifierSignature() + ", userPublicKey=" + this.getUserPublicKey() + ", usesRegularPass=" + this.isUsesRegularPass() + ")"; + } } 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 0d494ebff..4555860e6 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 @@ -23,10 +23,9 @@ package com.nextcloud.talk.models.json.push; import com.bluelinelabs.logansquare.annotation.JsonField; import com.bluelinelabs.logansquare.annotation.JsonObject; -import lombok.Data; + import org.parceler.Parcel; -@Data @Parcel @JsonObject public class PushRegistration { @@ -38,5 +37,81 @@ public class PushRegistration { @JsonField(name = "signature") String signature; + + public PushRegistration() { + } + + public String getPublicKey() { + return this.publicKey; + } + + public String getDeviceIdentifier() { + return this.deviceIdentifier; + } + + public String getSignature() { + return this.signature; + } + + public void setPublicKey(String publicKey) { + this.publicKey = publicKey; + } + + public void setDeviceIdentifier(String deviceIdentifier) { + this.deviceIdentifier = deviceIdentifier; + } + + public void setSignature(String signature) { + this.signature = signature; + } + + public boolean equals(final Object o) { + if (o == this) { + return true; + } + if (!(o instanceof PushRegistration)) { + return false; + } + final PushRegistration other = (PushRegistration) o; + if (!other.canEqual((Object) this)) { + return false; + } + final Object this$publicKey = this.getPublicKey(); + final Object other$publicKey = other.getPublicKey(); + if (this$publicKey == null ? other$publicKey != null : !this$publicKey.equals(other$publicKey)) { + return false; + } + final Object this$deviceIdentifier = this.getDeviceIdentifier(); + final Object other$deviceIdentifier = other.getDeviceIdentifier(); + if (this$deviceIdentifier == null ? other$deviceIdentifier != null : !this$deviceIdentifier.equals(other$deviceIdentifier)) { + return false; + } + 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; + } + + protected boolean canEqual(final Object other) { + return other instanceof PushRegistration; + } + + public int hashCode() { + final int PRIME = 59; + int result = 1; + final Object $publicKey = this.getPublicKey(); + result = result * PRIME + ($publicKey == null ? 43 : $publicKey.hashCode()); + final Object $deviceIdentifier = this.getDeviceIdentifier(); + result = result * PRIME + ($deviceIdentifier == null ? 43 : $deviceIdentifier.hashCode()); + final Object $signature = this.getSignature(); + result = result * PRIME + ($signature == null ? 43 : $signature.hashCode()); + return result; + } + + public String toString() { + return "PushRegistration(publicKey=" + this.getPublicKey() + ", deviceIdentifier=" + this.getDeviceIdentifier() + ", signature=" + this.getSignature() + ")"; + } } 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 e16eae402..f1a135bc4 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 @@ -23,13 +23,58 @@ package com.nextcloud.talk.models.json.push; import com.bluelinelabs.logansquare.annotation.JsonField; import com.bluelinelabs.logansquare.annotation.JsonObject; import com.nextcloud.talk.models.json.generic.GenericOCS; -import lombok.Data; + import org.parceler.Parcel; -@Data @Parcel @JsonObject public class PushRegistrationOCS extends GenericOCS { @JsonField(name = "data") PushRegistration data; + + public PushRegistrationOCS() { + } + + public PushRegistration getData() { + return this.data; + } + + public void setData(PushRegistration data) { + this.data = data; + } + + public boolean equals(final Object o) { + if (o == this) { + return true; + } + if (!(o instanceof PushRegistrationOCS)) { + return false; + } + final PushRegistrationOCS other = (PushRegistrationOCS) o; + if (!other.canEqual((Object) this)) { + return false; + } + 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; + } + + protected boolean canEqual(final Object other) { + return other instanceof PushRegistrationOCS; + } + + public int hashCode() { + final int PRIME = 59; + int result = 1; + final Object $data = this.getData(); + result = result * PRIME + ($data == null ? 43 : $data.hashCode()); + return result; + } + + public String toString() { + return "PushRegistrationOCS(data=" + this.getData() + ")"; + } } 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 6e33d175c..53e8464ae 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 @@ -22,13 +22,58 @@ package com.nextcloud.talk.models.json.push; import com.bluelinelabs.logansquare.annotation.JsonField; import com.bluelinelabs.logansquare.annotation.JsonObject; -import lombok.Data; + import org.parceler.Parcel; -@Data @Parcel @JsonObject public class PushRegistrationOverall { @JsonField(name = "ocs") PushRegistrationOCS ocs; + + public PushRegistrationOverall() { + } + + public PushRegistrationOCS getOcs() { + return this.ocs; + } + + public void setOcs(PushRegistrationOCS ocs) { + this.ocs = ocs; + } + + public boolean equals(final Object o) { + if (o == this) { + return true; + } + if (!(o instanceof PushRegistrationOverall)) { + return false; + } + final PushRegistrationOverall other = (PushRegistrationOverall) o; + if (!other.canEqual((Object) this)) { + return false; + } + 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; + } + + protected boolean canEqual(final Object other) { + return other instanceof PushRegistrationOverall; + } + + public int hashCode() { + final int PRIME = 59; + int result = 1; + final Object $ocs = this.getOcs(); + result = result * PRIME + ($ocs == null ? 43 : $ocs.hashCode()); + return result; + } + + public String toString() { + return "PushRegistrationOverall(ocs=" + this.getOcs() + ")"; + } } 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 e0f788555..348d007bd 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 @@ -29,12 +29,55 @@ import org.parceler.Parcel; import java.util.HashMap; import java.util.Map; -import lombok.Data; - -@Data @Parcel @JsonObject public class ContactsByNumberOCS extends GenericOCS { @JsonField(name = "data") public Map map = new HashMap(); + + public ContactsByNumberOCS() { + } + + public Map getMap() { + return this.map; + } + + public void setMap(Map map) { + this.map = map; + } + + public boolean equals(final Object o) { + if (o == this) { + return true; + } + if (!(o instanceof ContactsByNumberOCS)) { + return false; + } + final ContactsByNumberOCS other = (ContactsByNumberOCS) o; + if (!other.canEqual((Object) this)) { + return false; + } + 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; + } + + protected boolean canEqual(final Object other) { + return other instanceof ContactsByNumberOCS; + } + + public int hashCode() { + final int PRIME = 59; + int result = 1; + final Object $map = this.getMap(); + result = result * PRIME + ($map == null ? 43 : $map.hashCode()); + return result; + } + + public String toString() { + return "ContactsByNumberOCS(map=" + this.getMap() + ")"; + } } 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 8ec10ebe1..4ae4e2acb 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 @@ -25,12 +25,55 @@ import com.bluelinelabs.logansquare.annotation.JsonObject; import org.parceler.Parcel; -import lombok.Data; - -@Data @Parcel @JsonObject public class ContactsByNumberOverall { @JsonField(name = "ocs") public ContactsByNumberOCS ocs; + + public ContactsByNumberOverall() { + } + + public ContactsByNumberOCS getOcs() { + return this.ocs; + } + + public void setOcs(ContactsByNumberOCS ocs) { + this.ocs = ocs; + } + + public boolean equals(final Object o) { + if (o == this) { + return true; + } + if (!(o instanceof ContactsByNumberOverall)) { + return false; + } + final ContactsByNumberOverall other = (ContactsByNumberOverall) o; + if (!other.canEqual((Object) this)) { + return false; + } + 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; + } + + protected boolean canEqual(final Object other) { + return other instanceof ContactsByNumberOverall; + } + + public int hashCode() { + final int PRIME = 59; + int result = 1; + final Object $ocs = this.getOcs(); + result = result * PRIME + ($ocs == null ? 43 : $ocs.hashCode()); + return result; + } + + public String toString() { + return "ContactsByNumberOverall(ocs=" + this.getOcs() + ")"; + } } 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 eae480402..bf8f90230 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 @@ -22,15 +22,60 @@ package com.nextcloud.talk.models.json.sharees; import com.bluelinelabs.logansquare.annotation.JsonField; import com.bluelinelabs.logansquare.annotation.JsonObject; -import lombok.Data; + import org.parceler.Parcel; import java.util.List; @Parcel -@Data @JsonObject public class ExactSharees { @JsonField(name = "users") List exactSharees; + + public ExactSharees() { + } + + public List getExactSharees() { + return this.exactSharees; + } + + public void setExactSharees(List exactSharees) { + this.exactSharees = exactSharees; + } + + public boolean equals(final Object o) { + if (o == this) { + return true; + } + if (!(o instanceof ExactSharees)) { + return false; + } + final ExactSharees other = (ExactSharees) o; + if (!other.canEqual((Object) this)) { + return false; + } + 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; + } + + protected boolean canEqual(final Object other) { + return other instanceof ExactSharees; + } + + public int hashCode() { + final int PRIME = 59; + int result = 1; + final Object $exactSharees = this.getExactSharees(); + result = result * PRIME + ($exactSharees == null ? 43 : $exactSharees.hashCode()); + return result; + } + + public String toString() { + return "ExactSharees(exactSharees=" + this.getExactSharees() + ")"; + } } 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 550117f5c..2b03ba4a4 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 @@ -22,11 +22,10 @@ package com.nextcloud.talk.models.json.sharees; import com.bluelinelabs.logansquare.annotation.JsonField; import com.bluelinelabs.logansquare.annotation.JsonObject; -import lombok.Data; + import org.parceler.Parcel; @Parcel -@Data @JsonObject public class Sharee { @JsonField(name = "id") @@ -37,4 +36,80 @@ public class Sharee { @JsonField(name = "label") String label; + + public Sharee() { + } + + public String getId() { + return this.id; + } + + public Value getValue() { + return this.value; + } + + public String getLabel() { + return this.label; + } + + public void setId(String id) { + this.id = id; + } + + public void setValue(Value value) { + this.value = value; + } + + public void setLabel(String label) { + this.label = label; + } + + public boolean equals(final Object o) { + if (o == this) { + return true; + } + if (!(o instanceof Sharee)) { + return false; + } + final Sharee other = (Sharee) o; + if (!other.canEqual((Object) this)) { + return false; + } + final Object this$id = this.getId(); + final Object other$id = other.getId(); + if (this$id == null ? other$id != null : !this$id.equals(other$id)) { + return false; + } + final Object this$value = this.getValue(); + final Object other$value = other.getValue(); + if (this$value == null ? other$value != null : !this$value.equals(other$value)) { + return false; + } + 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; + } + + protected boolean canEqual(final Object other) { + return other instanceof Sharee; + } + + public int hashCode() { + final int PRIME = 59; + int result = 1; + final Object $id = this.getId(); + result = result * PRIME + ($id == null ? 43 : $id.hashCode()); + final Object $value = this.getValue(); + result = result * PRIME + ($value == null ? 43 : $value.hashCode()); + final Object $label = this.getLabel(); + result = result * PRIME + ($label == null ? 43 : $label.hashCode()); + return result; + } + + public String toString() { + return "Sharee(id=" + this.getId() + ", value=" + this.getValue() + ", label=" + this.getLabel() + ")"; + } } 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 f20bcc6b9..34e62f1eb 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 @@ -23,13 +23,58 @@ package com.nextcloud.talk.models.json.sharees; import com.bluelinelabs.logansquare.annotation.JsonField; import com.bluelinelabs.logansquare.annotation.JsonObject; import com.nextcloud.talk.models.json.generic.GenericOCS; -import lombok.Data; + import org.parceler.Parcel; -@Data @Parcel @JsonObject public class ShareesOCS extends GenericOCS { @JsonField(name = "data") SharesData data; + + public ShareesOCS() { + } + + public SharesData getData() { + return this.data; + } + + public void setData(SharesData data) { + this.data = data; + } + + public boolean equals(final Object o) { + if (o == this) { + return true; + } + if (!(o instanceof ShareesOCS)) { + return false; + } + final ShareesOCS other = (ShareesOCS) o; + if (!other.canEqual((Object) this)) { + return false; + } + 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; + } + + protected boolean canEqual(final Object other) { + return other instanceof ShareesOCS; + } + + public int hashCode() { + final int PRIME = 59; + int result = 1; + final Object $data = this.getData(); + result = result * PRIME + ($data == null ? 43 : $data.hashCode()); + return result; + } + + public String toString() { + return "ShareesOCS(data=" + this.getData() + ")"; + } } 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 59f0c3a02..1cff0e73d 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 @@ -22,13 +22,58 @@ package com.nextcloud.talk.models.json.sharees; import com.bluelinelabs.logansquare.annotation.JsonField; import com.bluelinelabs.logansquare.annotation.JsonObject; -import lombok.Data; + import org.parceler.Parcel; @Parcel -@Data @JsonObject public class ShareesOverall { @JsonField(name = "ocs") ShareesOCS ocs; + + public ShareesOverall() { + } + + public ShareesOCS getOcs() { + return this.ocs; + } + + public void setOcs(ShareesOCS ocs) { + this.ocs = ocs; + } + + public boolean equals(final Object o) { + if (o == this) { + return true; + } + if (!(o instanceof ShareesOverall)) { + return false; + } + final ShareesOverall other = (ShareesOverall) o; + if (!other.canEqual((Object) this)) { + return false; + } + 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; + } + + protected boolean canEqual(final Object other) { + return other instanceof ShareesOverall; + } + + public int hashCode() { + final int PRIME = 59; + int result = 1; + final Object $ocs = this.getOcs(); + result = result * PRIME + ($ocs == null ? 43 : $ocs.hashCode()); + return result; + } + + public String toString() { + return "ShareesOverall(ocs=" + this.getOcs() + ")"; + } } 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 37dd23821..dddcbcddf 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 @@ -22,13 +22,12 @@ package com.nextcloud.talk.models.json.sharees; import com.bluelinelabs.logansquare.annotation.JsonField; import com.bluelinelabs.logansquare.annotation.JsonObject; -import lombok.Data; + import org.parceler.Parcel; import java.util.List; @Parcel -@Data @JsonObject public class SharesData { @JsonField(name = "users") @@ -37,4 +36,64 @@ public class SharesData { @JsonField(name = "exact") ExactSharees exactUsers; + public SharesData() { + } + + public List getUsers() { + return this.users; + } + + public ExactSharees getExactUsers() { + return this.exactUsers; + } + + public void setUsers(List users) { + this.users = users; + } + + public void setExactUsers(ExactSharees exactUsers) { + this.exactUsers = exactUsers; + } + + public boolean equals(final Object o) { + if (o == this) { + return true; + } + if (!(o instanceof SharesData)) { + return false; + } + final SharesData other = (SharesData) o; + if (!other.canEqual((Object) this)) { + return false; + } + final Object this$users = this.getUsers(); + final Object other$users = other.getUsers(); + if (this$users == null ? other$users != null : !this$users.equals(other$users)) { + return false; + } + 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; + } + + protected boolean canEqual(final Object other) { + return other instanceof SharesData; + } + + public int hashCode() { + final int PRIME = 59; + int result = 1; + final Object $users = this.getUsers(); + result = result * PRIME + ($users == null ? 43 : $users.hashCode()); + final Object $exactUsers = this.getExactUsers(); + result = result * PRIME + ($exactUsers == null ? 43 : $exactUsers.hashCode()); + return result; + } + + public String toString() { + return "SharesData(users=" + this.getUsers() + ", exactUsers=" + this.getExactUsers() + ")"; + } } 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 25a5f933d..c31cf0588 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 @@ -22,13 +22,58 @@ package com.nextcloud.talk.models.json.sharees; import com.bluelinelabs.logansquare.annotation.JsonField; import com.bluelinelabs.logansquare.annotation.JsonObject; -import lombok.Data; + import org.parceler.Parcel; @Parcel -@Data @JsonObject public class Value { @JsonField(name = "shareWith") String shareWith; + + public Value() { + } + + public String getShareWith() { + return this.shareWith; + } + + public void setShareWith(String shareWith) { + this.shareWith = shareWith; + } + + public boolean equals(final Object o) { + if (o == this) { + return true; + } + if (!(o instanceof Value)) { + return false; + } + final Value other = (Value) o; + if (!other.canEqual((Object) this)) { + return false; + } + 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; + } + + protected boolean canEqual(final Object other) { + return other instanceof Value; + } + + public int hashCode() { + final int PRIME = 59; + int result = 1; + final Object $shareWith = this.getShareWith(); + result = result * PRIME + ($shareWith == null ? 43 : $shareWith.hashCode()); + return result; + } + + public String toString() { + return "Value(shareWith=" + this.getShareWith() + ")"; + } } 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 4f54832e5..4d39c4215 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 @@ -23,10 +23,9 @@ package com.nextcloud.talk.models.json.signaling; import com.bluelinelabs.logansquare.annotation.JsonField; import com.bluelinelabs.logansquare.annotation.JsonObject; import com.nextcloud.talk.models.json.converters.ObjectParcelConverter; -import lombok.Data; + import org.parceler.ParcelPropertyConverter; -@Data @JsonObject public class DataChannelMessage { @JsonField(name = "type") @@ -42,4 +41,62 @@ public class DataChannelMessage { public DataChannelMessage() { } + + public String getType() { + return this.type; + } + + public Object getPayload() { + return this.payload; + } + + public void setType(String type) { + this.type = type; + } + + public void setPayload(Object payload) { + this.payload = payload; + } + + public boolean equals(final Object o) { + if (o == this) { + return true; + } + if (!(o instanceof DataChannelMessage)) { + return false; + } + final DataChannelMessage other = (DataChannelMessage) o; + if (!other.canEqual((Object) this)) { + return false; + } + 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; + } + 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; + } + + protected boolean canEqual(final Object other) { + return other instanceof DataChannelMessage; + } + + public int hashCode() { + final int PRIME = 59; + int result = 1; + final Object $type = this.getType(); + result = result * PRIME + ($type == null ? 43 : $type.hashCode()); + final Object $payload = this.getPayload(); + result = result * PRIME + ($payload == null ? 43 : $payload.hashCode()); + return result; + } + + public String toString() { + return "DataChannelMessage(type=" + this.getType() + ", payload=" + this.getPayload() + ")"; + } } 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 4e5cffc20..ffd655ff9 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 @@ -23,12 +23,11 @@ package com.nextcloud.talk.models.json.signaling; import com.bluelinelabs.logansquare.annotation.JsonField; import com.bluelinelabs.logansquare.annotation.JsonObject; import com.nextcloud.talk.models.json.converters.ObjectParcelConverter; -import lombok.Data; + import org.parceler.ParcelPropertyConverter; import java.util.HashMap; -@Data @JsonObject public class DataChannelMessageNick { @JsonField(name = "type") @@ -44,4 +43,62 @@ public class DataChannelMessageNick { public DataChannelMessageNick() { } + + public String getType() { + return this.type; + } + + public HashMap getPayload() { + return this.payload; + } + + public void setType(String type) { + this.type = type; + } + + public void setPayload(HashMap payload) { + this.payload = payload; + } + + public boolean equals(final Object o) { + if (o == this) { + return true; + } + if (!(o instanceof DataChannelMessageNick)) { + return false; + } + final DataChannelMessageNick other = (DataChannelMessageNick) o; + if (!other.canEqual((Object) this)) { + return false; + } + 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; + } + 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; + } + + protected boolean canEqual(final Object other) { + return other instanceof DataChannelMessageNick; + } + + public int hashCode() { + final int PRIME = 59; + int result = 1; + final Object $type = this.getType(); + result = result * PRIME + ($type == null ? 43 : $type.hashCode()); + final Object $payload = this.getPayload(); + result = result * PRIME + ($payload == null ? 43 : $payload.hashCode()); + return result; + } + + public String toString() { + return "DataChannelMessageNick(type=" + this.getType() + ", payload=" + this.getPayload() + ")"; + } } 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 c92e8ebc8..a881d9666 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 @@ -22,10 +22,9 @@ package com.nextcloud.talk.models.json.signaling; import com.bluelinelabs.logansquare.annotation.JsonField; import com.bluelinelabs.logansquare.annotation.JsonObject; -import lombok.Data; + import org.parceler.Parcel; -@Data @JsonObject @Parcel public class NCIceCandidate { @@ -37,4 +36,77 @@ public class NCIceCandidate { @JsonField(name = "candidate") String candidate; + + public NCIceCandidate() { + } + + public int getSdpMLineIndex() { + return this.sdpMLineIndex; + } + + public String getSdpMid() { + return this.sdpMid; + } + + public String getCandidate() { + return this.candidate; + } + + public void setSdpMLineIndex(int sdpMLineIndex) { + this.sdpMLineIndex = sdpMLineIndex; + } + + public void setSdpMid(String sdpMid) { + this.sdpMid = sdpMid; + } + + public void setCandidate(String candidate) { + this.candidate = candidate; + } + + public boolean equals(final Object o) { + if (o == this) { + return true; + } + if (!(o instanceof NCIceCandidate)) { + return false; + } + final NCIceCandidate other = (NCIceCandidate) o; + if (!other.canEqual((Object) this)) { + return false; + } + if (this.getSdpMLineIndex() != other.getSdpMLineIndex()) { + return false; + } + final Object this$sdpMid = this.getSdpMid(); + final Object other$sdpMid = other.getSdpMid(); + if (this$sdpMid == null ? other$sdpMid != null : !this$sdpMid.equals(other$sdpMid)) { + return false; + } + 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; + } + + protected boolean canEqual(final Object other) { + return other instanceof NCIceCandidate; + } + + public int hashCode() { + final int PRIME = 59; + int result = 1; + result = result * PRIME + this.getSdpMLineIndex(); + final Object $sdpMid = this.getSdpMid(); + result = result * PRIME + ($sdpMid == null ? 43 : $sdpMid.hashCode()); + final Object $candidate = this.getCandidate(); + result = result * PRIME + ($candidate == null ? 43 : $candidate.hashCode()); + return result; + } + + public String toString() { + return "NCIceCandidate(sdpMLineIndex=" + this.getSdpMLineIndex() + ", sdpMid=" + this.getSdpMid() + ", candidate=" + this.getCandidate() + ")"; + } } 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 7db2e7ccd..32383eeb1 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 @@ -22,10 +22,9 @@ package com.nextcloud.talk.models.json.signaling; import com.bluelinelabs.logansquare.annotation.JsonField; import com.bluelinelabs.logansquare.annotation.JsonObject; -import lombok.Data; + import org.parceler.Parcel; -@Data @JsonObject @Parcel public class NCMessagePayload { @@ -43,4 +42,110 @@ public class NCMessagePayload { @JsonField(name = "name") String name; + + public NCMessagePayload() { + } + + public String getType() { + return this.type; + } + + public String getSdp() { + return this.sdp; + } + + public String getNick() { + return this.nick; + } + + public NCIceCandidate getIceCandidate() { + return this.iceCandidate; + } + + public String getName() { + return this.name; + } + + public void setType(String type) { + this.type = type; + } + + public void setSdp(String sdp) { + this.sdp = sdp; + } + + public void setNick(String nick) { + this.nick = nick; + } + + public void setIceCandidate(NCIceCandidate iceCandidate) { + this.iceCandidate = iceCandidate; + } + + public void setName(String name) { + this.name = name; + } + + public boolean equals(final Object o) { + if (o == this) { + return true; + } + if (!(o instanceof NCMessagePayload)) { + return false; + } + final NCMessagePayload other = (NCMessagePayload) o; + if (!other.canEqual((Object) this)) { + return false; + } + 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; + } + final Object this$sdp = this.getSdp(); + final Object other$sdp = other.getSdp(); + if (this$sdp == null ? other$sdp != null : !this$sdp.equals(other$sdp)) { + return false; + } + final Object this$nick = this.getNick(); + final Object other$nick = other.getNick(); + if (this$nick == null ? other$nick != null : !this$nick.equals(other$nick)) { + return false; + } + final Object this$iceCandidate = this.getIceCandidate(); + final Object other$iceCandidate = other.getIceCandidate(); + if (this$iceCandidate == null ? other$iceCandidate != null : !this$iceCandidate.equals(other$iceCandidate)) { + return false; + } + 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; + } + + protected boolean canEqual(final Object other) { + return other instanceof NCMessagePayload; + } + + public int hashCode() { + final int PRIME = 59; + int result = 1; + final Object $type = this.getType(); + result = result * PRIME + ($type == null ? 43 : $type.hashCode()); + final Object $sdp = this.getSdp(); + result = result * PRIME + ($sdp == null ? 43 : $sdp.hashCode()); + final Object $nick = this.getNick(); + result = result * PRIME + ($nick == null ? 43 : $nick.hashCode()); + final Object $iceCandidate = this.getIceCandidate(); + result = result * PRIME + ($iceCandidate == null ? 43 : $iceCandidate.hashCode()); + final Object $name = this.getName(); + result = result * PRIME + ($name == null ? 43 : $name.hashCode()); + return result; + } + + public String toString() { + return "NCMessagePayload(type=" + this.getType() + ", sdp=" + this.getSdp() + ", nick=" + this.getNick() + ", iceCandidate=" + this.getIceCandidate() + ", name=" + this.getName() + ")"; + } } 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 b40093bf6..a39891624 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 @@ -22,10 +22,9 @@ package com.nextcloud.talk.models.json.signaling; import com.bluelinelabs.logansquare.annotation.JsonField; import com.bluelinelabs.logansquare.annotation.JsonObject; -import lombok.Data; + import org.parceler.Parcel; -@Data @JsonObject @Parcel public class NCMessageWrapper { @@ -38,4 +37,80 @@ public class NCMessageWrapper { @JsonField(name = "sessionId") String sessionId; + + public NCMessageWrapper() { + } + + public NCSignalingMessage getSignalingMessage() { + return this.signalingMessage; + } + + public String getEv() { + return this.ev; + } + + public String getSessionId() { + return this.sessionId; + } + + public void setSignalingMessage(NCSignalingMessage signalingMessage) { + this.signalingMessage = signalingMessage; + } + + public void setEv(String ev) { + this.ev = ev; + } + + public void setSessionId(String sessionId) { + this.sessionId = sessionId; + } + + public boolean equals(final Object o) { + if (o == this) { + return true; + } + if (!(o instanceof NCMessageWrapper)) { + return false; + } + final NCMessageWrapper other = (NCMessageWrapper) o; + if (!other.canEqual((Object) this)) { + return false; + } + final Object this$signalingMessage = this.getSignalingMessage(); + final Object other$signalingMessage = other.getSignalingMessage(); + if (this$signalingMessage == null ? other$signalingMessage != null : !this$signalingMessage.equals(other$signalingMessage)) { + return false; + } + final Object this$ev = this.getEv(); + final Object other$ev = other.getEv(); + if (this$ev == null ? other$ev != null : !this$ev.equals(other$ev)) { + return false; + } + 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; + } + + protected boolean canEqual(final Object other) { + return other instanceof NCMessageWrapper; + } + + public int hashCode() { + final int PRIME = 59; + int result = 1; + final Object $signalingMessage = this.getSignalingMessage(); + result = result * PRIME + ($signalingMessage == null ? 43 : $signalingMessage.hashCode()); + final Object $ev = this.getEv(); + result = result * PRIME + ($ev == null ? 43 : $ev.hashCode()); + final Object $sessionId = this.getSessionId(); + result = result * PRIME + ($sessionId == null ? 43 : $sessionId.hashCode()); + return result; + } + + public String toString() { + return "NCMessageWrapper(signalingMessage=" + this.getSignalingMessage() + ", ev=" + this.getEv() + ", sessionId=" + this.getSessionId() + ")"; + } } 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 d4e92503b..ac979dbe8 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 @@ -22,10 +22,9 @@ package com.nextcloud.talk.models.json.signaling; import com.bluelinelabs.logansquare.annotation.JsonField; import com.bluelinelabs.logansquare.annotation.JsonObject; -import lombok.Data; + import org.parceler.Parcel; -@Data @JsonObject @Parcel public class NCSignalingMessage { @@ -43,4 +42,140 @@ public class NCSignalingMessage { String sid; @JsonField(name = "prefix") String prefix; + + public NCSignalingMessage() { + } + + public String getFrom() { + return this.from; + } + + public String getTo() { + return this.to; + } + + public String getType() { + return this.type; + } + + public NCMessagePayload getPayload() { + return this.payload; + } + + public String getRoomType() { + return this.roomType; + } + + public String getSid() { + return this.sid; + } + + public String getPrefix() { + return this.prefix; + } + + public void setFrom(String from) { + this.from = from; + } + + public void setTo(String to) { + this.to = to; + } + + public void setType(String type) { + this.type = type; + } + + public void setPayload(NCMessagePayload payload) { + this.payload = payload; + } + + public void setRoomType(String roomType) { + this.roomType = roomType; + } + + public void setSid(String sid) { + this.sid = sid; + } + + public void setPrefix(String prefix) { + this.prefix = prefix; + } + + public boolean equals(final Object o) { + if (o == this) { + return true; + } + if (!(o instanceof NCSignalingMessage)) { + return false; + } + final NCSignalingMessage other = (NCSignalingMessage) o; + if (!other.canEqual((Object) this)) { + return false; + } + final Object this$from = this.getFrom(); + final Object other$from = other.getFrom(); + if (this$from == null ? other$from != null : !this$from.equals(other$from)) { + return false; + } + final Object this$to = this.getTo(); + final Object other$to = other.getTo(); + if (this$to == null ? other$to != null : !this$to.equals(other$to)) { + return false; + } + 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; + } + 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; + } + 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; + } + final Object this$sid = this.getSid(); + final Object other$sid = other.getSid(); + if (this$sid == null ? other$sid != null : !this$sid.equals(other$sid)) { + return false; + } + 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; + } + + protected boolean canEqual(final Object other) { + return other instanceof NCSignalingMessage; + } + + public int hashCode() { + final int PRIME = 59; + int result = 1; + final Object $from = this.getFrom(); + result = result * PRIME + ($from == null ? 43 : $from.hashCode()); + final Object $to = this.getTo(); + result = result * PRIME + ($to == null ? 43 : $to.hashCode()); + final Object $type = this.getType(); + result = result * PRIME + ($type == null ? 43 : $type.hashCode()); + final Object $payload = this.getPayload(); + result = result * PRIME + ($payload == null ? 43 : $payload.hashCode()); + final Object $roomType = this.getRoomType(); + result = result * PRIME + ($roomType == null ? 43 : $roomType.hashCode()); + final Object $sid = this.getSid(); + result = result * PRIME + ($sid == null ? 43 : $sid.hashCode()); + final Object $prefix = this.getPrefix(); + result = result * PRIME + ($prefix == null ? 43 : $prefix.hashCode()); + return result; + } + + public String toString() { + return "NCSignalingMessage(from=" + this.getFrom() + ", to=" + this.getTo() + ", type=" + this.getType() + ", payload=" + this.getPayload() + ", roomType=" + this.getRoomType() + ", sid=" + this.getSid() + ", prefix=" + this.getPrefix() + ")"; + } } 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 82f19549d..bb2112e64 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 @@ -22,13 +22,11 @@ package com.nextcloud.talk.models.json.signaling; import com.bluelinelabs.logansquare.annotation.JsonField; import com.bluelinelabs.logansquare.annotation.JsonObject; -import lombok.Data; /** * Created by mdjanic on 30/10/2017. */ -@Data @JsonObject public class Signaling { @JsonField(name = "type") @@ -36,4 +34,65 @@ public class Signaling { //can be NCMessageWrapper or List> @JsonField(name = "data") Object messageWrapper; + + public Signaling() { + } + + public String getType() { + return this.type; + } + + public Object getMessageWrapper() { + return this.messageWrapper; + } + + public void setType(String type) { + this.type = type; + } + + public void setMessageWrapper(Object messageWrapper) { + this.messageWrapper = messageWrapper; + } + + public boolean equals(final Object o) { + if (o == this) { + return true; + } + if (!(o instanceof Signaling)) { + return false; + } + final Signaling other = (Signaling) o; + if (!other.canEqual((Object) this)) { + return false; + } + 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; + } + 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; + } + + protected boolean canEqual(final Object other) { + return other instanceof Signaling; + } + + public int hashCode() { + final int PRIME = 59; + int result = 1; + final Object $type = this.getType(); + result = result * PRIME + ($type == null ? 43 : $type.hashCode()); + final Object $messageWrapper = this.getMessageWrapper(); + result = result * PRIME + ($messageWrapper == null ? 43 : $messageWrapper.hashCode()); + return result; + } + + public String toString() { + return "Signaling(type=" + this.getType() + ", messageWrapper=" + this.getMessageWrapper() + ")"; + } } 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 a8c44dfe2..00d55b7c0 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 @@ -23,13 +23,57 @@ package com.nextcloud.talk.models.json.signaling; import com.bluelinelabs.logansquare.annotation.JsonField; import com.bluelinelabs.logansquare.annotation.JsonObject; import com.nextcloud.talk.models.json.generic.GenericOCS; -import lombok.Data; import java.util.List; -@Data @JsonObject public class SignalingOCS extends GenericOCS { @JsonField(name = "data") List signalings; + + public SignalingOCS() { + } + + public List getSignalings() { + return this.signalings; + } + + public void setSignalings(List signalings) { + this.signalings = signalings; + } + + public boolean equals(final Object o) { + if (o == this) { + return true; + } + if (!(o instanceof SignalingOCS)) { + return false; + } + final SignalingOCS other = (SignalingOCS) o; + if (!other.canEqual((Object) this)) { + return false; + } + 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; + } + + protected boolean canEqual(final Object other) { + return other instanceof SignalingOCS; + } + + public int hashCode() { + final int PRIME = 59; + int result = 1; + final Object $signalings = this.getSignalings(); + result = result * PRIME + ($signalings == null ? 43 : $signalings.hashCode()); + return result; + } + + public String toString() { + return "SignalingOCS(signalings=" + this.getSignalings() + ")"; + } } 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 fc9bfc916..c8408a541 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 @@ -22,11 +22,55 @@ package com.nextcloud.talk.models.json.signaling; import com.bluelinelabs.logansquare.annotation.JsonField; import com.bluelinelabs.logansquare.annotation.JsonObject; -import lombok.Data; @JsonObject -@Data public class SignalingOverall { @JsonField(name = "ocs") SignalingOCS ocs; + + public SignalingOverall() { + } + + public SignalingOCS getOcs() { + return this.ocs; + } + + public void setOcs(SignalingOCS ocs) { + this.ocs = ocs; + } + + public boolean equals(final Object o) { + if (o == this) { + return true; + } + if (!(o instanceof SignalingOverall)) { + return false; + } + final SignalingOverall other = (SignalingOverall) o; + if (!other.canEqual((Object) this)) { + return false; + } + 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; + } + + protected boolean canEqual(final Object other) { + return other instanceof SignalingOverall; + } + + public int hashCode() { + final int PRIME = 59; + int result = 1; + final Object $ocs = this.getOcs(); + result = result * PRIME + ($ocs == null ? 43 : $ocs.hashCode()); + return result; + } + + public String toString() { + return "SignalingOverall(ocs=" + this.getOcs() + ")"; + } } 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 1bad04a55..07f925715 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 @@ -22,11 +22,9 @@ package com.nextcloud.talk.models.json.signaling.settings; import com.bluelinelabs.logansquare.annotation.JsonField; import com.bluelinelabs.logansquare.annotation.JsonObject; -import lombok.Data; import java.util.List; -@Data @JsonObject public class IceServer { @JsonField(name = "url") @@ -40,4 +38,95 @@ public class IceServer { @JsonField(name = "credential") String credential; + + public IceServer() { + } + + public String getUrl() { + return this.url; + } + + public List getUrls() { + return this.urls; + } + + public String getUsername() { + return this.username; + } + + public String getCredential() { + return this.credential; + } + + public void setUrl(String url) { + this.url = url; + } + + public void setUrls(List urls) { + this.urls = urls; + } + + public void setUsername(String username) { + this.username = username; + } + + public void setCredential(String credential) { + this.credential = credential; + } + + public boolean equals(final Object o) { + if (o == this) { + return true; + } + if (!(o instanceof IceServer)) { + return false; + } + final IceServer other = (IceServer) o; + if (!other.canEqual((Object) this)) { + return false; + } + final Object this$url = this.getUrl(); + final Object other$url = other.getUrl(); + if (this$url == null ? other$url != null : !this$url.equals(other$url)) { + return false; + } + final Object this$urls = this.getUrls(); + final Object other$urls = other.getUrls(); + if (this$urls == null ? other$urls != null : !this$urls.equals(other$urls)) { + return false; + } + final Object this$username = this.getUsername(); + final Object other$username = other.getUsername(); + if (this$username == null ? other$username != null : !this$username.equals(other$username)) { + return false; + } + 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; + } + + protected boolean canEqual(final Object other) { + return other instanceof IceServer; + } + + public int hashCode() { + final int PRIME = 59; + int result = 1; + final Object $url = this.getUrl(); + result = result * PRIME + ($url == null ? 43 : $url.hashCode()); + final Object $urls = this.getUrls(); + result = result * PRIME + ($urls == null ? 43 : $urls.hashCode()); + final Object $username = this.getUsername(); + result = result * PRIME + ($username == null ? 43 : $username.hashCode()); + final Object $credential = this.getCredential(); + result = result * PRIME + ($credential == null ? 43 : $credential.hashCode()); + return result; + } + + public String toString() { + return "IceServer(url=" + this.getUrl() + ", urls=" + this.getUrls() + ", username=" + this.getUsername() + ", credential=" + this.getCredential() + ")"; + } } 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 c07e1a365..dd8858e05 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 @@ -22,11 +22,9 @@ package com.nextcloud.talk.models.json.signaling.settings; import com.bluelinelabs.logansquare.annotation.JsonField; import com.bluelinelabs.logansquare.annotation.JsonObject; -import lombok.Data; import java.util.List; -@Data @JsonObject public class Settings { @JsonField(name = "stunservers") @@ -40,4 +38,95 @@ public class Settings { @JsonField(name = "ticket") String externalSignalingTicket; + + public Settings() { + } + + public List getStunServers() { + return this.stunServers; + } + + public List getTurnServers() { + return this.turnServers; + } + + public String getExternalSignalingServer() { + return this.externalSignalingServer; + } + + public String getExternalSignalingTicket() { + return this.externalSignalingTicket; + } + + public void setStunServers(List stunServers) { + this.stunServers = stunServers; + } + + public void setTurnServers(List turnServers) { + this.turnServers = turnServers; + } + + public void setExternalSignalingServer(String externalSignalingServer) { + this.externalSignalingServer = externalSignalingServer; + } + + public void setExternalSignalingTicket(String externalSignalingTicket) { + this.externalSignalingTicket = externalSignalingTicket; + } + + public boolean equals(final Object o) { + if (o == this) { + return true; + } + if (!(o instanceof Settings)) { + return false; + } + final Settings other = (Settings) o; + if (!other.canEqual((Object) this)) { + return false; + } + final Object this$stunServers = this.getStunServers(); + final Object other$stunServers = other.getStunServers(); + if (this$stunServers == null ? other$stunServers != null : !this$stunServers.equals(other$stunServers)) { + return false; + } + final Object this$turnServers = this.getTurnServers(); + final Object other$turnServers = other.getTurnServers(); + if (this$turnServers == null ? other$turnServers != null : !this$turnServers.equals(other$turnServers)) { + return false; + } + final Object this$externalSignalingServer = this.getExternalSignalingServer(); + final Object other$externalSignalingServer = other.getExternalSignalingServer(); + if (this$externalSignalingServer == null ? other$externalSignalingServer != null : !this$externalSignalingServer.equals(other$externalSignalingServer)) { + return false; + } + 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; + } + + protected boolean canEqual(final Object other) { + return other instanceof Settings; + } + + public int hashCode() { + final int PRIME = 59; + int result = 1; + final Object $stunServers = this.getStunServers(); + result = result * PRIME + ($stunServers == null ? 43 : $stunServers.hashCode()); + final Object $turnServers = this.getTurnServers(); + result = result * PRIME + ($turnServers == null ? 43 : $turnServers.hashCode()); + final Object $externalSignalingServer = this.getExternalSignalingServer(); + result = result * PRIME + ($externalSignalingServer == null ? 43 : $externalSignalingServer.hashCode()); + final Object $externalSignalingTicket = this.getExternalSignalingTicket(); + result = result * PRIME + ($externalSignalingTicket == null ? 43 : $externalSignalingTicket.hashCode()); + return result; + } + + public String toString() { + return "Settings(stunServers=" + this.getStunServers() + ", turnServers=" + this.getTurnServers() + ", externalSignalingServer=" + this.getExternalSignalingServer() + ", externalSignalingTicket=" + this.getExternalSignalingTicket() + ")"; + } } 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 d2db1314f..bfa0aded2 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 @@ -23,11 +23,55 @@ package com.nextcloud.talk.models.json.signaling.settings; import com.bluelinelabs.logansquare.annotation.JsonField; import com.bluelinelabs.logansquare.annotation.JsonObject; import com.nextcloud.talk.models.json.generic.GenericOCS; -import lombok.Data; -@Data @JsonObject public class SignalingSettingsOcs extends GenericOCS { @JsonField(name = "data") Settings settings; + + public SignalingSettingsOcs() { + } + + public Settings getSettings() { + return this.settings; + } + + public void setSettings(Settings settings) { + this.settings = settings; + } + + public boolean equals(final Object o) { + if (o == this) { + return true; + } + if (!(o instanceof SignalingSettingsOcs)) { + return false; + } + final SignalingSettingsOcs other = (SignalingSettingsOcs) o; + if (!other.canEqual((Object) this)) { + return false; + } + 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; + } + + protected boolean canEqual(final Object other) { + return other instanceof SignalingSettingsOcs; + } + + public int hashCode() { + final int PRIME = 59; + int result = 1; + final Object $settings = this.getSettings(); + result = result * PRIME + ($settings == null ? 43 : $settings.hashCode()); + return result; + } + + public String toString() { + return "SignalingSettingsOcs(settings=" + this.getSettings() + ")"; + } } 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 10d680c4e..2172fa4cf 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 @@ -22,11 +22,55 @@ package com.nextcloud.talk.models.json.signaling.settings; import com.bluelinelabs.logansquare.annotation.JsonField; import com.bluelinelabs.logansquare.annotation.JsonObject; -import lombok.Data; -@Data @JsonObject public class SignalingSettingsOverall { @JsonField(name = "ocs") SignalingSettingsOcs ocs; + + public SignalingSettingsOverall() { + } + + public SignalingSettingsOcs getOcs() { + return this.ocs; + } + + public void setOcs(SignalingSettingsOcs ocs) { + this.ocs = ocs; + } + + public boolean equals(final Object o) { + if (o == this) { + return true; + } + if (!(o instanceof SignalingSettingsOverall)) { + return false; + } + final SignalingSettingsOverall other = (SignalingSettingsOverall) o; + if (!other.canEqual((Object) this)) { + return false; + } + 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; + } + + protected boolean canEqual(final Object other) { + return other instanceof SignalingSettingsOverall; + } + + public int hashCode() { + final int PRIME = 59; + int result = 1; + final Object $ocs = this.getOcs(); + result = result * PRIME + ($ocs == null ? 43 : $ocs.hashCode()); + return result; + } + + public String toString() { + return "SignalingSettingsOverall(ocs=" + this.getOcs() + ")"; + } } 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 518b9b188..6c63f7124 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 @@ -27,10 +27,7 @@ import com.nextcloud.talk.models.json.converters.ScopeConverter; import org.parceler.Parcel; -import lombok.Data; - @Parcel -@Data @JsonObject() public class UserProfileData { @JsonField(name = "display-name") @@ -75,6 +72,9 @@ public class UserProfileData { @JsonField(name = "websiteScope", typeConverter = ScopeConverter.class) Scope websiteScope; + public UserProfileData() { + } + public String getValueByField(ProfileController.Field field) { switch (field) { case EMAIL: @@ -112,4 +112,242 @@ public class UserProfileData { return null; } } + + public String getDisplayName() { + return this.displayName; + } + + public Scope getDisplayNameScope() { + return this.displayNameScope; + } + + public String getDisplayNameAlt() { + return this.displayNameAlt; + } + + public String getUserId() { + return this.userId; + } + + public String getPhone() { + return this.phone; + } + + public Scope getPhoneScope() { + return this.phoneScope; + } + + public String getEmail() { + return this.email; + } + + public Scope getEmailScope() { + return this.emailScope; + } + + public String getAddress() { + return this.address; + } + + public Scope getAddressScope() { + return this.addressScope; + } + + public String getTwitter() { + return this.twitter; + } + + public Scope getTwitterScope() { + return this.twitterScope; + } + + public String getWebsite() { + return this.website; + } + + public Scope getWebsiteScope() { + return this.websiteScope; + } + + public void setDisplayName(String displayName) { + this.displayName = displayName; + } + + public void setDisplayNameScope(Scope displayNameScope) { + this.displayNameScope = displayNameScope; + } + + public void setDisplayNameAlt(String displayNameAlt) { + this.displayNameAlt = displayNameAlt; + } + + public void setUserId(String userId) { + this.userId = userId; + } + + public void setPhone(String phone) { + this.phone = phone; + } + + public void setPhoneScope(Scope phoneScope) { + this.phoneScope = phoneScope; + } + + public void setEmail(String email) { + this.email = email; + } + + public void setEmailScope(Scope emailScope) { + this.emailScope = emailScope; + } + + public void setAddress(String address) { + this.address = address; + } + + public void setAddressScope(Scope addressScope) { + this.addressScope = addressScope; + } + + public void setTwitter(String twitter) { + this.twitter = twitter; + } + + public void setTwitterScope(Scope twitterScope) { + this.twitterScope = twitterScope; + } + + public void setWebsite(String website) { + this.website = website; + } + + public void setWebsiteScope(Scope websiteScope) { + this.websiteScope = websiteScope; + } + + public boolean equals(final Object o) { + if (o == this) { + return true; + } + if (!(o instanceof UserProfileData)) { + return false; + } + final UserProfileData other = (UserProfileData) o; + if (!other.canEqual((Object) this)) { + return false; + } + final Object this$displayName = this.getDisplayName(); + final Object other$displayName = other.getDisplayName(); + if (this$displayName == null ? other$displayName != null : !this$displayName.equals(other$displayName)) { + return false; + } + final Object this$displayNameScope = this.getDisplayNameScope(); + final Object other$displayNameScope = other.getDisplayNameScope(); + if (this$displayNameScope == null ? other$displayNameScope != null : !this$displayNameScope.equals(other$displayNameScope)) { + return false; + } + final Object this$displayNameAlt = this.getDisplayNameAlt(); + final Object other$displayNameAlt = other.getDisplayNameAlt(); + if (this$displayNameAlt == null ? other$displayNameAlt != null : !this$displayNameAlt.equals(other$displayNameAlt)) { + return false; + } + 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; + } + final Object this$phone = this.getPhone(); + final Object other$phone = other.getPhone(); + if (this$phone == null ? other$phone != null : !this$phone.equals(other$phone)) { + return false; + } + final Object this$phoneScope = this.getPhoneScope(); + final Object other$phoneScope = other.getPhoneScope(); + if (this$phoneScope == null ? other$phoneScope != null : !this$phoneScope.equals(other$phoneScope)) { + return false; + } + final Object this$email = this.getEmail(); + final Object other$email = other.getEmail(); + if (this$email == null ? other$email != null : !this$email.equals(other$email)) { + return false; + } + final Object this$emailScope = this.getEmailScope(); + final Object other$emailScope = other.getEmailScope(); + if (this$emailScope == null ? other$emailScope != null : !this$emailScope.equals(other$emailScope)) { + return false; + } + final Object this$address = this.getAddress(); + final Object other$address = other.getAddress(); + if (this$address == null ? other$address != null : !this$address.equals(other$address)) { + return false; + } + final Object this$addressScope = this.getAddressScope(); + final Object other$addressScope = other.getAddressScope(); + if (this$addressScope == null ? other$addressScope != null : !this$addressScope.equals(other$addressScope)) { + return false; + } + final Object this$twitter = this.getTwitter(); + final Object other$twitter = other.getTwitter(); + if (this$twitter == null ? other$twitter != null : !this$twitter.equals(other$twitter)) { + return false; + } + final Object this$twitterScope = this.getTwitterScope(); + final Object other$twitterScope = other.getTwitterScope(); + if (this$twitterScope == null ? other$twitterScope != null : !this$twitterScope.equals(other$twitterScope)) { + return false; + } + final Object this$website = this.getWebsite(); + final Object other$website = other.getWebsite(); + if (this$website == null ? other$website != null : !this$website.equals(other$website)) { + return false; + } + 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; + } + + protected boolean canEqual(final Object other) { + return other instanceof UserProfileData; + } + + public int hashCode() { + final int PRIME = 59; + int result = 1; + final Object $displayName = this.getDisplayName(); + result = result * PRIME + ($displayName == null ? 43 : $displayName.hashCode()); + final Object $displayNameScope = this.getDisplayNameScope(); + result = result * PRIME + ($displayNameScope == null ? 43 : $displayNameScope.hashCode()); + final Object $displayNameAlt = this.getDisplayNameAlt(); + result = result * PRIME + ($displayNameAlt == null ? 43 : $displayNameAlt.hashCode()); + final Object $userId = this.getUserId(); + result = result * PRIME + ($userId == null ? 43 : $userId.hashCode()); + final Object $phone = this.getPhone(); + result = result * PRIME + ($phone == null ? 43 : $phone.hashCode()); + final Object $phoneScope = this.getPhoneScope(); + result = result * PRIME + ($phoneScope == null ? 43 : $phoneScope.hashCode()); + final Object $email = this.getEmail(); + result = result * PRIME + ($email == null ? 43 : $email.hashCode()); + final Object $emailScope = this.getEmailScope(); + result = result * PRIME + ($emailScope == null ? 43 : $emailScope.hashCode()); + final Object $address = this.getAddress(); + result = result * PRIME + ($address == null ? 43 : $address.hashCode()); + final Object $addressScope = this.getAddressScope(); + result = result * PRIME + ($addressScope == null ? 43 : $addressScope.hashCode()); + final Object $twitter = this.getTwitter(); + result = result * PRIME + ($twitter == null ? 43 : $twitter.hashCode()); + final Object $twitterScope = this.getTwitterScope(); + result = result * PRIME + ($twitterScope == null ? 43 : $twitterScope.hashCode()); + final Object $website = this.getWebsite(); + result = result * PRIME + ($website == null ? 43 : $website.hashCode()); + final Object $websiteScope = this.getWebsiteScope(); + result = result * PRIME + ($websiteScope == null ? 43 : $websiteScope.hashCode()); + return result; + } + + public String toString() { + return "UserProfileData(displayName=" + this.getDisplayName() + ", displayNameScope=" + this.getDisplayNameScope() + ", displayNameAlt=" + this.getDisplayNameAlt() + ", userId=" + this.getUserId() + ", phone=" + this.getPhone() + ", phoneScope=" + this.getPhoneScope() + ", email=" + this.getEmail() + ", emailScope=" + this.getEmailScope() + ", address=" + this.getAddress() + ", addressScope=" + this.getAddressScope() + ", twitter=" + this.getTwitter() + ", twitterScope=" + this.getTwitterScope() + ", website=" + this.getWebsite() + ", websiteScope=" + this.getWebsiteScope() + ")"; + } } 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 26e60ee5c..cdf146b7c 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 @@ -28,14 +28,58 @@ import org.parceler.Parcel; import java.util.ArrayList; -import lombok.Data; -import lombok.EqualsAndHashCode; - -@EqualsAndHashCode(callSuper = true) @Parcel -@Data @JsonObject public class UserProfileFieldsOCS extends GenericOCS { @JsonField(name = "data") ArrayList data; + + public UserProfileFieldsOCS() { + } + + public ArrayList getData() { + return this.data; + } + + public void setData(ArrayList data) { + this.data = data; + } + + public String toString() { + return "UserProfileFieldsOCS(data=" + this.getData() + ")"; + } + + public boolean equals(final Object o) { + if (o == this) { + return true; + } + if (!(o instanceof UserProfileFieldsOCS)) { + return false; + } + final UserProfileFieldsOCS other = (UserProfileFieldsOCS) o; + if (!other.canEqual((Object) this)) { + return false; + } + if (!super.equals(o)) { + return false; + } + 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; + } + + protected boolean canEqual(final Object other) { + return other instanceof UserProfileFieldsOCS; + } + + public int hashCode() { + final int PRIME = 59; + int result = super.hashCode(); + final Object $data = this.getData(); + result = result * PRIME + ($data == null ? 43 : $data.hashCode()); + return result; + } } 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 0d0861856..c48b42a1c 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 @@ -25,12 +25,55 @@ import com.bluelinelabs.logansquare.annotation.JsonObject; import org.parceler.Parcel; -import lombok.Data; - @Parcel -@Data @JsonObject public class UserProfileFieldsOverall { @JsonField(name = "ocs") UserProfileFieldsOCS ocs; + + public UserProfileFieldsOverall() { + } + + public UserProfileFieldsOCS getOcs() { + return this.ocs; + } + + public void setOcs(UserProfileFieldsOCS ocs) { + this.ocs = ocs; + } + + public boolean equals(final Object o) { + if (o == this) { + return true; + } + if (!(o instanceof UserProfileFieldsOverall)) { + return false; + } + final UserProfileFieldsOverall other = (UserProfileFieldsOverall) o; + if (!other.canEqual((Object) this)) { + return false; + } + 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; + } + + protected boolean canEqual(final Object other) { + return other instanceof UserProfileFieldsOverall; + } + + public int hashCode() { + final int PRIME = 59; + int result = 1; + final Object $ocs = this.getOcs(); + result = result * PRIME + ($ocs == null ? 43 : $ocs.hashCode()); + return result; + } + + public String toString() { + return "UserProfileFieldsOverall(ocs=" + this.getOcs() + ")"; + } } 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 ca58bcd09..c8704bab3 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 @@ -23,13 +23,58 @@ package com.nextcloud.talk.models.json.userprofile; import com.bluelinelabs.logansquare.annotation.JsonField; import com.bluelinelabs.logansquare.annotation.JsonObject; import com.nextcloud.talk.models.json.generic.GenericOCS; -import lombok.Data; + import org.parceler.Parcel; @Parcel -@Data @JsonObject public class UserProfileOCS extends GenericOCS { @JsonField(name = "data") UserProfileData data; + + public UserProfileOCS() { + } + + public UserProfileData getData() { + return this.data; + } + + public void setData(UserProfileData data) { + this.data = data; + } + + public boolean equals(final Object o) { + if (o == this) { + return true; + } + if (!(o instanceof UserProfileOCS)) { + return false; + } + final UserProfileOCS other = (UserProfileOCS) o; + if (!other.canEqual((Object) this)) { + return false; + } + 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; + } + + protected boolean canEqual(final Object other) { + return other instanceof UserProfileOCS; + } + + public int hashCode() { + final int PRIME = 59; + int result = 1; + final Object $data = this.getData(); + result = result * PRIME + ($data == null ? 43 : $data.hashCode()); + return result; + } + + public String toString() { + return "UserProfileOCS(data=" + this.getData() + ")"; + } } 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 4edd9c531..c2e5d7e12 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 @@ -22,13 +22,58 @@ package com.nextcloud.talk.models.json.userprofile; import com.bluelinelabs.logansquare.annotation.JsonField; import com.bluelinelabs.logansquare.annotation.JsonObject; -import lombok.Data; + import org.parceler.Parcel; @Parcel -@Data @JsonObject public class UserProfileOverall { @JsonField(name = "ocs") UserProfileOCS ocs; + + public UserProfileOverall() { + } + + public UserProfileOCS getOcs() { + return this.ocs; + } + + public void setOcs(UserProfileOCS ocs) { + this.ocs = ocs; + } + + public boolean equals(final Object o) { + if (o == this) { + return true; + } + if (!(o instanceof UserProfileOverall)) { + return false; + } + final UserProfileOverall other = (UserProfileOverall) o; + if (!other.canEqual((Object) this)) { + return false; + } + 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; + } + + protected boolean canEqual(final Object other) { + return other instanceof UserProfileOverall; + } + + public int hashCode() { + final int PRIME = 59; + int result = 1; + final Object $ocs = this.getOcs(); + result = result * PRIME + ($ocs == null ? 43 : $ocs.hashCode()); + return result; + } + + public String toString() { + return "UserProfileOverall(ocs=" + this.getOcs() + ")"; + } } 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 2784f98fb..5cdb81fc3 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 @@ -22,10 +22,9 @@ package com.nextcloud.talk.models.json.websocket; import com.bluelinelabs.logansquare.annotation.JsonField; import com.bluelinelabs.logansquare.annotation.JsonObject; -import lombok.Data; + import org.parceler.Parcel; -@Data @JsonObject @Parcel public class ActorWebSocketMessage { @@ -37,4 +36,80 @@ public class ActorWebSocketMessage { @JsonField(name = "userid") String userid; + + public ActorWebSocketMessage() { + } + + public String getType() { + return this.type; + } + + public String getSessionId() { + return this.sessionId; + } + + public String getUserid() { + return this.userid; + } + + public void setType(String type) { + this.type = type; + } + + public void setSessionId(String sessionId) { + this.sessionId = sessionId; + } + + public void setUserid(String userid) { + this.userid = userid; + } + + public boolean equals(final Object o) { + if (o == this) { + return true; + } + if (!(o instanceof ActorWebSocketMessage)) { + return false; + } + final ActorWebSocketMessage other = (ActorWebSocketMessage) o; + if (!other.canEqual((Object) this)) { + return false; + } + 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; + } + 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; + } + 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; + } + + protected boolean canEqual(final Object other) { + return other instanceof ActorWebSocketMessage; + } + + public int hashCode() { + final int PRIME = 59; + int result = 1; + final Object $type = this.getType(); + result = result * PRIME + ($type == null ? 43 : $type.hashCode()); + final Object $sessionId = this.getSessionId(); + result = result * PRIME + ($sessionId == null ? 43 : $sessionId.hashCode()); + final Object $userid = this.getUserid(); + result = result * PRIME + ($userid == null ? 43 : $userid.hashCode()); + return result; + } + + public String toString() { + return "ActorWebSocketMessage(type=" + this.getType() + ", sessionId=" + this.getSessionId() + ", userid=" + this.getUserid() + ")"; + } } 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 cdf53b8c5..436eb4660 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 @@ -22,10 +22,9 @@ package com.nextcloud.talk.models.json.websocket; import com.bluelinelabs.logansquare.annotation.JsonField; import com.bluelinelabs.logansquare.annotation.JsonObject; -import lombok.Data; + import org.parceler.Parcel; -@Data @JsonObject @Parcel public class AuthParametersWebSocketMessage { @@ -34,4 +33,65 @@ public class AuthParametersWebSocketMessage { @JsonField(name = "ticket") String ticket; + + public AuthParametersWebSocketMessage() { + } + + public String getUserid() { + return this.userid; + } + + public String getTicket() { + return this.ticket; + } + + public void setUserid(String userid) { + this.userid = userid; + } + + public void setTicket(String ticket) { + this.ticket = ticket; + } + + public boolean equals(final Object o) { + if (o == this) { + return true; + } + if (!(o instanceof AuthParametersWebSocketMessage)) { + return false; + } + final AuthParametersWebSocketMessage other = (AuthParametersWebSocketMessage) o; + if (!other.canEqual((Object) this)) { + return false; + } + 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; + } + 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; + } + + protected boolean canEqual(final Object other) { + return other instanceof AuthParametersWebSocketMessage; + } + + public int hashCode() { + final int PRIME = 59; + int result = 1; + final Object $userid = this.getUserid(); + result = result * PRIME + ($userid == null ? 43 : $userid.hashCode()); + final Object $ticket = this.getTicket(); + result = result * PRIME + ($ticket == null ? 43 : $ticket.hashCode()); + return result; + } + + public String toString() { + return "AuthParametersWebSocketMessage(userid=" + this.getUserid() + ", ticket=" + this.getTicket() + ")"; + } } 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 578e68d38..e1c159012 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 @@ -22,10 +22,9 @@ package com.nextcloud.talk.models.json.websocket; import com.bluelinelabs.logansquare.annotation.JsonField; import com.bluelinelabs.logansquare.annotation.JsonObject; -import lombok.Data; + import org.parceler.Parcel; -@Data @JsonObject @Parcel public class AuthWebSocketMessage { @@ -34,4 +33,65 @@ public class AuthWebSocketMessage { @JsonField(name = "params") AuthParametersWebSocketMessage authParametersWebSocketMessage; + + public AuthWebSocketMessage() { + } + + public String getUrl() { + return this.url; + } + + public AuthParametersWebSocketMessage getAuthParametersWebSocketMessage() { + return this.authParametersWebSocketMessage; + } + + public void setUrl(String url) { + this.url = url; + } + + public void setAuthParametersWebSocketMessage(AuthParametersWebSocketMessage authParametersWebSocketMessage) { + this.authParametersWebSocketMessage = authParametersWebSocketMessage; + } + + public boolean equals(final Object o) { + if (o == this) { + return true; + } + if (!(o instanceof AuthWebSocketMessage)) { + return false; + } + final AuthWebSocketMessage other = (AuthWebSocketMessage) o; + if (!other.canEqual((Object) this)) { + return false; + } + final Object this$url = this.getUrl(); + final Object other$url = other.getUrl(); + if (this$url == null ? other$url != null : !this$url.equals(other$url)) { + return false; + } + 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; + } + + protected boolean canEqual(final Object other) { + return other instanceof AuthWebSocketMessage; + } + + public int hashCode() { + final int PRIME = 59; + int result = 1; + final Object $url = this.getUrl(); + result = result * PRIME + ($url == null ? 43 : $url.hashCode()); + final Object $authParametersWebSocketMessage = this.getAuthParametersWebSocketMessage(); + result = result * PRIME + ($authParametersWebSocketMessage == null ? 43 : $authParametersWebSocketMessage.hashCode()); + return result; + } + + public String toString() { + return "AuthWebSocketMessage(url=" + this.getUrl() + ", authParametersWebSocketMessage=" + this.getAuthParametersWebSocketMessage() + ")"; + } } 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 b950d6cba..0cccf715e 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 @@ -22,13 +22,58 @@ package com.nextcloud.talk.models.json.websocket; import com.bluelinelabs.logansquare.annotation.JsonField; import com.bluelinelabs.logansquare.annotation.JsonObject; -import lombok.Data; + import org.parceler.Parcel; -@Data @JsonObject @Parcel public class BaseWebSocketMessage { @JsonField(name = "type") String type; + + public BaseWebSocketMessage() { + } + + public String getType() { + return this.type; + } + + public void setType(String type) { + this.type = type; + } + + public boolean equals(final Object o) { + if (o == this) { + return true; + } + if (!(o instanceof BaseWebSocketMessage)) { + return false; + } + final BaseWebSocketMessage other = (BaseWebSocketMessage) o; + if (!other.canEqual((Object) this)) { + return false; + } + 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; + } + + protected boolean canEqual(final Object other) { + return other instanceof BaseWebSocketMessage; + } + + public int hashCode() { + final int PRIME = 59; + int result = 1; + final Object $type = this.getType(); + result = result * PRIME + ($type == null ? 43 : $type.hashCode()); + return result; + } + + public String toString() { + return "BaseWebSocketMessage(type=" + this.getType() + ")"; + } } 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 57f5ccee5..18e8b7273 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 @@ -22,15 +22,60 @@ package com.nextcloud.talk.models.json.websocket; import com.bluelinelabs.logansquare.annotation.JsonField; import com.bluelinelabs.logansquare.annotation.JsonObject; -import lombok.Data; + import org.parceler.Parcel; import java.util.HashMap; @JsonObject @Parcel -@Data public class ByeWebSocketMessage extends BaseWebSocketMessage { @JsonField(name = "bye") HashMap bye; + + public ByeWebSocketMessage() { + } + + public HashMap getBye() { + return this.bye; + } + + public void setBye(HashMap bye) { + this.bye = bye; + } + + public boolean equals(final Object o) { + if (o == this) { + return true; + } + if (!(o instanceof ByeWebSocketMessage)) { + return false; + } + final ByeWebSocketMessage other = (ByeWebSocketMessage) o; + if (!other.canEqual((Object) this)) { + return false; + } + 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; + } + + protected boolean canEqual(final Object other) { + return other instanceof ByeWebSocketMessage; + } + + public int hashCode() { + final int PRIME = 59; + int result = 1; + final Object $bye = this.getBye(); + result = result * PRIME + ($bye == null ? 43 : $bye.hashCode()); + return result; + } + + public String toString() { + return "ByeWebSocketMessage(bye=" + this.getBye() + ")"; + } } 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 39b887b80..70ed9595d 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 @@ -22,13 +22,58 @@ package com.nextcloud.talk.models.json.websocket; import com.bluelinelabs.logansquare.annotation.JsonField; import com.bluelinelabs.logansquare.annotation.JsonObject; -import lombok.Data; + import org.parceler.Parcel; -@Data @JsonObject @Parcel public class CallOverallWebSocketMessage extends BaseWebSocketMessage { @JsonField(name = "message") CallWebSocketMessage callWebSocketMessage; + + public CallOverallWebSocketMessage() { + } + + public CallWebSocketMessage getCallWebSocketMessage() { + return this.callWebSocketMessage; + } + + public void setCallWebSocketMessage(CallWebSocketMessage callWebSocketMessage) { + this.callWebSocketMessage = callWebSocketMessage; + } + + public boolean equals(final Object o) { + if (o == this) { + return true; + } + if (!(o instanceof CallOverallWebSocketMessage)) { + return false; + } + final CallOverallWebSocketMessage other = (CallOverallWebSocketMessage) o; + if (!other.canEqual((Object) this)) { + return false; + } + 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; + } + + protected boolean canEqual(final Object other) { + return other instanceof CallOverallWebSocketMessage; + } + + public int hashCode() { + final int PRIME = 59; + int result = 1; + final Object $callWebSocketMessage = this.getCallWebSocketMessage(); + result = result * PRIME + ($callWebSocketMessage == null ? 43 : $callWebSocketMessage.hashCode()); + return result; + } + + public String toString() { + return "CallOverallWebSocketMessage(callWebSocketMessage=" + this.getCallWebSocketMessage() + ")"; + } } 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 7ff5d9880..47a4262fa 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 @@ -23,10 +23,9 @@ package com.nextcloud.talk.models.json.websocket; import com.bluelinelabs.logansquare.annotation.JsonField; import com.bluelinelabs.logansquare.annotation.JsonObject; import com.nextcloud.talk.models.json.signaling.NCSignalingMessage; -import lombok.Data; + import org.parceler.Parcel; -@Data @JsonObject @Parcel public class CallWebSocketMessage { @@ -38,4 +37,80 @@ public class CallWebSocketMessage { @JsonField(name = "data") NCSignalingMessage ncSignalingMessage; + + public CallWebSocketMessage() { + } + + public ActorWebSocketMessage getRecipientWebSocketMessage() { + return this.recipientWebSocketMessage; + } + + public ActorWebSocketMessage getSenderWebSocketMessage() { + return this.senderWebSocketMessage; + } + + public NCSignalingMessage getNcSignalingMessage() { + return this.ncSignalingMessage; + } + + public void setRecipientWebSocketMessage(ActorWebSocketMessage recipientWebSocketMessage) { + this.recipientWebSocketMessage = recipientWebSocketMessage; + } + + public void setSenderWebSocketMessage(ActorWebSocketMessage senderWebSocketMessage) { + this.senderWebSocketMessage = senderWebSocketMessage; + } + + public void setNcSignalingMessage(NCSignalingMessage ncSignalingMessage) { + this.ncSignalingMessage = ncSignalingMessage; + } + + public boolean equals(final Object o) { + if (o == this) { + return true; + } + if (!(o instanceof CallWebSocketMessage)) { + return false; + } + final CallWebSocketMessage other = (CallWebSocketMessage) o; + if (!other.canEqual((Object) this)) { + return false; + } + final Object this$recipientWebSocketMessage = this.getRecipientWebSocketMessage(); + final Object other$recipientWebSocketMessage = other.getRecipientWebSocketMessage(); + if (this$recipientWebSocketMessage == null ? other$recipientWebSocketMessage != null : !this$recipientWebSocketMessage.equals(other$recipientWebSocketMessage)) { + return false; + } + final Object this$senderWebSocketMessage = this.getSenderWebSocketMessage(); + final Object other$senderWebSocketMessage = other.getSenderWebSocketMessage(); + if (this$senderWebSocketMessage == null ? other$senderWebSocketMessage != null : !this$senderWebSocketMessage.equals(other$senderWebSocketMessage)) { + return false; + } + 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; + } + + protected boolean canEqual(final Object other) { + return other instanceof CallWebSocketMessage; + } + + public int hashCode() { + final int PRIME = 59; + int result = 1; + final Object $recipientWebSocketMessage = this.getRecipientWebSocketMessage(); + result = result * PRIME + ($recipientWebSocketMessage == null ? 43 : $recipientWebSocketMessage.hashCode()); + final Object $senderWebSocketMessage = this.getSenderWebSocketMessage(); + result = result * PRIME + ($senderWebSocketMessage == null ? 43 : $senderWebSocketMessage.hashCode()); + final Object $ncSignalingMessage = this.getNcSignalingMessage(); + result = result * PRIME + ($ncSignalingMessage == null ? 43 : $ncSignalingMessage.hashCode()); + return result; + } + + public String toString() { + return "CallWebSocketMessage(recipientWebSocketMessage=" + this.getRecipientWebSocketMessage() + ", senderWebSocketMessage=" + this.getSenderWebSocketMessage() + ", ncSignalingMessage=" + this.getNcSignalingMessage() + ")"; + } } 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 0d8fee0ad..d4f1f1a45 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 @@ -22,13 +22,58 @@ package com.nextcloud.talk.models.json.websocket; import com.bluelinelabs.logansquare.annotation.JsonField; import com.bluelinelabs.logansquare.annotation.JsonObject; -import lombok.Data; + import org.parceler.Parcel; -@Data @Parcel @JsonObject public class ErrorOverallWebSocketMessage extends BaseWebSocketMessage { @JsonField(name = "error") ErrorWebSocketMessage errorWebSocketMessage; + + public ErrorOverallWebSocketMessage() { + } + + public ErrorWebSocketMessage getErrorWebSocketMessage() { + return this.errorWebSocketMessage; + } + + public void setErrorWebSocketMessage(ErrorWebSocketMessage errorWebSocketMessage) { + this.errorWebSocketMessage = errorWebSocketMessage; + } + + public boolean equals(final Object o) { + if (o == this) { + return true; + } + if (!(o instanceof ErrorOverallWebSocketMessage)) { + return false; + } + final ErrorOverallWebSocketMessage other = (ErrorOverallWebSocketMessage) o; + if (!other.canEqual((Object) this)) { + return false; + } + 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; + } + + protected boolean canEqual(final Object other) { + return other instanceof ErrorOverallWebSocketMessage; + } + + public int hashCode() { + final int PRIME = 59; + int result = 1; + final Object $errorWebSocketMessage = this.getErrorWebSocketMessage(); + result = result * PRIME + ($errorWebSocketMessage == null ? 43 : $errorWebSocketMessage.hashCode()); + return result; + } + + public String toString() { + return "ErrorOverallWebSocketMessage(errorWebSocketMessage=" + this.getErrorWebSocketMessage() + ")"; + } } 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 14c11b9e8..7cd2f215c 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 @@ -22,10 +22,9 @@ package com.nextcloud.talk.models.json.websocket; import com.bluelinelabs.logansquare.annotation.JsonField; import com.bluelinelabs.logansquare.annotation.JsonObject; -import lombok.Data; + import org.parceler.Parcel; -@Data @Parcel @JsonObject public class ErrorWebSocketMessage { @@ -34,4 +33,65 @@ public class ErrorWebSocketMessage { @JsonField(name = "message") String message; + + public ErrorWebSocketMessage() { + } + + public String getCode() { + return this.code; + } + + public String getMessage() { + return this.message; + } + + public void setCode(String code) { + this.code = code; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean equals(final Object o) { + if (o == this) { + return true; + } + if (!(o instanceof ErrorWebSocketMessage)) { + return false; + } + final ErrorWebSocketMessage other = (ErrorWebSocketMessage) o; + if (!other.canEqual((Object) this)) { + return false; + } + final Object this$code = this.getCode(); + final Object other$code = other.getCode(); + if (this$code == null ? other$code != null : !this$code.equals(other$code)) { + return false; + } + 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; + } + + protected boolean canEqual(final Object other) { + return other instanceof ErrorWebSocketMessage; + } + + public int hashCode() { + final int PRIME = 59; + int result = 1; + final Object $code = this.getCode(); + result = result * PRIME + ($code == null ? 43 : $code.hashCode()); + final Object $message = this.getMessage(); + result = result * PRIME + ($message == null ? 43 : $message.hashCode()); + return result; + } + + public String toString() { + return "ErrorWebSocketMessage(code=" + this.getCode() + ", message=" + this.getMessage() + ")"; + } } 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 c131fce6c..8a7bbc1af 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 @@ -22,12 +22,11 @@ package com.nextcloud.talk.models.json.websocket; import com.bluelinelabs.logansquare.annotation.JsonField; import com.bluelinelabs.logansquare.annotation.JsonObject; -import lombok.Data; + import org.parceler.Parcel; import java.util.HashMap; -@Data @Parcel @JsonObject public class EventOverallWebSocketMessage extends BaseWebSocketMessage { @@ -35,4 +34,65 @@ public class EventOverallWebSocketMessage extends BaseWebSocketMessage { String type; @JsonField(name = "event") HashMap eventMap; + + public EventOverallWebSocketMessage() { + } + + public String getType() { + return this.type; + } + + public HashMap getEventMap() { + return this.eventMap; + } + + public void setType(String type) { + this.type = type; + } + + public void setEventMap(HashMap eventMap) { + this.eventMap = eventMap; + } + + public boolean equals(final Object o) { + if (o == this) { + return true; + } + if (!(o instanceof EventOverallWebSocketMessage)) { + return false; + } + final EventOverallWebSocketMessage other = (EventOverallWebSocketMessage) o; + if (!other.canEqual((Object) this)) { + return false; + } + 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; + } + 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; + } + + protected boolean canEqual(final Object other) { + return other instanceof EventOverallWebSocketMessage; + } + + public int hashCode() { + final int PRIME = 59; + int result = 1; + final Object $type = this.getType(); + result = result * PRIME + ($type == null ? 43 : $type.hashCode()); + final Object $eventMap = this.getEventMap(); + result = result * PRIME + ($eventMap == null ? 43 : $eventMap.hashCode()); + return result; + } + + public String toString() { + return "EventOverallWebSocketMessage(type=" + this.getType() + ", eventMap=" + this.getEventMap() + ")"; + } } 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 f5d9a40fb..e0f1f2292 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 @@ -22,13 +22,58 @@ package com.nextcloud.talk.models.json.websocket; import com.bluelinelabs.logansquare.annotation.JsonField; import com.bluelinelabs.logansquare.annotation.JsonObject; -import lombok.Data; + import org.parceler.Parcel; -@Data @JsonObject @Parcel public class HelloOverallWebSocketMessage extends BaseWebSocketMessage { @JsonField(name = "hello") HelloWebSocketMessage helloWebSocketMessage; + + public HelloOverallWebSocketMessage() { + } + + public HelloWebSocketMessage getHelloWebSocketMessage() { + return this.helloWebSocketMessage; + } + + public void setHelloWebSocketMessage(HelloWebSocketMessage helloWebSocketMessage) { + this.helloWebSocketMessage = helloWebSocketMessage; + } + + public boolean equals(final Object o) { + if (o == this) { + return true; + } + if (!(o instanceof HelloOverallWebSocketMessage)) { + return false; + } + final HelloOverallWebSocketMessage other = (HelloOverallWebSocketMessage) o; + if (!other.canEqual((Object) this)) { + return false; + } + 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; + } + + protected boolean canEqual(final Object other) { + return other instanceof HelloOverallWebSocketMessage; + } + + public int hashCode() { + final int PRIME = 59; + int result = 1; + final Object $helloWebSocketMessage = this.getHelloWebSocketMessage(); + result = result * PRIME + ($helloWebSocketMessage == null ? 43 : $helloWebSocketMessage.hashCode()); + return result; + } + + public String toString() { + return "HelloOverallWebSocketMessage(helloWebSocketMessage=" + this.getHelloWebSocketMessage() + ")"; + } } 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 aabf0aab7..cb6d1d2d1 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 @@ -22,13 +22,58 @@ package com.nextcloud.talk.models.json.websocket; import com.bluelinelabs.logansquare.annotation.JsonField; import com.bluelinelabs.logansquare.annotation.JsonObject; -import lombok.Data; + import org.parceler.Parcel; -@Data @JsonObject @Parcel public class HelloResponseOverallWebSocketMessage extends BaseWebSocketMessage { @JsonField(name = "hello") HelloResponseWebSocketMessage helloResponseWebSocketMessage; + + public HelloResponseOverallWebSocketMessage() { + } + + public HelloResponseWebSocketMessage getHelloResponseWebSocketMessage() { + return this.helloResponseWebSocketMessage; + } + + public void setHelloResponseWebSocketMessage(HelloResponseWebSocketMessage helloResponseWebSocketMessage) { + this.helloResponseWebSocketMessage = helloResponseWebSocketMessage; + } + + public boolean equals(final Object o) { + if (o == this) { + return true; + } + if (!(o instanceof HelloResponseOverallWebSocketMessage)) { + return false; + } + final HelloResponseOverallWebSocketMessage other = (HelloResponseOverallWebSocketMessage) o; + if (!other.canEqual((Object) this)) { + return false; + } + 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; + } + + protected boolean canEqual(final Object other) { + return other instanceof HelloResponseOverallWebSocketMessage; + } + + public int hashCode() { + final int PRIME = 59; + int result = 1; + final Object $helloResponseWebSocketMessage = this.getHelloResponseWebSocketMessage(); + result = result * PRIME + ($helloResponseWebSocketMessage == null ? 43 : $helloResponseWebSocketMessage.hashCode()); + return result; + } + + public String toString() { + return "HelloResponseOverallWebSocketMessage(helloResponseWebSocketMessage=" + this.getHelloResponseWebSocketMessage() + ")"; + } } 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 2ea35db88..71403a865 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 @@ -22,10 +22,9 @@ package com.nextcloud.talk.models.json.websocket; import com.bluelinelabs.logansquare.annotation.JsonField; import com.bluelinelabs.logansquare.annotation.JsonObject; -import lombok.Data; + import org.parceler.Parcel; -@Data @JsonObject @Parcel public class HelloResponseWebSocketMessage { @@ -38,8 +37,84 @@ public class HelloResponseWebSocketMessage { @JsonField(name = "server") ServerHelloResponseFeaturesWebSocketMessage serverHelloResponseFeaturesWebSocketMessage; + public HelloResponseWebSocketMessage() { + } + public boolean serverHasMCUSupport() { return serverHelloResponseFeaturesWebSocketMessage != null && serverHelloResponseFeaturesWebSocketMessage.getFeatures() != null && serverHelloResponseFeaturesWebSocketMessage.getFeatures().contains("mcu"); } + + public String getResumeId() { + return this.resumeId; + } + + public String getSessionId() { + return this.sessionId; + } + + public ServerHelloResponseFeaturesWebSocketMessage getServerHelloResponseFeaturesWebSocketMessage() { + return this.serverHelloResponseFeaturesWebSocketMessage; + } + + public void setResumeId(String resumeId) { + this.resumeId = resumeId; + } + + public void setSessionId(String sessionId) { + this.sessionId = sessionId; + } + + public void setServerHelloResponseFeaturesWebSocketMessage(ServerHelloResponseFeaturesWebSocketMessage serverHelloResponseFeaturesWebSocketMessage) { + this.serverHelloResponseFeaturesWebSocketMessage = serverHelloResponseFeaturesWebSocketMessage; + } + + public boolean equals(final Object o) { + if (o == this) { + return true; + } + if (!(o instanceof HelloResponseWebSocketMessage)) { + return false; + } + final HelloResponseWebSocketMessage other = (HelloResponseWebSocketMessage) o; + if (!other.canEqual((Object) this)) { + return false; + } + final Object this$resumeId = this.getResumeId(); + final Object other$resumeId = other.getResumeId(); + if (this$resumeId == null ? other$resumeId != null : !this$resumeId.equals(other$resumeId)) { + return false; + } + 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; + } + 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; + } + + protected boolean canEqual(final Object other) { + return other instanceof HelloResponseWebSocketMessage; + } + + public int hashCode() { + final int PRIME = 59; + int result = 1; + final Object $resumeId = this.getResumeId(); + result = result * PRIME + ($resumeId == null ? 43 : $resumeId.hashCode()); + final Object $sessionId = this.getSessionId(); + result = result * PRIME + ($sessionId == null ? 43 : $sessionId.hashCode()); + final Object $serverHelloResponseFeaturesWebSocketMessage = this.getServerHelloResponseFeaturesWebSocketMessage(); + result = result * PRIME + ($serverHelloResponseFeaturesWebSocketMessage == null ? 43 : $serverHelloResponseFeaturesWebSocketMessage.hashCode()); + return result; + } + + public String toString() { + return "HelloResponseWebSocketMessage(resumeId=" + this.getResumeId() + ", sessionId=" + this.getSessionId() + ", serverHelloResponseFeaturesWebSocketMessage=" + this.getServerHelloResponseFeaturesWebSocketMessage() + ")"; + } } 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 1d4f2ebca..df5f018ae 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 @@ -22,10 +22,9 @@ package com.nextcloud.talk.models.json.websocket; import com.bluelinelabs.logansquare.annotation.JsonField; import com.bluelinelabs.logansquare.annotation.JsonObject; -import lombok.Data; + import org.parceler.Parcel; -@Data @JsonObject @Parcel public class HelloWebSocketMessage { @@ -37,4 +36,80 @@ public class HelloWebSocketMessage { @JsonField(name = "auth") AuthWebSocketMessage authWebSocketMessage; + + public HelloWebSocketMessage() { + } + + public String getVersion() { + return this.version; + } + + public String getResumeid() { + return this.resumeid; + } + + public AuthWebSocketMessage getAuthWebSocketMessage() { + return this.authWebSocketMessage; + } + + public void setVersion(String version) { + this.version = version; + } + + public void setResumeid(String resumeid) { + this.resumeid = resumeid; + } + + public void setAuthWebSocketMessage(AuthWebSocketMessage authWebSocketMessage) { + this.authWebSocketMessage = authWebSocketMessage; + } + + public boolean equals(final Object o) { + if (o == this) { + return true; + } + if (!(o instanceof HelloWebSocketMessage)) { + return false; + } + final HelloWebSocketMessage other = (HelloWebSocketMessage) o; + if (!other.canEqual((Object) this)) { + return false; + } + final Object this$version = this.getVersion(); + final Object other$version = other.getVersion(); + if (this$version == null ? other$version != null : !this$version.equals(other$version)) { + return false; + } + final Object this$resumeid = this.getResumeid(); + final Object other$resumeid = other.getResumeid(); + if (this$resumeid == null ? other$resumeid != null : !this$resumeid.equals(other$resumeid)) { + return false; + } + 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; + } + + protected boolean canEqual(final Object other) { + return other instanceof HelloWebSocketMessage; + } + + public int hashCode() { + final int PRIME = 59; + int result = 1; + final Object $version = this.getVersion(); + result = result * PRIME + ($version == null ? 43 : $version.hashCode()); + final Object $resumeid = this.getResumeid(); + result = result * PRIME + ($resumeid == null ? 43 : $resumeid.hashCode()); + final Object $authWebSocketMessage = this.getAuthWebSocketMessage(); + result = result * PRIME + ($authWebSocketMessage == null ? 43 : $authWebSocketMessage.hashCode()); + return result; + } + + public String toString() { + return "HelloWebSocketMessage(version=" + this.getVersion() + ", resumeid=" + this.getResumeid() + ", authWebSocketMessage=" + this.getAuthWebSocketMessage() + ")"; + } } 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 cebdc2af7..2d260567b 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 @@ -22,13 +22,58 @@ package com.nextcloud.talk.models.json.websocket; import com.bluelinelabs.logansquare.annotation.JsonField; import com.bluelinelabs.logansquare.annotation.JsonObject; -import lombok.Data; + import org.parceler.Parcel; -@Data @JsonObject @Parcel public class JoinedRoomOverallWebSocketMessage extends BaseWebSocketMessage { @JsonField(name = "room") RoomWebSocketMessage roomWebSocketMessage; + + public JoinedRoomOverallWebSocketMessage() { + } + + public RoomWebSocketMessage getRoomWebSocketMessage() { + return this.roomWebSocketMessage; + } + + public void setRoomWebSocketMessage(RoomWebSocketMessage roomWebSocketMessage) { + this.roomWebSocketMessage = roomWebSocketMessage; + } + + public boolean equals(final Object o) { + if (o == this) { + return true; + } + if (!(o instanceof JoinedRoomOverallWebSocketMessage)) { + return false; + } + final JoinedRoomOverallWebSocketMessage other = (JoinedRoomOverallWebSocketMessage) o; + if (!other.canEqual((Object) this)) { + return false; + } + 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; + } + + protected boolean canEqual(final Object other) { + return other instanceof JoinedRoomOverallWebSocketMessage; + } + + public int hashCode() { + final int PRIME = 59; + int result = 1; + final Object $roomWebSocketMessage = this.getRoomWebSocketMessage(); + result = result * PRIME + ($roomWebSocketMessage == null ? 43 : $roomWebSocketMessage.hashCode()); + return result; + } + + public String toString() { + return "JoinedRoomOverallWebSocketMessage(roomWebSocketMessage=" + this.getRoomWebSocketMessage() + ")"; + } } 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 aed7d2a95..656155503 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 @@ -22,13 +22,58 @@ package com.nextcloud.talk.models.json.websocket; import com.bluelinelabs.logansquare.annotation.JsonField; import com.bluelinelabs.logansquare.annotation.JsonObject; -import lombok.Data; + import org.parceler.Parcel; -@Data @JsonObject @Parcel public class RequestOfferOverallWebSocketMessage extends BaseWebSocketMessage { @JsonField(name = "message") RequestOfferSignalingMessage requestOfferOverallWebSocketMessage; + + public RequestOfferOverallWebSocketMessage() { + } + + public RequestOfferSignalingMessage getRequestOfferOverallWebSocketMessage() { + return this.requestOfferOverallWebSocketMessage; + } + + public void setRequestOfferOverallWebSocketMessage(RequestOfferSignalingMessage requestOfferOverallWebSocketMessage) { + this.requestOfferOverallWebSocketMessage = requestOfferOverallWebSocketMessage; + } + + public boolean equals(final Object o) { + if (o == this) { + return true; + } + if (!(o instanceof RequestOfferOverallWebSocketMessage)) { + return false; + } + final RequestOfferOverallWebSocketMessage other = (RequestOfferOverallWebSocketMessage) o; + if (!other.canEqual((Object) this)) { + return false; + } + 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; + } + + protected boolean canEqual(final Object other) { + return other instanceof RequestOfferOverallWebSocketMessage; + } + + public int hashCode() { + final int PRIME = 59; + int result = 1; + final Object $requestOfferOverallWebSocketMessage = this.getRequestOfferOverallWebSocketMessage(); + result = result * PRIME + ($requestOfferOverallWebSocketMessage == null ? 43 : $requestOfferOverallWebSocketMessage.hashCode()); + return result; + } + + public String toString() { + return "RequestOfferOverallWebSocketMessage(requestOfferOverallWebSocketMessage=" + this.getRequestOfferOverallWebSocketMessage() + ")"; + } } 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 2aeddb94e..147d471e0 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 @@ -22,10 +22,9 @@ package com.nextcloud.talk.models.json.websocket; import com.bluelinelabs.logansquare.annotation.JsonField; import com.bluelinelabs.logansquare.annotation.JsonObject; -import lombok.Data; + import org.parceler.Parcel; -@Data @JsonObject @Parcel public class RequestOfferSignalingMessage { @@ -34,4 +33,65 @@ public class RequestOfferSignalingMessage { @JsonField(name = "data") SignalingDataWebSocketMessageForOffer signalingDataWebSocketMessageForOffer; + + public RequestOfferSignalingMessage() { + } + + public ActorWebSocketMessage getActorWebSocketMessage() { + return this.actorWebSocketMessage; + } + + public SignalingDataWebSocketMessageForOffer getSignalingDataWebSocketMessageForOffer() { + return this.signalingDataWebSocketMessageForOffer; + } + + public void setActorWebSocketMessage(ActorWebSocketMessage actorWebSocketMessage) { + this.actorWebSocketMessage = actorWebSocketMessage; + } + + public void setSignalingDataWebSocketMessageForOffer(SignalingDataWebSocketMessageForOffer signalingDataWebSocketMessageForOffer) { + this.signalingDataWebSocketMessageForOffer = signalingDataWebSocketMessageForOffer; + } + + public boolean equals(final Object o) { + if (o == this) { + return true; + } + if (!(o instanceof RequestOfferSignalingMessage)) { + return false; + } + final RequestOfferSignalingMessage other = (RequestOfferSignalingMessage) o; + if (!other.canEqual((Object) this)) { + return false; + } + final Object this$actorWebSocketMessage = this.getActorWebSocketMessage(); + final Object other$actorWebSocketMessage = other.getActorWebSocketMessage(); + if (this$actorWebSocketMessage == null ? other$actorWebSocketMessage != null : !this$actorWebSocketMessage.equals(other$actorWebSocketMessage)) { + return false; + } + 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; + } + + protected boolean canEqual(final Object other) { + return other instanceof RequestOfferSignalingMessage; + } + + public int hashCode() { + final int PRIME = 59; + int result = 1; + final Object $actorWebSocketMessage = this.getActorWebSocketMessage(); + result = result * PRIME + ($actorWebSocketMessage == null ? 43 : $actorWebSocketMessage.hashCode()); + final Object $signalingDataWebSocketMessageForOffer = this.getSignalingDataWebSocketMessageForOffer(); + result = result * PRIME + ($signalingDataWebSocketMessageForOffer == null ? 43 : $signalingDataWebSocketMessageForOffer.hashCode()); + return result; + } + + public String toString() { + return "RequestOfferSignalingMessage(actorWebSocketMessage=" + this.getActorWebSocketMessage() + ", signalingDataWebSocketMessageForOffer=" + this.getSignalingDataWebSocketMessageForOffer() + ")"; + } } 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 0a076ecfb..0048aa182 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 @@ -22,13 +22,58 @@ package com.nextcloud.talk.models.json.websocket; import com.bluelinelabs.logansquare.annotation.JsonField; import com.bluelinelabs.logansquare.annotation.JsonObject; -import lombok.Data; + import org.parceler.Parcel; -@Data @JsonObject @Parcel public class RoomOverallWebSocketMessage extends BaseWebSocketMessage { @JsonField(name = "room") RoomWebSocketMessage roomWebSocketMessage; + + public RoomOverallWebSocketMessage() { + } + + public RoomWebSocketMessage getRoomWebSocketMessage() { + return this.roomWebSocketMessage; + } + + public void setRoomWebSocketMessage(RoomWebSocketMessage roomWebSocketMessage) { + this.roomWebSocketMessage = roomWebSocketMessage; + } + + public boolean equals(final Object o) { + if (o == this) { + return true; + } + if (!(o instanceof RoomOverallWebSocketMessage)) { + return false; + } + final RoomOverallWebSocketMessage other = (RoomOverallWebSocketMessage) o; + if (!other.canEqual((Object) this)) { + return false; + } + 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; + } + + protected boolean canEqual(final Object other) { + return other instanceof RoomOverallWebSocketMessage; + } + + public int hashCode() { + final int PRIME = 59; + int result = 1; + final Object $roomWebSocketMessage = this.getRoomWebSocketMessage(); + result = result * PRIME + ($roomWebSocketMessage == null ? 43 : $roomWebSocketMessage.hashCode()); + return result; + } + + public String toString() { + return "RoomOverallWebSocketMessage(roomWebSocketMessage=" + this.getRoomWebSocketMessage() + ")"; + } } 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 7e4372a11..c31fcad0c 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 @@ -22,12 +22,11 @@ package com.nextcloud.talk.models.json.websocket; import com.bluelinelabs.logansquare.annotation.JsonField; import com.bluelinelabs.logansquare.annotation.JsonObject; -import com.nextcloud.talk.models.json.converters.EnumRoomTypeConverter; import com.nextcloud.talk.models.json.conversations.Conversation; -import lombok.Data; +import com.nextcloud.talk.models.json.converters.EnumRoomTypeConverter; + import org.parceler.Parcel; -@Data @Parcel @JsonObject public class RoomPropertiesWebSocketMessage { @@ -36,4 +35,65 @@ public class RoomPropertiesWebSocketMessage { @JsonField(name = "type", typeConverter = EnumRoomTypeConverter.class) Conversation.ConversationType roomType; + + public RoomPropertiesWebSocketMessage() { + } + + public String getName() { + return this.name; + } + + public Conversation.ConversationType getRoomType() { + return this.roomType; + } + + public void setName(String name) { + this.name = name; + } + + public void setRoomType(Conversation.ConversationType roomType) { + this.roomType = roomType; + } + + public boolean equals(final Object o) { + if (o == this) { + return true; + } + if (!(o instanceof RoomPropertiesWebSocketMessage)) { + return false; + } + final RoomPropertiesWebSocketMessage other = (RoomPropertiesWebSocketMessage) o; + if (!other.canEqual((Object) this)) { + return false; + } + 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; + } + 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; + } + + protected boolean canEqual(final Object other) { + return other instanceof RoomPropertiesWebSocketMessage; + } + + public int hashCode() { + final int PRIME = 59; + int result = 1; + final Object $name = this.getName(); + result = result * PRIME + ($name == null ? 43 : $name.hashCode()); + final Object $roomType = this.getRoomType(); + result = result * PRIME + ($roomType == null ? 43 : $roomType.hashCode()); + return result; + } + + public String toString() { + return "RoomPropertiesWebSocketMessage(name=" + this.getName() + ", roomType=" + this.getRoomType() + ")"; + } } 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 e2b499038..afdde6096 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 @@ -22,10 +22,9 @@ package com.nextcloud.talk.models.json.websocket; import com.bluelinelabs.logansquare.annotation.JsonField; import com.bluelinelabs.logansquare.annotation.JsonObject; -import lombok.Data; + import org.parceler.Parcel; -@Data @JsonObject @Parcel public class RoomWebSocketMessage { @@ -37,4 +36,80 @@ public class RoomWebSocketMessage { @JsonField(name = "properties") RoomPropertiesWebSocketMessage roomPropertiesWebSocketMessage; + + public RoomWebSocketMessage() { + } + + public String getRoomId() { + return this.roomId; + } + + public String getSessiondId() { + return this.sessiondId; + } + + public RoomPropertiesWebSocketMessage getRoomPropertiesWebSocketMessage() { + return this.roomPropertiesWebSocketMessage; + } + + public void setRoomId(String roomId) { + this.roomId = roomId; + } + + public void setSessiondId(String sessiondId) { + this.sessiondId = sessiondId; + } + + public void setRoomPropertiesWebSocketMessage(RoomPropertiesWebSocketMessage roomPropertiesWebSocketMessage) { + this.roomPropertiesWebSocketMessage = roomPropertiesWebSocketMessage; + } + + public boolean equals(final Object o) { + if (o == this) { + return true; + } + if (!(o instanceof RoomWebSocketMessage)) { + return false; + } + final RoomWebSocketMessage other = (RoomWebSocketMessage) o; + if (!other.canEqual((Object) this)) { + return false; + } + final Object this$roomId = this.getRoomId(); + final Object other$roomId = other.getRoomId(); + if (this$roomId == null ? other$roomId != null : !this$roomId.equals(other$roomId)) { + return false; + } + final Object this$sessiondId = this.getSessiondId(); + final Object other$sessiondId = other.getSessiondId(); + if (this$sessiondId == null ? other$sessiondId != null : !this$sessiondId.equals(other$sessiondId)) { + return false; + } + 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; + } + + protected boolean canEqual(final Object other) { + return other instanceof RoomWebSocketMessage; + } + + public int hashCode() { + final int PRIME = 59; + int result = 1; + final Object $roomId = this.getRoomId(); + result = result * PRIME + ($roomId == null ? 43 : $roomId.hashCode()); + final Object $sessiondId = this.getSessiondId(); + result = result * PRIME + ($sessiondId == null ? 43 : $sessiondId.hashCode()); + final Object $roomPropertiesWebSocketMessage = this.getRoomPropertiesWebSocketMessage(); + result = result * PRIME + ($roomPropertiesWebSocketMessage == null ? 43 : $roomPropertiesWebSocketMessage.hashCode()); + return result; + } + + public String toString() { + return "RoomWebSocketMessage(roomId=" + this.getRoomId() + ", sessiondId=" + this.getSessiondId() + ", roomPropertiesWebSocketMessage=" + this.getRoomPropertiesWebSocketMessage() + ")"; + } } 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 7c5927c71..bda8cb677 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 @@ -22,15 +22,60 @@ package com.nextcloud.talk.models.json.websocket; import com.bluelinelabs.logansquare.annotation.JsonField; import com.bluelinelabs.logansquare.annotation.JsonObject; -import lombok.Data; + import org.parceler.Parcel; import java.util.List; @JsonObject @Parcel -@Data public class ServerHelloResponseFeaturesWebSocketMessage { @JsonField(name = "features") List features; + + public ServerHelloResponseFeaturesWebSocketMessage() { + } + + public List getFeatures() { + return this.features; + } + + public void setFeatures(List features) { + this.features = features; + } + + public boolean equals(final Object o) { + if (o == this) { + return true; + } + if (!(o instanceof ServerHelloResponseFeaturesWebSocketMessage)) { + return false; + } + final ServerHelloResponseFeaturesWebSocketMessage other = (ServerHelloResponseFeaturesWebSocketMessage) o; + if (!other.canEqual((Object) this)) { + return false; + } + 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; + } + + protected boolean canEqual(final Object other) { + return other instanceof ServerHelloResponseFeaturesWebSocketMessage; + } + + public int hashCode() { + final int PRIME = 59; + int result = 1; + final Object $features = this.getFeatures(); + result = result * PRIME + ($features == null ? 43 : $features.hashCode()); + return result; + } + + public String toString() { + return "ServerHelloResponseFeaturesWebSocketMessage(features=" + this.getFeatures() + ")"; + } } 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 4553ef5c6..cac3dd4b1 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 @@ -22,10 +22,9 @@ package com.nextcloud.talk.models.json.websocket; import com.bluelinelabs.logansquare.annotation.JsonField; import com.bluelinelabs.logansquare.annotation.JsonObject; -import lombok.Data; + import org.parceler.Parcel; -@Data @JsonObject @Parcel public class SignalingDataWebSocketMessageForOffer { @@ -34,4 +33,65 @@ public class SignalingDataWebSocketMessageForOffer { @JsonField(name = "roomType") String roomType; + + public SignalingDataWebSocketMessageForOffer() { + } + + public String getType() { + return this.type; + } + + public String getRoomType() { + return this.roomType; + } + + public void setType(String type) { + this.type = type; + } + + public void setRoomType(String roomType) { + this.roomType = roomType; + } + + public boolean equals(final Object o) { + if (o == this) { + return true; + } + if (!(o instanceof SignalingDataWebSocketMessageForOffer)) { + return false; + } + final SignalingDataWebSocketMessageForOffer other = (SignalingDataWebSocketMessageForOffer) o; + if (!other.canEqual((Object) this)) { + return false; + } + 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; + } + 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; + } + + protected boolean canEqual(final Object other) { + return other instanceof SignalingDataWebSocketMessageForOffer; + } + + public int hashCode() { + final int PRIME = 59; + int result = 1; + final Object $type = this.getType(); + result = result * PRIME + ($type == null ? 43 : $type.hashCode()); + final Object $roomType = this.getRoomType(); + result = result * PRIME + ($roomType == null ? 43 : $roomType.hashCode()); + return result; + } + + public String toString() { + return "SignalingDataWebSocketMessageForOffer(type=" + this.getType() + ", roomType=" + this.getRoomType() + ")"; + } } 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 7fea458e6..82ce39113 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 @@ -21,13 +21,13 @@ package com.nextcloud.talk.utils.text; import android.graphics.drawable.Drawable; -import androidx.annotation.NonNull; + import com.facebook.widget.text.span.BetterImageSpan; -import lombok.Data; + +import androidx.annotation.NonNull; public class Spans { - @Data public static class MentionChipSpan extends BetterImageSpan { public String id; public CharSequence label; @@ -37,6 +37,64 @@ public class Spans { this.id = id; this.label = label; } + + public String getId() { + return this.id; + } + + public CharSequence getLabel() { + return this.label; + } + + public void setId(String id) { + this.id = id; + } + + public void setLabel(CharSequence label) { + this.label = label; + } + + public boolean equals(final Object o) { + if (o == this) { + return true; + } + if (!(o instanceof MentionChipSpan)) { + return false; + } + final MentionChipSpan other = (MentionChipSpan) o; + if (!other.canEqual((Object) this)) { + return false; + } + final Object this$id = this.getId(); + final Object other$id = other.getId(); + if (this$id == null ? other$id != null : !this$id.equals(other$id)) { + return false; + } + 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; + } + + protected boolean canEqual(final Object other) { + return other instanceof MentionChipSpan; + } + + public int hashCode() { + final int PRIME = 59; + int result = 1; + final Object $id = this.getId(); + result = result * PRIME + ($id == null ? 43 : $id.hashCode()); + final Object $label = this.getLabel(); + result = result * PRIME + ($label == null ? 43 : $label.hashCode()); + return result; + } + + public String toString() { + return "Spans.MentionChipSpan(id=" + this.getId() + ", label=" + this.getLabel() + ")"; + } } } diff --git a/build.gradle b/build.gradle index ee2bbb77a..cfeb80d91 100644 --- a/build.gradle +++ b/build.gradle @@ -2,6 +2,8 @@ * Nextcloud Talk application * * @author Mario Danic + * @author Andy Scherzinger + * Copyright (C) 2021 Andy Scherzinger * Copyright (C) 2017-2019 Mario Danic * * This program is free software: you can redistribute it and/or modify @@ -18,6 +20,7 @@ * along with this program. If not, see . */ + // Top-level build file where you can add configuration options common to all sub-projects/modules. buildscript { @@ -29,12 +32,14 @@ buildscript { google() jcenter() maven { url 'https://jitpack.io' } + maven { url 'https://plugins.gradle.org/m2/' } mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:3.5.0' + classpath 'com.android.tools.build:gradle:4.1.3' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${kotlinVersion}" - classpath "io.gitlab.arturbosch.detekt:detekt-gradle-plugin:1.13.1" + classpath 'gradle.plugin.com.github.spotbugs.snom:spotbugs-gradle-plugin:4.7.0' + classpath "io.gitlab.arturbosch.detekt:detekt-gradle-plugin:1.16.0" // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 74524f662..0da862568 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,26 +1,6 @@ -# -# Nextcloud Talk application -# -# @author Mario Danic -# Copyright (C) 2017-2019 Mario Danic -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . -# - -#Thu Aug 22 11:56:51 CEST 2019 +#Wed Apr 28 23:56:08 CEST 2021 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip diff --git a/scripts/analysis/analysis-wrapper.sh b/scripts/analysis/analysis-wrapper.sh index d9987d556..a1eae6390 100755 --- a/scripts/analysis/analysis-wrapper.sh +++ b/scripts/analysis/analysis-wrapper.sh @@ -13,7 +13,7 @@ stableBranch="master" ruby scripts/analysis/lint-up.rb $1 $2 $3 lintValue=$? -./gradlew assembleGplay app:findbugs +./gradlew assembleGplay app:spotbugs # exit codes: # 0: count was reduced @@ -23,11 +23,11 @@ lintValue=$? echo "Branch: $3" if [ $3 = "master" ]; then - echo "New findbugs result for master at: https://www.kaminsky.me/nc-dev/talk-findbugs/master.html" - curl -u $4:$5 -X PUT https://nextcloud.kaminsky.me/remote.php/webdav/talk-findbugs/master.html --upload-file app/build/reports/findbugs/findbugs.html + echo "New spotbugs result for master at: https://www.kaminsky.me/nc-dev/talk-spotbugs/master.html" + curl -u $4:$5 -X PUT https://nextcloud.kaminsky.me/remote.php/webdav/talk-spotbugs/master.html --upload-file app/build/reports/spotbugs/spotbugs.html - summary=$(sed -n "/

Summary<\/h1>/,/

Warnings<\/h1>/p" app/build/reports/findbugs/findbugs.html | head -n-1 | sed s'/<\/a>//'g | sed s'///'g | sed s'/Summary/FindBugs (master)/' | tr "\"" "\'" | tr -d "\r\n") - curl -u $4:$5 -X PUT -d "$summary" https://nextcloud.kaminsky.me/remote.php/webdav/talk-findbugs/findbugs-summary-master.html + summary=$(sed -n "/

Summary<\/h1>/,/

Warnings<\/h1>/p" app/build/reports/spotbugs/spotbugs.html | head -n-1 | sed s'/<\/a>//'g | sed s'///'g | sed s'/Summary/Spotbugs (master)/' | tr "\"" "\'" | tr -d "\r\n") + curl -u $4:$5 -X PUT -d "$summary" https://nextcloud.kaminsky.me/remote.php/webdav/talk-spotbugs/spotbugs-summary-master.html if [ $lintValue -ne 1 ]; then echo "New lint result for master at: https://www.kaminsky.me/nc-dev/talk-lint/master.html" @@ -41,8 +41,8 @@ else echo "New lint results at https://www.kaminsky.me/nc-dev/talk-lint/$6.html" curl 2>/dev/null -u $4:$5 -X PUT https://nextcloud.kaminsky.me/remote.php/webdav/talk-lint/$6.html --upload-file app/build/reports/lint/lint.html - echo "New findbugs results at https://www.kaminsky.me/nc-dev/talk-findbugs/$6.html" - curl 2>/dev/null -u $4:$5 -X PUT https://nextcloud.kaminsky.me/remote.php/webdav/talk-findbugs/$6.html --upload-file app/build/reports/findbugs/findbugs.html + echo "New spotbugs results at https://www.kaminsky.me/nc-dev/talk-spotbugs/$6.html" + curl 2>/dev/null -u $4:$5 -X PUT https://nextcloud.kaminsky.me/remote.php/webdav/talk-spotbugs/$6.html --upload-file app/build/reports/spotbugs/spotbugs.html # delete all old comments oldComments=$(curl 2>/dev/null -u $1:$2 -X GET https://api.github.com/repos/nextcloud/talk-android/issues/$7/comments | jq '.[] | (.id |tostring) + "|" + (.user.login | test("nextcloud-android-bot") | tostring) ' | grep true | tr -d "\"" | cut -f1 -d"|") @@ -75,8 +75,8 @@ else lintWarningOld=0 fi lintResult="

Lint

TypeMasterPR
Warnings"$lintWarningOld""$lintWarningNew"
Errors"$lintErrorOld""$lintErrorNew"
" - findbugsResultNew=$(sed -n "/

Summary<\/h1>/,/

Warnings<\/h1>/p" app/build/reports/findbugs/findbugs.html |head -n-1 | sed s'/<\/a>//'g | sed s'///'g | sed s"#Summary#FindBugs (new)#" | tr "\"" "\'" | tr -d "\n") - findbugsResultOld=$(curl 2>/dev/null https://www.kaminsky.me/nc-dev/talk-findbugs/findbugs-summary-master.html | tr "\"" "\'" | tr -d "\r\n" | sed s'#FindBugs#FindBugs#'| tr "\"" "\'" | tr -d "\n") + spotbugsResultNew=$(sed -n "/

Summary<\/h1>/,/

Warnings<\/h1>/p" app/build/reports/spotbugs/spotbugs.html |head -n-1 | sed s'/<\/a>//'g | sed s'///'g | sed s"#Summary#SpotBugs (new)#" | tr "\"" "\'" | tr -d "\n") + spotbugsResultOld=$(curl 2>/dev/null https://www.kaminsky.me/nc-dev/talk-spotbugs/spotbugs-summary-master.html | tr "\"" "\'" | tr -d "\r\n" | sed s'#SpotBugs#SpotBugs#'| tr "\"" "\'" | tr -d "\n") curl -u $1:$2 -X POST https://api.github.com/repos/nextcloud/talk-android/issues/$7/comments -d "{ \"body\" : \"$lintResult $findbugsResultNew $findbugsResultOld \" }" if [ $lintValue -eq 2 ]; then From 8a2f8e29c681edefd4f34ad4b8780861769e9010 Mon Sep 17 00:00:00 2001 From: Andy Scherzinger Date: Thu, 29 Apr 2021 00:56:58 +0200 Subject: [PATCH 02/18] remove lombok Signed-off-by: Andy Scherzinger --- app/build.gradle | 4 ---- lombok.config | 1 - 2 files changed, 5 deletions(-) delete mode 100644 lombok.config diff --git a/app/build.gradle b/app/build.gradle index 941d085bc..4f085b9aa 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -148,7 +148,6 @@ ext { coilKtVersion = "1.2.0" daggerVersion = "2.34.1" okhttpVersion = "3.14.2" - lombokVersion = "1.18.12" materialDialogsVersion = "3.3.0" parcelerVersion = "1.1.13" powermockVersion = "2.0.9" @@ -226,9 +225,6 @@ dependencies { annotationProcessor "org.parceler:parceler:$parcelerVersion" kapt "org.parceler:parceler:$parcelerVersion" implementation 'net.orange-box.storebox:storebox-lib:1.4.0' - compileOnly "org.projectlombok:lombok:${lombokVersion}" - annotationProcessor "org.projectlombok:lombok:${lombokVersion}" - kapt "org.projectlombok:lombok:${lombokVersion}" implementation "com.jakewharton:butterknife:${butterknifeVersion}" kapt "com.jakewharton:butterknife-compiler:${butterknifeVersion}" implementation 'com.github.HITGIF:TextFieldBoxes:1.4.5' diff --git a/lombok.config b/lombok.config deleted file mode 100644 index 264dc6580..000000000 --- a/lombok.config +++ /dev/null @@ -1 +0,0 @@ -lombok.addGeneratedAnnotation = false From 41bf9ca7723a673005db194e082724f98b03e6e4 Mon Sep 17 00:00:00 2001 From: Andy Scherzinger Date: Thu, 29 Apr 2021 01:00:59 +0200 Subject: [PATCH 03/18] align spotbugs filter with files app Signed-off-by: Andy Scherzinger --- findbugs-filter.xml => spotbugs-filter.xml | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) rename findbugs-filter.xml => spotbugs-filter.xml (62%) diff --git a/findbugs-filter.xml b/spotbugs-filter.xml similarity index 62% rename from findbugs-filter.xml rename to spotbugs-filter.xml index 514a0e3a5..e9a5d30f4 100644 --- a/findbugs-filter.xml +++ b/spotbugs-filter.xml @@ -5,6 +5,8 @@ ~ Nextcloud Talk application ~ ~ @author Mario Danic + ~ @author Andy Scherzinger + ~ Copyright (C) 2021 Andy Scherzinger ~ Copyright (C) 2017-2019 Mario Danic ~ ~ This program is free software: you can redistribute it and/or modify @@ -32,6 +34,19 @@ + + + + + + + + + + + + + @@ -42,4 +57,10 @@ + + + + + + From 1d37b0bc3b690c0769904e625ad7135cb043f93b Mon Sep 17 00:00:00 2001 From: Andy Scherzinger Date: Thu, 29 Apr 2021 01:11:27 +0200 Subject: [PATCH 04/18] update spotbugs scripts Signed-off-by: Andy Scherzinger --- app/build.gradle | 13 ++- scripts/analysis/analysis-wrapper.sh | 139 +++++++++++++++++++------- scripts/analysis/findbugs-results.txt | 1 + scripts/analysis/findbugs-up.rb | 139 ++++++++++++++++++++++++++ 4 files changed, 254 insertions(+), 38 deletions(-) create mode 100644 scripts/analysis/findbugs-results.txt create mode 100755 scripts/analysis/findbugs-up.rb diff --git a/app/build.gradle b/app/build.gradle index 4f085b9aa..0a0b58ecb 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -30,14 +30,19 @@ configurations { ktlint } -def taskRequest = getGradle().getStartParameter().getTaskRequests().toString() -if (taskRequest.contains("Gplay") || taskRequest.contains("findbugs") || taskRequest.contains("lint")) { - apply from: 'gplay.gradle' +for (TaskExecutionRequest tr : getGradle().getStartParameter().getTaskRequests()) { + for (String arg : tr.args) { + // any gplay, but only exact "build", as e.g. buildGeneric shall not apply gplay.grade + if (arg.contains("Gplay") || arg.contains("lint") || arg == "build") { + apply from: 'gplay.gradle' + System.console().println("Applying gplay.gradle") + } + } } android { compileSdkVersion 29 - buildToolsVersion '29.0.2' + buildToolsVersion '30.0.3' defaultConfig { minSdkVersion 21 targetSdkVersion 29 diff --git a/scripts/analysis/analysis-wrapper.sh b/scripts/analysis/analysis-wrapper.sh index a1eae6390..b85116e8b 100755 --- a/scripts/analysis/analysis-wrapper.sh +++ b/scripts/analysis/analysis-wrapper.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/usr/bin/env bash #1: GIT_USERNAME #2: GIT_TOKEN @@ -9,11 +9,13 @@ #7: PULL_REQUEST_NUMBER stableBranch="master" +repository="talk-android" ruby scripts/analysis/lint-up.rb $1 $2 $3 lintValue=$? -./gradlew assembleGplay app:spotbugs +ruby scripts/analysis/findbugs-up.rb $1 $2 $3 +findbugsValue=$? # exit codes: # 0: count was reduced @@ -22,37 +24,60 @@ lintValue=$? echo "Branch: $3" -if [ $3 = "master" ]; then - echo "New spotbugs result for master at: https://www.kaminsky.me/nc-dev/talk-spotbugs/master.html" - curl -u $4:$5 -X PUT https://nextcloud.kaminsky.me/remote.php/webdav/talk-spotbugs/master.html --upload-file app/build/reports/spotbugs/spotbugs.html - - summary=$(sed -n "/

Summary<\/h1>/,/

Warnings<\/h1>/p" app/build/reports/spotbugs/spotbugs.html | head -n-1 | sed s'/<\/a>//'g | sed s'///'g | sed s'/Summary/Spotbugs (master)/' | tr "\"" "\'" | tr -d "\r\n") - curl -u $4:$5 -X PUT -d "$summary" https://nextcloud.kaminsky.me/remote.php/webdav/talk-spotbugs/spotbugs-summary-master.html - +if [ $3 = $stableBranch ]; then + echo "New findbugs result for $stableBranch at: https://www.kaminsky.me/nc-dev/$repository-findbugs/$stableBranch.html" + curl -u $4:$5 -X PUT https://nextcloud.kaminsky.me/remote.php/webdav/$repository-findbugs/$stableBranch.html --upload-file build/reports/spotbugs/spotbugs.html + + summary=$(sed -n "/

Summary<\/h1>/,/

Warnings<\/h1>/p" build/reports/spotbugs/spotbugs.html | head -n-1 | sed s'/<\/a>//'g | sed s'///'g | sed s"/Summary/SpotBugs ($stableBranch)/" | tr "\"" "\'" | tr -d "\r\n") + curl -u $4:$5 -X PUT -d "$summary" https://nextcloud.kaminsky.me/remote.php/webdav/$repository-findbugs/findbugs-summary-$stableBranch.html + if [ $lintValue -ne 1 ]; then - echo "New lint result for master at: https://www.kaminsky.me/nc-dev/talk-lint/master.html" - curl -u $4:$5 -X PUT https://nextcloud.kaminsky.me/remote.php/webdav/talk-lint/master.html --upload-file app/build/reports/lint/lint.html + echo "New lint result for $stableBranch at: https://www.kaminsky.me/nc-dev/$repository-lint/$stableBranch.html" + curl -u $4:$5 -X PUT https://nextcloud.kaminsky.me/remote.php/webdav/$repository-lint/$stableBranch.html --upload-file build/reports/lint/lint.html exit 0 fi else if [ -e $6 ]; then - 6="master-"$(date +%F) + 6=$stableBranch"-"$(date +%F) fi - echo "New lint results at https://www.kaminsky.me/nc-dev/talk-lint/$6.html" - curl 2>/dev/null -u $4:$5 -X PUT https://nextcloud.kaminsky.me/remote.php/webdav/talk-lint/$6.html --upload-file app/build/reports/lint/lint.html - - echo "New spotbugs results at https://www.kaminsky.me/nc-dev/talk-spotbugs/$6.html" - curl 2>/dev/null -u $4:$5 -X PUT https://nextcloud.kaminsky.me/remote.php/webdav/talk-spotbugs/$6.html --upload-file app/build/reports/spotbugs/spotbugs.html - - # delete all old comments - oldComments=$(curl 2>/dev/null -u $1:$2 -X GET https://api.github.com/repos/nextcloud/talk-android/issues/$7/comments | jq '.[] | (.id |tostring) + "|" + (.user.login | test("nextcloud-android-bot") | tostring) ' | grep true | tr -d "\"" | cut -f1 -d"|") - - echo $oldComments | while read comment ; do - curl 2>/dev/null -u $1:$2 -X DELETE https://api.github.com/repos/nextcloud/talk-android/issues/comments/$comment + echo "New lint results at https://www.kaminsky.me/nc-dev/$repository-lint/$6.html" + curl 2>/dev/null -u $4:$5 -X PUT https://nextcloud.kaminsky.me/remote.php/webdav/$repository-lint/$6.html --upload-file build/reports/lint/lint.html + + echo "New findbugs results at https://www.kaminsky.me/nc-dev/$repository-findbugs/$6.html" + curl 2>/dev/null -u $4:$5 -X PUT https://nextcloud.kaminsky.me/remote.php/webdav/$repository-findbugs/$6.html --upload-file build/reports/spotbugs/spotbugs.html + + # delete all old comments, starting with Codacy + oldComments=$(curl 2>/dev/null -u $1:$2 -X GET https://api.github.com/repos/nextcloud/android/issues/$7/comments | jq '.[] | (.id |tostring) + "|" + (.user.login | test("nextcloud-android-bot") | tostring) + "|" + (.body | test("

Codacy.*") | tostring)' | grep "true|true" | tr -d "\"" | cut -f1 -d"|") + + echo $oldComments | while read comment ; do + curl 2>/dev/null -u $1:$2 -X DELETE https://api.github.com/repos/nextcloud/android/issues/comments/$comment done - + + # check library, only if base branch is master + baseBranch=$(scripts/analysis/getBranchBase.sh $1 $2 $7 | tr -d "\"") + if [ $baseBranch = "master" -a $(grep "androidLibraryVersion = \"master-SNAPSHOT\"" build.gradle -c) -ne 1 ]; then + checkLibraryMessage="

Android-library is not set to master branch in build.gradle

" + checkLibrary=1 + elif [ $baseBranch != "master" -a $baseBranch = $stableBranch -a $(grep "androidLibraryVersion.*SNAPSHOT" build.gradle -c) -ne 0 ]; then + checkLibraryMessage="

Android-library is set to a SNAPSHOT in build.gradle

" + checkLibrary=1 + else + checkLibrary=0 + fi + + # lint and findbugs file must exist + if [ ! -s build/reports/lint/lint.html ] ; then + echo "lint.html file is missing!" + exit 1 + fi + + if [ ! -s build/reports/spotbugs/spotbugs.html ] ; then + echo "spotbugs.html file is missing!" + exit 1 + fi + # add comment with results - lintResultNew=$(grep "Lint Report.* [0-9]* warning" app/build/reports/lint/lint.html | cut -f2 -d':' |cut -f1 -d'<') + lintResultNew=$(grep "Lint Report.* [0-9]* warning" build/reports/lint/lint.html | cut -f2 -d':' |cut -f1 -d'<') lintErrorNew=$(echo $lintResultNew | grep "[0-9]* error" -o | cut -f1 -d" ") if ( [ -z $lintErrorNew ] ); then @@ -64,7 +89,7 @@ else lintWarningNew=0 fi - lintResultOld=$(curl 2>/dev/null https://raw.githubusercontent.com/nextcloud/talk-android/$stableBranch/scripts/analysis/lint-results.txt) + lintResultOld=$(curl 2>/dev/null https://raw.githubusercontent.com/nextcloud/android/$stableBranch/scripts/analysis/lint-results.txt) lintErrorOld=$(echo $lintResultOld | grep "[0-9]* error" -o | cut -f1 -d" ") if ( [ -z $lintErrorOld ] ); then lintErrorOld=0 @@ -74,14 +99,60 @@ else if ( [ -z $lintWarningOld ] ); then lintWarningOld=0 fi - lintResult="

Lint

TypeMasterPR
Warnings"$lintWarningOld""$lintWarningNew"
Errors"$lintErrorOld""$lintErrorNew"
" - spotbugsResultNew=$(sed -n "/

Summary<\/h1>/,/

Warnings<\/h1>/p" app/build/reports/spotbugs/spotbugs.html |head -n-1 | sed s'/<\/a>//'g | sed s'///'g | sed s"#Summary#SpotBugs (new)#" | tr "\"" "\'" | tr -d "\n") - spotbugsResultOld=$(curl 2>/dev/null https://www.kaminsky.me/nc-dev/talk-spotbugs/spotbugs-summary-master.html | tr "\"" "\'" | tr -d "\r\n" | sed s'#SpotBugs#SpotBugs#'| tr "\"" "\'" | tr -d "\n") - curl -u $1:$2 -X POST https://api.github.com/repos/nextcloud/talk-android/issues/$7/comments -d "{ \"body\" : \"$lintResult $findbugsResultNew $findbugsResultOld \" }" - - if [ $lintValue -eq 2 ]; then + + if [ $stableBranch = "master" ] ; then + codacyValue=$(curl 2>/dev/null https://app.codacy.com/dashboards/breakdown\?projectId\=44248 | grep "total issues" | cut -d">" -f3 | cut -d"<" -f1) + codacyResult="

Codacy

$codacyValue" + else + codacyResult="" + fi + + lintResult="

Lint

Type$stableBranchPR
Warnings"$lintWarningOld""$lintWarningNew"
Errors"$lintErrorOld""$lintErrorNew"
" + findbugsResultNew=$(sed -n "/

Summary<\/h1>/,/

Warnings<\/h1>/p" build/reports/spotbugs/spotbugs.html |head -n-1 | sed s'/<\/a>//'g | sed s'///'g | sed s"#Summary#SpotBugs (new)#" | tr "\"" "\'" | tr -d "\n") + findbugsResultOld=$(curl 2>/dev/null https://www.kaminsky.me/nc-dev/$repository-findbugs/findbugs-summary-$stableBranch.html | tr "\"" "\'" | tr -d "\r\n" | sed s"#SpotBugs#SpotBugs#" | tr "\"" "\'" | tr -d "\n") + + + if ( [ $lintValue -eq 1 ] ) ; then + lintMessage="

Lint increased!

" + fi + + if ( [ $findbugsValue -eq 1 ] ) ; then + findbugsMessage="

SpotBugs increased!

" + fi + + # check gplay limitation: all changelog files must only have 500 chars + gplayLimitation=$(scripts/checkGplayLimitation.sh) + + if [ ! -z "$gplayLimitation" ]; then + gplayLimitation="

Following files are beyond 500 char limit:



"$gplayLimitation + fi + + # check for NotNull + if [[ $(grep org.jetbrains.annotations src/main/* -ir -c) -gt 0 ]] ; then + notNull="org.jetbrains.annotations.NotNull is used. Please use androidx.annotation.NonNull instead.

" + fi + + curl -u $1:$2 -X POST https://api.github.com/repos/nextcloud/android/issues/$7/comments -d "{ \"body\" : \"$codacyResult $lintResult $findbugsResultNew $findbugsResultOld $checkLibraryMessage $lintMessage $findbugsMessage $gplayLimitation $notNull\" }" + + if [ ! -z "$gplayLimitation" ]; then + exit 1 + fi + + if [ $checkLibrary -eq 1 ]; then + exit 1 + fi + + if [ ! $lintValue -eq 2 ]; then + exit $lintValue + fi + + if [ $notNull -gt 0 ]; then + exit 1 + fi + + if [ $findbugsValue -eq 2 ]; then exit 0 else - exit $lintValue - fi + exit $findbugsValue + fi fi diff --git a/scripts/analysis/findbugs-results.txt b/scripts/analysis/findbugs-results.txt new file mode 100644 index 000000000..0e92c3c0f --- /dev/null +++ b/scripts/analysis/findbugs-results.txt @@ -0,0 +1 @@ +306 \ No newline at end of file diff --git a/scripts/analysis/findbugs-up.rb b/scripts/analysis/findbugs-up.rb new file mode 100755 index 000000000..cc59d8e35 --- /dev/null +++ b/scripts/analysis/findbugs-up.rb @@ -0,0 +1,139 @@ +## Script from https://github.com/tir38/android-lint-entropy-reducer at 07.05.2017 +# adapts to drone, use git username / token as parameter + +Encoding.default_external = Encoding::UTF_8 +Encoding.default_internal = Encoding::UTF_8 + +puts "=================== starting Android FindBugs Entropy Reducer ====================" + +# get args +git_user, git_token, git_branch = ARGV + +# ======================== SETUP ============================ + +# User name for git commits made by this script. +TRAVIS_GIT_USERNAME = String.new("Drone CI server") + +# File name and relative path of generated FindBugs report. Must match build.gradle file: +# lintOptions { +# htmlOutput file("[FILE_NAME].html") +# } +FINDBUGS_REPORT_FILE = String.new("build/reports/spotbugs/spotbugs.html") + +# File name and relative path of previous results of this script. +PREVIOUS_FINDBUGS_RESULTS_FILE=String.new("scripts/analysis/findbugs-results.txt") + +# Flag to evaluate warnings. true = check warnings; false = ignore warnings +CHECK_WARNINGS = true + +# File name and relative path to custom FindBugs rules; Can be null or "". +CUSTOM_FINDBUGS_FILE = String.new("") + +# ================ SETUP DONE; DON'T TOUCH ANYTHING BELOW ================ + +require 'fileutils' +require 'pathname' +require 'open3' + +# since we need the xml-simple gem, and we want this script self-contained, let's grab it just when we need it +begin + gem "xml-simple" + rescue LoadError + system("gem install xml-simple") + Gem.clear_paths +end + +require 'xmlsimple' + +# run FindBugs +puts "running FindBugs..." +system './gradlew assembleGplayDebug 1>/dev/null' + +# confirm that assemble ran w/out error +result = $?.to_i +if result != 0 + puts "FAIL: failed to run ./gradlew assembleGplayDebug" + exit 1 +end + +system './gradlew spotbugsGplayDebugReport 1>/dev/null 2>&1' + +# find FindBugs report file +findbugs_reports = Dir.glob(FINDBUGS_REPORT_FILE) +if findbugs_reports.length == 0 + puts "Findbugs HTML report not found." + exit 1 +end +findbugs_report = String.new(findbugs_reports[0]) + +# find number of warnings +current_warning_count = `grep -A 3 "Total" build/reports/spotbugs/spotbugs.html | tail -n1 | cut -f2 -d">" | cut -f1 -d"<"`.to_i +puts "found warnings: " + current_warning_count.to_s + +# get warning counts from last successful build + +previous_results = false + +previous_findbugs_reports = Dir.glob(PREVIOUS_FINDBUGS_RESULTS_FILE) +if previous_findbugs_reports.nil? || previous_findbugs_reports.length == 0 + previous_findbugs_report = File.new(PREVIOUS_FINDBUGS_RESULTS_FILE, "w") # create for writing to later +else + previous_findbugs_report = String.new(previous_findbugs_reports[0]) + + previous_warning_count = File.open(previous_findbugs_report, &:readline).match(/[0-9]*/)[0].to_i + + if previous_warning_count.nil? + previous_results = false + else + previous_results = true + + puts "previous warnings: " + previous_warning_count.to_s + end +end + +# compare previous warning count with current warning count +if previous_results == true && current_warning_count > previous_warning_count + puts "FAIL: warning count increased" + exit 1 +end + +# check if warning and error count stayed the same +if previous_results == true && current_warning_count == previous_warning_count + puts "SUCCESS: count stayed the same" + exit 2 +end + +# warning count DECREASED +puts "SUCCESS: count decreased from " + previous_warning_count.to_s + " to " + current_warning_count.to_s + +# write new results to file (will overwrite existing, or create new) +File.write(previous_findbugs_report, current_warning_count) + +# push changes to github (if this script is run locally, we don't want to overwrite git username and email, so save temporarily) +previous_git_username, _ = Open3.capture2('git config user.name') +previous_git_username = previous_git_username.strip + +previous_git_email, _ = Open3.capture3('git config user.email') +previous_git_email = previous_git_email.strip + +# update git user name and email for this script +system ("git config --local user.name '" + git_user + "'") +system ("git config --local user.email 'android@nextcloud.com'") +system ("git remote rm origin") +system ("git remote add origin https://" + git_user + ":" + git_token + "@github.com/nextcloud/android") + +# add previous FindBugs result file to git +system ('git add ' + PREVIOUS_FINDBUGS_RESULTS_FILE) + +# commit changes; Add "skip ci" so that we don't accidentally trigger another Drone build +system ('git commit -sm "Drone: update FindBugs results to reflect reduced error/warning count [skip ci]" ') + +# push to origin +system ('git push origin HEAD:' + git_branch) + +# restore previous git user name and email +system("git config --local user.name '#{previous_git_username}'") +system("git config --local user.email '#{previous_git_email}'") + +puts "SUCCESS: count was reduced" +exit 0 # success From 099be716861a1e7a0180b8925be91203f0402a6b Mon Sep 17 00:00:00 2001 From: Andy Scherzinger Date: Thu, 29 Apr 2021 01:23:09 +0200 Subject: [PATCH 05/18] align wrapper script with actual checks Signed-off-by: Andy Scherzinger --- scripts/analysis/analysis-wrapper.sh | 66 +++++++-------------------- scripts/analysis/findbugs-results.txt | 2 +- scripts/analysis/lint-results.txt | 2 +- 3 files changed, 18 insertions(+), 52 deletions(-) diff --git a/scripts/analysis/analysis-wrapper.sh b/scripts/analysis/analysis-wrapper.sh index b85116e8b..c7ce5fd37 100755 --- a/scripts/analysis/analysis-wrapper.sh +++ b/scripts/analysis/analysis-wrapper.sh @@ -9,7 +9,7 @@ #7: PULL_REQUEST_NUMBER stableBranch="master" -repository="talk-android" +repository="talk" ruby scripts/analysis/lint-up.rb $1 $2 $3 lintValue=$? @@ -26,14 +26,14 @@ echo "Branch: $3" if [ $3 = $stableBranch ]; then echo "New findbugs result for $stableBranch at: https://www.kaminsky.me/nc-dev/$repository-findbugs/$stableBranch.html" - curl -u $4:$5 -X PUT https://nextcloud.kaminsky.me/remote.php/webdav/$repository-findbugs/$stableBranch.html --upload-file build/reports/spotbugs/spotbugs.html + curl -u $4:$5 -X PUT https://nextcloud.kaminsky.me/remote.php/webdav/$repository-findbugs/$stableBranch.html --upload-file app/build/reports/spotbugs/spotbugs.html - summary=$(sed -n "/

Summary<\/h1>/,/

Warnings<\/h1>/p" build/reports/spotbugs/spotbugs.html | head -n-1 | sed s'/<\/a>//'g | sed s'///'g | sed s"/Summary/SpotBugs ($stableBranch)/" | tr "\"" "\'" | tr -d "\r\n") + summary=$(sed -n "/

Summary<\/h1>/,/

Warnings<\/h1>/p" app/build/reports/spotbugs/spotbugs.html | head -n-1 | sed s'/<\/a>//'g | sed s'///'g | sed s"/Summary/SpotBugs ($stableBranch)/" | tr "\"" "\'" | tr -d "\r\n") curl -u $4:$5 -X PUT -d "$summary" https://nextcloud.kaminsky.me/remote.php/webdav/$repository-findbugs/findbugs-summary-$stableBranch.html if [ $lintValue -ne 1 ]; then echo "New lint result for $stableBranch at: https://www.kaminsky.me/nc-dev/$repository-lint/$stableBranch.html" - curl -u $4:$5 -X PUT https://nextcloud.kaminsky.me/remote.php/webdav/$repository-lint/$stableBranch.html --upload-file build/reports/lint/lint.html + curl -u $4:$5 -X PUT https://nextcloud.kaminsky.me/remote.php/webdav/$repository-lint/$stableBranch.html --upload-file app/build/reports/lint/lint.html exit 0 fi else @@ -41,43 +41,31 @@ else 6=$stableBranch"-"$(date +%F) fi echo "New lint results at https://www.kaminsky.me/nc-dev/$repository-lint/$6.html" - curl 2>/dev/null -u $4:$5 -X PUT https://nextcloud.kaminsky.me/remote.php/webdav/$repository-lint/$6.html --upload-file build/reports/lint/lint.html + curl 2>/dev/null -u $4:$5 -X PUT https://nextcloud.kaminsky.me/remote.php/webdav/$repository-lint/$6.html --upload-file app/build/reports/lint/lint.html echo "New findbugs results at https://www.kaminsky.me/nc-dev/$repository-findbugs/$6.html" - curl 2>/dev/null -u $4:$5 -X PUT https://nextcloud.kaminsky.me/remote.php/webdav/$repository-findbugs/$6.html --upload-file build/reports/spotbugs/spotbugs.html + curl 2>/dev/null -u $4:$5 -X PUT https://nextcloud.kaminsky.me/remote.php/webdav/$repository-findbugs/$6.html --upload-file app/build/reports/spotbugs/spotbugs.html - # delete all old comments, starting with Codacy - oldComments=$(curl 2>/dev/null -u $1:$2 -X GET https://api.github.com/repos/nextcloud/android/issues/$7/comments | jq '.[] | (.id |tostring) + "|" + (.user.login | test("nextcloud-android-bot") | tostring) + "|" + (.body | test("

Codacy.*") | tostring)' | grep "true|true" | tr -d "\"" | cut -f1 -d"|") + # delete all old comments + oldComments=$(curl 2>/dev/null -u $1:$2 -X GET https://api.github.com/repos/nextcloud/talk-android/issues/$7/comments | jq '.[] | (.id |tostring) + "|" + (.user.login | test("nextcloud-android-bot") | tostring) ' | grep true | tr -d "\"" | cut -f1 -d"|") - echo $oldComments | while read comment ; do - curl 2>/dev/null -u $1:$2 -X DELETE https://api.github.com/repos/nextcloud/android/issues/comments/$comment + echo $oldComments | while read comment ; do + curl 2>/dev/null -u $1:$2 -X DELETE https://api.github.com/repos/nextcloud/talk-android/issues/comments/$comment done - # check library, only if base branch is master - baseBranch=$(scripts/analysis/getBranchBase.sh $1 $2 $7 | tr -d "\"") - if [ $baseBranch = "master" -a $(grep "androidLibraryVersion = \"master-SNAPSHOT\"" build.gradle -c) -ne 1 ]; then - checkLibraryMessage="

Android-library is not set to master branch in build.gradle

" - checkLibrary=1 - elif [ $baseBranch != "master" -a $baseBranch = $stableBranch -a $(grep "androidLibraryVersion.*SNAPSHOT" build.gradle -c) -ne 0 ]; then - checkLibraryMessage="

Android-library is set to a SNAPSHOT in build.gradle

" - checkLibrary=1 - else - checkLibrary=0 - fi - # lint and findbugs file must exist - if [ ! -s build/reports/lint/lint.html ] ; then + if [ ! -s app/build/reports/lint/lint.html ] ; then echo "lint.html file is missing!" exit 1 fi - if [ ! -s build/reports/spotbugs/spotbugs.html ] ; then + if [ ! -s app/build/reports/spotbugs/spotbugs.html ] ; then echo "spotbugs.html file is missing!" exit 1 fi # add comment with results - lintResultNew=$(grep "Lint Report.* [0-9]* warning" build/reports/lint/lint.html | cut -f2 -d':' |cut -f1 -d'<') + lintResultNew=$(grep "Lint Report.* [0-9]* warning" app/build/reports/lint/lint.html | cut -f2 -d':' |cut -f1 -d'<') lintErrorNew=$(echo $lintResultNew | grep "[0-9]* error" -o | cut -f1 -d" ") if ( [ -z $lintErrorNew ] ); then @@ -89,7 +77,7 @@ else lintWarningNew=0 fi - lintResultOld=$(curl 2>/dev/null https://raw.githubusercontent.com/nextcloud/android/$stableBranch/scripts/analysis/lint-results.txt) + lintResultOld=$(curl 2>/dev/null https://raw.githubusercontent.com/nextcloud/talk-android/$stableBranch/scripts/analysis/lint-results.txt) lintErrorOld=$(echo $lintResultOld | grep "[0-9]* error" -o | cut -f1 -d" ") if ( [ -z $lintErrorOld ] ); then lintErrorOld=0 @@ -100,15 +88,8 @@ else lintWarningOld=0 fi - if [ $stableBranch = "master" ] ; then - codacyValue=$(curl 2>/dev/null https://app.codacy.com/dashboards/breakdown\?projectId\=44248 | grep "total issues" | cut -d">" -f3 | cut -d"<" -f1) - codacyResult="

Codacy

$codacyValue" - else - codacyResult="" - fi - lintResult="

Lint

Type$stableBranchPR
Warnings"$lintWarningOld""$lintWarningNew"
Errors"$lintErrorOld""$lintErrorNew"
" - findbugsResultNew=$(sed -n "/

Summary<\/h1>/,/

Warnings<\/h1>/p" build/reports/spotbugs/spotbugs.html |head -n-1 | sed s'/<\/a>//'g | sed s'///'g | sed s"#Summary#SpotBugs (new)#" | tr "\"" "\'" | tr -d "\n") + findbugsResultNew=$(sed -n "/

Summary<\/h1>/,/

Warnings<\/h1>/p" app/build/reports/spotbugs/spotbugs.html |head -n-1 | sed s'/<\/a>//'g | sed s'///'g | sed s"#Summary#SpotBugs (new)#" | tr "\"" "\'" | tr -d "\n") findbugsResultOld=$(curl 2>/dev/null https://www.kaminsky.me/nc-dev/$repository-findbugs/findbugs-summary-$stableBranch.html | tr "\"" "\'" | tr -d "\r\n" | sed s"#SpotBugs#SpotBugs#" | tr "\"" "\'" | tr -d "\n") @@ -120,27 +101,12 @@ else findbugsMessage="

SpotBugs increased!

" fi - # check gplay limitation: all changelog files must only have 500 chars - gplayLimitation=$(scripts/checkGplayLimitation.sh) - - if [ ! -z "$gplayLimitation" ]; then - gplayLimitation="

Following files are beyond 500 char limit:



"$gplayLimitation - fi - # check for NotNull if [[ $(grep org.jetbrains.annotations src/main/* -ir -c) -gt 0 ]] ; then notNull="org.jetbrains.annotations.NotNull is used. Please use androidx.annotation.NonNull instead.

" fi - curl -u $1:$2 -X POST https://api.github.com/repos/nextcloud/android/issues/$7/comments -d "{ \"body\" : \"$codacyResult $lintResult $findbugsResultNew $findbugsResultOld $checkLibraryMessage $lintMessage $findbugsMessage $gplayLimitation $notNull\" }" - - if [ ! -z "$gplayLimitation" ]; then - exit 1 - fi - - if [ $checkLibrary -eq 1 ]; then - exit 1 - fi + curl -u $1:$2 -X POST https://api.github.com/repos/nextcloud/talk-android/issues/$7/comments -d "{ \"body\" : \"$lintResult $findbugsResultNew $findbugsResultOld $lintMessage $findbugsMessage $notNull\" }" if [ ! $lintValue -eq 2 ]; then exit $lintValue diff --git a/scripts/analysis/findbugs-results.txt b/scripts/analysis/findbugs-results.txt index 0e92c3c0f..eed0d1a4a 100644 --- a/scripts/analysis/findbugs-results.txt +++ b/scripts/analysis/findbugs-results.txt @@ -1 +1 @@ -306 \ No newline at end of file +506 \ No newline at end of file diff --git a/scripts/analysis/lint-results.txt b/scripts/analysis/lint-results.txt index 4ecbde733..360bff57d 100644 --- a/scripts/analysis/lint-results.txt +++ b/scripts/analysis/lint-results.txt @@ -1,2 +1,2 @@ DO NOT TOUCH; GENERATED BY DRONE - Lint Report: 3 errors and 114 warnings + Lint Report: 3 errors and 371 warnings From 93404cec77e83ad403b8ca0b138e692f43a362e0 Mon Sep 17 00:00:00 2001 From: Andy Scherzinger Date: Thu, 29 Apr 2021 09:14:45 +0200 Subject: [PATCH 06/18] Bump spotbugs-gradle-plugin from 4.7.0 to 4.7.1 Signed-off-by: Andy Scherzinger --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index cfeb80d91..25aaf4ddf 100644 --- a/build.gradle +++ b/build.gradle @@ -38,7 +38,7 @@ buildscript { dependencies { classpath 'com.android.tools.build:gradle:4.1.3' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${kotlinVersion}" - classpath 'gradle.plugin.com.github.spotbugs.snom:spotbugs-gradle-plugin:4.7.0' + classpath 'gradle.plugin.com.github.spotbugs.snom:spotbugs-gradle-plugin:4.7.1' classpath "io.gitlab.arturbosch.detekt:detekt-gradle-plugin:1.16.0" // NOTE: Do not place your application dependencies here; they belong From b75295466eabe71ca41ace32cf07ff4e1a8982ea Mon Sep 17 00:00:00 2001 From: Andy Scherzinger Date: Thu, 29 Apr 2021 09:17:54 +0200 Subject: [PATCH 07/18] Update spotbugs plugin Signed-off-by: Andy Scherzinger --- app/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/build.gradle b/app/build.gradle index 0a0b58ecb..d1e33724b 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -293,7 +293,7 @@ dependencies { exclude group: 'com.android.support', module: 'support-annotations' }) spotbugsPlugins 'com.h3xstream.findsecbugs:findsecbugs-plugin:1.11.0' - spotbugsPlugins 'com.mebigfatguy.fb-contrib:fb-contrib:7.4.6' + spotbugsPlugins 'com.mebigfatguy.fb-contrib:fb-contrib:7.4.7' } task ktlint(type: JavaExec, group: "verification") { From 61a0d2180832d3104d2b93abad6a03ffdce0f263 Mon Sep 17 00:00:00 2001 From: tobiasKaminsky Date: Thu, 29 Apr 2021 09:47:59 +0200 Subject: [PATCH 08/18] Fix nonNull check Fix spotbugs, in different location now Signed-off-by: tobiasKaminsky --- scripts/analysis/analysis-wrapper.sh | 2 +- scripts/analysis/findbugs-up.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/analysis/analysis-wrapper.sh b/scripts/analysis/analysis-wrapper.sh index c7ce5fd37..11485b100 100755 --- a/scripts/analysis/analysis-wrapper.sh +++ b/scripts/analysis/analysis-wrapper.sh @@ -112,7 +112,7 @@ else exit $lintValue fi - if [ $notNull -gt 0 ]; then + if [[ -n $notNull ]]; then exit 1 fi diff --git a/scripts/analysis/findbugs-up.rb b/scripts/analysis/findbugs-up.rb index cc59d8e35..a84b15e1d 100755 --- a/scripts/analysis/findbugs-up.rb +++ b/scripts/analysis/findbugs-up.rb @@ -67,7 +67,7 @@ end findbugs_report = String.new(findbugs_reports[0]) # find number of warnings -current_warning_count = `grep -A 3 "Total" build/reports/spotbugs/spotbugs.html | tail -n1 | cut -f2 -d">" | cut -f1 -d"<"`.to_i +current_warning_count = `grep -A 3 "Total" app/build/reports/spotbugs/spotbugs.html | tail -n1 | cut -f2 -d">" | cut -f1 -d"<"`.to_i puts "found warnings: " + current_warning_count.to_s # get warning counts from last successful build From b3b0a5ff300b29717ee636b1436d794da03f5680 Mon Sep 17 00:00:00 2001 From: Andy Scherzinger Date: Thu, 29 Apr 2021 11:00:27 +0200 Subject: [PATCH 09/18] Add codacy crawler Signed-off-by: Andy Scherzinger --- scripts/analysis/analysis-wrapper.sh | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/scripts/analysis/analysis-wrapper.sh b/scripts/analysis/analysis-wrapper.sh index 11485b100..8456002a1 100755 --- a/scripts/analysis/analysis-wrapper.sh +++ b/scripts/analysis/analysis-wrapper.sh @@ -46,10 +46,10 @@ else echo "New findbugs results at https://www.kaminsky.me/nc-dev/$repository-findbugs/$6.html" curl 2>/dev/null -u $4:$5 -X PUT https://nextcloud.kaminsky.me/remote.php/webdav/$repository-findbugs/$6.html --upload-file app/build/reports/spotbugs/spotbugs.html - # delete all old comments - oldComments=$(curl 2>/dev/null -u $1:$2 -X GET https://api.github.com/repos/nextcloud/talk-android/issues/$7/comments | jq '.[] | (.id |tostring) + "|" + (.user.login | test("nextcloud-android-bot") | tostring) ' | grep true | tr -d "\"" | cut -f1 -d"|") + # delete all old comments, starting with Codacy + oldComments=$(curl 2>/dev/null -u $1:$2 -X GET https://api.github.com/repos/nextcloud/talk-android/issues/$7/comments | jq '.[] | (.id |tostring) + "|" + (.user.login | test("nextcloud-android-bot") | tostring) + "|" + (.body | test("

Codacy.*") | tostring)' | grep "true|true" | tr -d "\"" | cut -f1 -d"|") - echo $oldComments | while read comment ; do + echo $oldComments | while read comment ; do curl 2>/dev/null -u $1:$2 -X DELETE https://api.github.com/repos/nextcloud/talk-android/issues/comments/$comment done @@ -87,6 +87,13 @@ else if ( [ -z $lintWarningOld ] ); then lintWarningOld=0 fi + + if [ $stableBranch = "master" ] ; then + codacyValue=$(curl 2>/dev/null https://app.codacy.com/gh/nextcloud/talk-android/dashboard | grep "total issues" | cut -d">" -f3 | cut -d"<" -f1) + codacyResult="

Codacy

$codacyValue" + else + codacyResult="" + fi lintResult="

Lint

Type$stableBranchPR
Warnings"$lintWarningOld""$lintWarningNew"
Errors"$lintErrorOld""$lintErrorNew"
" findbugsResultNew=$(sed -n "/

Summary<\/h1>/,/

Warnings<\/h1>/p" app/build/reports/spotbugs/spotbugs.html |head -n-1 | sed s'/<\/a>//'g | sed s'///'g | sed s"#Summary#SpotBugs (new)#" | tr "\"" "\'" | tr -d "\n") @@ -106,7 +113,7 @@ else notNull="org.jetbrains.annotations.NotNull is used. Please use androidx.annotation.NonNull instead.

" fi - curl -u $1:$2 -X POST https://api.github.com/repos/nextcloud/talk-android/issues/$7/comments -d "{ \"body\" : \"$lintResult $findbugsResultNew $findbugsResultOld $lintMessage $findbugsMessage $notNull\" }" + curl -u $1:$2 -X POST https://api.github.com/repos/nextcloud/talk-android/issues/$7/comments -d "{ \"body\" : \"$codacyResult $lintResult $findbugsResultNew $findbugsResultOld $lintMessage $findbugsMessage $notNull\" }" if [ ! $lintValue -eq 2 ]; then exit $lintValue From 1d4bc12bf043882fb6a58349d6ee99c2b16767b3 Mon Sep 17 00:00:00 2001 From: Andy Scherzinger Date: Thu, 29 Apr 2021 12:21:20 +0200 Subject: [PATCH 10/18] remove codacy info from comments Signed-off-by: Andy Scherzinger --- scripts/analysis/analysis-wrapper.sh | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/scripts/analysis/analysis-wrapper.sh b/scripts/analysis/analysis-wrapper.sh index 8456002a1..0e00a29ac 100755 --- a/scripts/analysis/analysis-wrapper.sh +++ b/scripts/analysis/analysis-wrapper.sh @@ -46,8 +46,8 @@ else echo "New findbugs results at https://www.kaminsky.me/nc-dev/$repository-findbugs/$6.html" curl 2>/dev/null -u $4:$5 -X PUT https://nextcloud.kaminsky.me/remote.php/webdav/$repository-findbugs/$6.html --upload-file app/build/reports/spotbugs/spotbugs.html - # delete all old comments, starting with Codacy - oldComments=$(curl 2>/dev/null -u $1:$2 -X GET https://api.github.com/repos/nextcloud/talk-android/issues/$7/comments | jq '.[] | (.id |tostring) + "|" + (.user.login | test("nextcloud-android-bot") | tostring) + "|" + (.body | test("

Codacy.*") | tostring)' | grep "true|true" | tr -d "\"" | cut -f1 -d"|") + # delete all old comments + oldComments=$(curl 2>/dev/null -u $1:$2 -X GET https://api.github.com/repos/nextcloud/talk-android/issues/$7/comments | jq '.[] | (.id |tostring) + "|" + (.user.login | test("nextcloud-android-bot") | tostring) ' | grep true | tr -d "\"" | cut -f1 -d"|") echo $oldComments | while read comment ; do curl 2>/dev/null -u $1:$2 -X DELETE https://api.github.com/repos/nextcloud/talk-android/issues/comments/$comment @@ -87,13 +87,6 @@ else if ( [ -z $lintWarningOld ] ); then lintWarningOld=0 fi - - if [ $stableBranch = "master" ] ; then - codacyValue=$(curl 2>/dev/null https://app.codacy.com/gh/nextcloud/talk-android/dashboard | grep "total issues" | cut -d">" -f3 | cut -d"<" -f1) - codacyResult="

Codacy

$codacyValue" - else - codacyResult="" - fi lintResult="

Lint

Type$stableBranchPR
Warnings"$lintWarningOld""$lintWarningNew"
Errors"$lintErrorOld""$lintErrorNew"
" findbugsResultNew=$(sed -n "/

Summary<\/h1>/,/

Warnings<\/h1>/p" app/build/reports/spotbugs/spotbugs.html |head -n-1 | sed s'/<\/a>//'g | sed s'///'g | sed s"#Summary#SpotBugs (new)#" | tr "\"" "\'" | tr -d "\n") @@ -113,7 +106,7 @@ else notNull="org.jetbrains.annotations.NotNull is used. Please use androidx.annotation.NonNull instead.

" fi - curl -u $1:$2 -X POST https://api.github.com/repos/nextcloud/talk-android/issues/$7/comments -d "{ \"body\" : \"$codacyResult $lintResult $findbugsResultNew $findbugsResultOld $lintMessage $findbugsMessage $notNull\" }" + curl -u $1:$2 -X POST https://api.github.com/repos/nextcloud/talk-android/issues/$7/comments -d "{ \"body\" : \"$lintResult $findbugsResultNew $findbugsResultOld $lintMessage $findbugsMessage $notNull\" }" if [ ! $lintValue -eq 2 ]; then exit $lintValue From 1acda9729455f3b1c64ef788d5c1bb23d6524dba Mon Sep 17 00:00:00 2001 From: tobiasKaminsky Date: Thu, 29 Apr 2021 09:47:59 +0200 Subject: [PATCH 11/18] Fix nonNull check Fix spotbugs, in different location now Signed-off-by: tobiasKaminsky --- scripts/analysis/findbugs-up.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/analysis/findbugs-up.rb b/scripts/analysis/findbugs-up.rb index a84b15e1d..859716d4d 100755 --- a/scripts/analysis/findbugs-up.rb +++ b/scripts/analysis/findbugs-up.rb @@ -18,7 +18,7 @@ TRAVIS_GIT_USERNAME = String.new("Drone CI server") # lintOptions { # htmlOutput file("[FILE_NAME].html") # } -FINDBUGS_REPORT_FILE = String.new("build/reports/spotbugs/spotbugs.html") +FINDBUGS_REPORT_FILE = String.new("app/build/reports/spotbugs/spotbugs.html") # File name and relative path of previous results of this script. PREVIOUS_FINDBUGS_RESULTS_FILE=String.new("scripts/analysis/findbugs-results.txt") From 718a34045a902de8b23d4fab8712be4b4947524e Mon Sep 17 00:00:00 2001 From: Andy Scherzinger Date: Thu, 29 Apr 2021 15:07:14 +0200 Subject: [PATCH 12/18] remove unneccessary annotationProcessor dependecy statements Signed-off-by: Andy Scherzinger --- app/build.gradle | 3 --- 1 file changed, 3 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index d1e33724b..e641ca7b7 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -207,7 +207,6 @@ dependencies { implementation 'com.bluelinelabs:logansquare:1.3.7' implementation 'com.fasterxml.jackson.core:jackson-core:2.12.3' - annotationProcessor 'com.bluelinelabs:logansquare-compiler:1.3.7' kapt 'com.bluelinelabs:logansquare-compiler:1.3.7' implementation "com.squareup.retrofit2:retrofit:${retrofit2Version}" @@ -224,10 +223,8 @@ dependencies { implementation 'io.requery:requery:1.5.1' implementation 'io.requery:requery-android:1.6.1' implementation 'net.zetetic:android-database-sqlcipher:3.5.9' - annotationProcessor 'io.requery:requery-processor:1.6.1' kapt 'io.requery:requery-processor:1.6.1' implementation "org.parceler:parceler-api:$parcelerVersion" - annotationProcessor "org.parceler:parceler:$parcelerVersion" kapt "org.parceler:parceler:$parcelerVersion" implementation 'net.orange-box.storebox:storebox-lib:1.4.0' implementation "com.jakewharton:butterknife:${butterknifeVersion}" From ad9a1e804d5d979ff6bfd3a1748093ce0ab0b80a Mon Sep 17 00:00:00 2001 From: Andy Scherzinger Date: Thu, 29 Apr 2021 15:09:17 +0200 Subject: [PATCH 13/18] removing double-empty-lines on build files Signed-off-by: Andy Scherzinger --- app/build.gradle | 5 ++--- build.gradle | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index e641ca7b7..3a2edb224 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -2,6 +2,8 @@ * Nextcloud Talk application * * @author Mario Danic + * @author Andy Scherzinger + * Copyright (C) 2021 Andy Scherzinger * Copyright (C) 2017-2019 Mario Danic * * This program is free software: you can redistribute it and/or modify @@ -161,14 +163,12 @@ ext { markwonVersion = "4.6.2" } - configurations.all { exclude group: 'com.google.firebase', module: 'firebase-core' exclude group: 'com.google.firebase', module: 'firebase-analytics' exclude group: 'com.google.firebase', module: 'firebase-measurement-connector' } - dependencies { implementation fileTree(include: ['*'], dir: 'libs') implementation 'androidx.appcompat:appcompat:1.2.0' @@ -187,7 +187,6 @@ dependencies { ktlint "com.pinterest:ktlint:0.41.0" implementation 'org.conscrypt:conscrypt-android:2.5.1' - implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0' implementation 'androidx.biometric:biometric:1.0.1' diff --git a/build.gradle b/build.gradle index 25aaf4ddf..18a89796d 100644 --- a/build.gradle +++ b/build.gradle @@ -20,7 +20,6 @@ * along with this program. If not, see . */ - // Top-level build file where you can add configuration options common to all sub-projects/modules. buildscript { @@ -35,6 +34,7 @@ buildscript { maven { url 'https://plugins.gradle.org/m2/' } mavenCentral() } + dependencies { classpath 'com.android.tools.build:gradle:4.1.3' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${kotlinVersion}" From b350a4c86eae6cb2a7475b674bf15abf523171eb Mon Sep 17 00:00:00 2001 From: Andy Scherzinger Date: Thu, 29 Apr 2021 15:44:56 +0200 Subject: [PATCH 14/18] remove default constructors (generated by the compiler) and simplify if-statements of equals-methods Signed-off-by: Andy Scherzinger --- .../filebrowser/models/BrowserFile.java | 9 ++------- .../filebrowser/models/DavResponse.java | 9 ++------- .../talk/events/BottomSheetLockEvent.java | 6 ++---- .../talk/events/ConfigurationChangeEvent.java | 12 +++--------- .../com/nextcloud/talk/events/EventStatus.java | 6 ++---- .../talk/events/MediaStreamEvent.java | 6 ++---- .../talk/events/MoreMenuClickEvent.java | 6 ++---- .../nextcloud/talk/events/NetworkEvent.java | 18 ++++++++---------- .../talk/events/PeerConnectionEvent.java | 6 ++---- .../events/SessionDescriptionSendEvent.java | 6 ++---- .../talk/events/UserMentionClickEvent.java | 6 ++---- .../events/WebSocketCommunicationEvent.java | 6 ++---- .../talk/models/ExternalSignalingServer.java | 9 ++------- .../nextcloud/talk/models/ImportAccount.java | 6 ++---- .../com/nextcloud/talk/models/LoginData.java | 9 ++------- .../nextcloud/talk/models/RetrofitBucket.java | 9 ++------- .../talk/models/RingtoneSettings.java | 9 ++------- .../talk/models/SignatureVerification.java | 9 ++------- .../json/autocomplete/AutocompleteOCS.java | 9 ++------- .../json/autocomplete/AutocompleteOverall.java | 9 ++------- .../json/autocomplete/AutocompleteUser.java | 8 +------- .../models/json/capabilities/Capabilities.java | 9 ++------- .../json/capabilities/CapabilitiesList.java | 9 ++------- .../json/capabilities/CapabilitiesOCS.java | 9 ++------- .../json/capabilities/CapabilitiesOverall.java | 9 ++------- .../capabilities/NotificationsCapability.java | 9 ++------- .../capabilities/ProvisioningCapability.java | 9 ++------- .../json/capabilities/SpreedCapability.java | 9 ++------- .../json/capabilities/ThemingCapability.java | 9 ++------- .../talk/models/json/chat/ChatMessage.java | 9 ++------- .../talk/models/json/chat/ChatOCS.java | 9 ++------- .../models/json/chat/ChatOCSSingleMessage.java | 9 ++------- .../talk/models/json/chat/ChatOverall.java | 9 ++------- .../json/chat/ChatOverallSingleMessage.java | 9 ++------- .../json/conversations/Conversation.java | 14 ++++---------- .../models/json/conversations/RoomOCS.java | 9 ++------- .../models/json/conversations/RoomOverall.java | 9 ++------- .../models/json/conversations/RoomsOCS.java | 9 ++------- .../json/conversations/RoomsOverall.java | 9 ++------- .../talk/models/json/generic/GenericMeta.java | 9 ++------- .../talk/models/json/generic/GenericOCS.java | 9 ++------- .../models/json/generic/GenericOverall.java | 9 ++------- .../talk/models/json/generic/Status.java | 9 ++------- .../talk/models/json/mention/Mention.java | 9 ++------- .../talk/models/json/mention/MentionOCS.java | 9 ++------- .../models/json/mention/MentionOverall.java | 9 ++------- .../json/notifications/Notification.java | 9 ++------- .../json/notifications/NotificationAction.java | 9 ++------- .../json/notifications/NotificationOCS.java | 9 ++------- .../notifications/NotificationOverall.java | 9 ++------- .../notifications/NotificationRichObject.java | 9 ++------- .../json/notifications/NotificationsOCS.java | 9 ++------- .../notifications/NotificationsOverall.java | 9 ++------- .../participants/AddParticipantOverall.java | 9 ++------- .../models/json/participants/Participant.java | 10 ++-------- .../json/participants/ParticipantsOCS.java | 9 ++------- .../json/participants/ParticipantsOverall.java | 9 ++------- .../models/json/push/DecryptedPushMessage.java | 9 ++------- .../models/json/push/NotificationUser.java | 9 ++------- .../json/push/PushConfigurationState.java | 9 ++------- .../models/json/push/PushRegistration.java | 9 ++------- .../models/json/push/PushRegistrationOCS.java | 9 ++------- .../json/push/PushRegistrationOverall.java | 9 ++------- .../json/search/ContactsByNumberOCS.java | 9 ++------- .../json/search/ContactsByNumberOverall.java | 9 ++------- .../talk/models/json/sharees/ExactSharees.java | 9 ++------- .../talk/models/json/sharees/Sharee.java | 9 ++------- .../talk/models/json/sharees/ShareesOCS.java | 9 ++------- .../models/json/sharees/ShareesOverall.java | 9 ++------- .../talk/models/json/sharees/SharesData.java | 9 ++------- .../talk/models/json/sharees/Value.java | 9 ++------- .../json/signaling/DataChannelMessage.java | 6 ++---- .../json/signaling/DataChannelMessageNick.java | 6 ++---- .../models/json/signaling/NCIceCandidate.java | 9 ++------- .../json/signaling/NCMessagePayload.java | 9 ++------- .../json/signaling/NCMessageWrapper.java | 9 ++------- .../json/signaling/NCSignalingMessage.java | 9 ++------- .../talk/models/json/signaling/Signaling.java | 9 ++------- .../models/json/signaling/SignalingOCS.java | 9 ++------- .../json/signaling/SignalingOverall.java | 9 ++------- .../json/signaling/settings/IceServer.java | 9 ++------- .../json/signaling/settings/Settings.java | 9 ++------- .../settings/SignalingSettingsOcs.java | 9 ++------- .../settings/SignalingSettingsOverall.java | 9 ++------- .../json/userprofile/UserProfileData.java | 9 ++------- .../json/userprofile/UserProfileFieldsOCS.java | 9 ++------- .../userprofile/UserProfileFieldsOverall.java | 9 ++------- .../json/userprofile/UserProfileOCS.java | 9 ++------- .../json/userprofile/UserProfileOverall.java | 9 ++------- .../json/websocket/ActorWebSocketMessage.java | 9 ++------- .../AuthParametersWebSocketMessage.java | 9 ++------- .../json/websocket/AuthWebSocketMessage.java | 9 ++------- .../json/websocket/BaseWebSocketMessage.java | 9 ++------- .../json/websocket/ByeWebSocketMessage.java | 9 ++------- .../websocket/CallOverallWebSocketMessage.java | 9 ++------- .../json/websocket/CallWebSocketMessage.java | 9 ++------- .../ErrorOverallWebSocketMessage.java | 9 ++------- .../json/websocket/ErrorWebSocketMessage.java | 9 ++------- .../EventOverallWebSocketMessage.java | 9 ++------- .../HelloOverallWebSocketMessage.java | 9 ++------- .../HelloResponseOverallWebSocketMessage.java | 9 ++------- .../HelloResponseWebSocketMessage.java | 9 ++------- .../json/websocket/HelloWebSocketMessage.java | 9 ++------- .../JoinedRoomOverallWebSocketMessage.java | 9 ++------- .../RequestOfferOverallWebSocketMessage.java | 9 ++------- .../RequestOfferSignalingMessage.java | 9 ++------- .../websocket/RoomOverallWebSocketMessage.java | 9 ++------- .../RoomPropertiesWebSocketMessage.java | 9 ++------- .../json/websocket/RoomWebSocketMessage.java | 9 ++------- ...rHelloResponseFeaturesWebSocketMessage.java | 9 ++------- .../SignalingDataWebSocketMessageForOffer.java | 9 ++------- .../com/nextcloud/talk/utils/text/Spans.java | 6 ++---- 112 files changed, 232 insertions(+), 757 deletions(-) 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 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 data; - public AutocompleteOCS() { - } - public List 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 features; - public NotificationsCapability() { - } - public List 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> config; - public SpreedCapability() { - } - public List 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 data; - public ChatOCS() { - } - public List 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 data; - public RoomsOCS() { - } - public List 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 data; - public MentionOCS() { - } - public List 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 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 notificationsList; - public NotificationsOCS() { - } - public List 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 data; - public ParticipantsOCS() { - } - public List 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 map = new HashMap(); - public ContactsByNumberOCS() { - } - public Map 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 exactSharees; - public ExactSharees() { - } - public List 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 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 signalings; - public SignalingOCS() { - } - public List 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 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 data; - public UserProfileFieldsOCS() { - } - public ArrayList 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 bye; - public ByeWebSocketMessage() { - } - public HashMap 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 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 features; - public ServerHelloResponseFeaturesWebSocketMessage() { - } - public List 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) { From 9f2a1b75b1bf056d2f73ec2a4dd9704af1ce9a39 Mon Sep 17 00:00:00 2001 From: Andy Scherzinger Date: Thu, 29 Apr 2021 16:55:36 +0200 Subject: [PATCH 15/18] bump spotbugs score Signed-off-by: Andy Scherzinger --- scripts/analysis/findbugs-results.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/analysis/findbugs-results.txt b/scripts/analysis/findbugs-results.txt index eed0d1a4a..84ccffd55 100644 --- a/scripts/analysis/findbugs-results.txt +++ b/scripts/analysis/findbugs-results.txt @@ -1 +1 @@ -506 \ No newline at end of file +505 \ No newline at end of file From 4e3ab033e329648db665977152c4f98ca02dbaaa Mon Sep 17 00:00:00 2001 From: Andy Scherzinger Date: Thu, 29 Apr 2021 17:21:32 +0200 Subject: [PATCH 16/18] use proper repo path Signed-off-by: Andy Scherzinger --- scripts/analysis/findbugs-up.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/analysis/findbugs-up.rb b/scripts/analysis/findbugs-up.rb index 859716d4d..eb37f7ea4 100755 --- a/scripts/analysis/findbugs-up.rb +++ b/scripts/analysis/findbugs-up.rb @@ -120,7 +120,7 @@ previous_git_email = previous_git_email.strip system ("git config --local user.name '" + git_user + "'") system ("git config --local user.email 'android@nextcloud.com'") system ("git remote rm origin") -system ("git remote add origin https://" + git_user + ":" + git_token + "@github.com/nextcloud/android") +system ("git remote add origin https://" + git_user + ":" + git_token + "@github.com/nextcloud/talk-android") # add previous FindBugs result file to git system ('git add ' + PREVIOUS_FINDBUGS_RESULTS_FILE) From c46cf9125b78b554de0dc18499d379930d1a8229 Mon Sep 17 00:00:00 2001 From: Andy Scherzinger Date: Thu, 29 Apr 2021 17:40:23 +0200 Subject: [PATCH 17/18] spotbugs: remove: needlessly boxes a boolean constant Signed-off-by: Andy Scherzinger --- .../talk/utils/database/user/UserUtils.java | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/app/src/main/java/com/nextcloud/talk/utils/database/user/UserUtils.java b/app/src/main/java/com/nextcloud/talk/utils/database/user/UserUtils.java index d0a7aeffb..6871a740a 100644 --- a/app/src/main/java/com/nextcloud/talk/utils/database/user/UserUtils.java +++ b/app/src/main/java/com/nextcloud/talk/utils/database/user/UserUtils.java @@ -44,7 +44,7 @@ public class UserUtils { } public boolean anyUserExists() { - return (dataStore.count(User.class).where(UserEntity.SCHEDULED_FOR_DELETION.notEqual(true)) + return (dataStore.count(User.class).where(UserEntity.SCHEDULED_FOR_DELETION.notEqual(Boolean.TRUE)) .limit(1).get().value() > 0); } @@ -56,8 +56,8 @@ public class UserUtils { } public List getUsersScheduledForDeletion() { - Result findUsersQueryResult = dataStore.select(User.class).where(UserEntity.SCHEDULED_FOR_DELETION.eq(true)) - .get(); + Result findUsersQueryResult = dataStore.select(User.class) + .where(UserEntity.SCHEDULED_FOR_DELETION.eq(Boolean.TRUE)).get(); return findUsersQueryResult.toList(); } @@ -65,7 +65,7 @@ public class UserUtils { public UserEntity getAnyUserAndSetAsActive() { Result findUserQueryResult = dataStore.select(User.class) - .where(UserEntity.SCHEDULED_FOR_DELETION.notEqual(true)) + .where(UserEntity.SCHEDULED_FOR_DELETION.notEqual(Boolean.TRUE)) .limit(1).get(); UserEntity userEntity; @@ -79,8 +79,8 @@ public class UserUtils { } public @Nullable UserEntity getCurrentUser() { - Result findUserQueryResult = dataStore.select(User.class).where(UserEntity.CURRENT.eq(true) - .and(UserEntity.SCHEDULED_FOR_DELETION.notEqual(true))) + Result findUserQueryResult = dataStore.select(User.class).where(UserEntity.CURRENT.eq(Boolean.TRUE) + .and(UserEntity.SCHEDULED_FOR_DELETION.notEqual(Boolean.TRUE))) .limit(1).get(); return (UserEntity) findUserQueryResult.firstOrNull(); @@ -143,12 +143,11 @@ public class UserUtils { } return false; - } public UserEntity getUserWithInternalId(long internalId) { Result findUserQueryResult = dataStore.select(User.class).where(UserEntity.ID.eq(internalId) - .and(UserEntity.SCHEDULED_FOR_DELETION.notEqual(true))) + .and(UserEntity.SCHEDULED_FOR_DELETION.notEqual(Boolean.TRUE))) .limit(1).get(); return (UserEntity) findUserQueryResult.firstOrNull(); @@ -174,7 +173,6 @@ public class UserUtils { } return getAnyUserAndSetAsActive() != null; - } public Observable createOrUpdateUser(@Nullable String username, @Nullable String token, @@ -268,5 +266,4 @@ public class UserUtils { .toObservable() .subscribeOn(Schedulers.io()); } - } From cabbd7bfedbae93316c357099d6d82ea96482b55 Mon Sep 17 00:00:00 2001 From: Andy Scherzinger Date: Thu, 29 Apr 2021 17:48:18 +0200 Subject: [PATCH 18/18] Drone: update FindBugs results to reflect reduced error/warning count [skip ci] Signed-off-by: Andy Scherzinger --- scripts/analysis/findbugs-results.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/analysis/findbugs-results.txt b/scripts/analysis/findbugs-results.txt index 84ccffd55..9889789ba 100644 --- a/scripts/analysis/findbugs-results.txt +++ b/scripts/analysis/findbugs-results.txt @@ -1 +1 @@ -505 \ No newline at end of file +499 \ No newline at end of file