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

Migrate DataChannel model to kotlin data classes

Browse Source 
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
This commit is contained in:
Andy Scherzinger 2022-05-17 22:59:24 +02:00
parent cf568a00eb
commit 1e4775aed0
No known key found for this signature in database
GPG Key ID: 6CADC7E3523C308B
4 changed files with 83 additions and 202 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

100
app/src/main/java/com/nextcloud/talk/models/json/signaling/DataChannelMessage.java
View File

@ -1,100 +0,0 @@
/*
* Nextcloud Talk application
*
* @author Mario Danic
* Copyright (C) 2017 Mario Danic <mario@lovelyhq.com>
*
* 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 <http://www.gnu.org/licenses/>.
*/
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 org.parceler.ParcelPropertyConverter;
@JsonObject
public class DataChannelMessage {
@JsonField(name = "type")
String type;
@ParcelPropertyConverter(ObjectParcelConverter.class)
@JsonField(name = "payload")
Object payload;
public DataChannelMessage(String type) {
this.type = type;
}
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();
return this$payload == null ? other$payload == null : this$payload.equals(other$payload);
}
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() + ")";
}
}

43
app/src/main/java/com/nextcloud/talk/models/json/signaling/DataChannelMessage.kt Normal file
View File

@ -0,0 +1,43 @@
/*
* Nextcloud Talk application
*
* @author Mario Danic
* @author Andy Scherzinger
* Copyright (C) 2022 Andy Scherzinger <info@andy-scherzinger.de>
* Copyright (C) 2017 Mario Danic <mario@lovelyhq.com>
*
* 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 <http://www.gnu.org/licenses/>.
*/
package com.nextcloud.talk.models.json.signaling
import android.os.Parcelable
import com.bluelinelabs.logansquare.annotation.JsonField
import com.bluelinelabs.logansquare.annotation.JsonObject
import com.nextcloud.talk.models.json.AnyParceler
import kotlinx.android.parcel.Parcelize
import kotlinx.android.parcel.TypeParceler
@Parcelize
@JsonObject
@TypeParceler<Any?, AnyParceler>
data class DataChannelMessage(
@JsonField(name = ["type"])
var type: String? = null,
@JsonField(name = ["payload"])
var payload: Any? = null
) : Parcelable {
// This constructor is added to work with the 'com.bluelinelabs.logansquare.annotation.JsonObject'
constructor() : this(null, null)
constructor(type: String) : this(type, null)
}

102
app/src/main/java/com/nextcloud/talk/models/json/signaling/DataChannelMessageNick.java
View File

@ -1,102 +0,0 @@
/*
* Nextcloud Talk application
*
* @author Mario Danic
* Copyright (C) 2017 Mario Danic <mario@lovelyhq.com>
*
* 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 <http://www.gnu.org/licenses/>.
*/
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 org.parceler.ParcelPropertyConverter;
import java.util.HashMap;
@JsonObject
public class DataChannelMessageNick {
@JsonField(name = "type")
String type;
@ParcelPropertyConverter(ObjectParcelConverter.class)
@JsonField(name = "payload")
HashMap<String, String> payload;
public DataChannelMessageNick(String type) {
this.type = type;
}
public DataChannelMessageNick() {
}
public String getType() {
return this.type;
}
public HashMap<String, String> getPayload() {
return this.payload;
}
public void setType(String type) {
this.type = type;
}
public void setPayload(HashMap<String, String> 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();
return this$payload == null ? other$payload == null : this$payload.equals(other$payload);
}
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() + ")";
}
}

40
app/src/main/java/com/nextcloud/talk/models/json/signaling/DataChannelMessageNick.kt Normal file
View File

@ -0,0 +1,40 @@
/*
* Nextcloud Talk application
*
* @author Mario Danic
* @author Andy Scherzinger
* Copyright (C) 2022 Andy Scherzinger <info@andy-scherzinger.de>
* Copyright (C) 2017 Mario Danic <mario@lovelyhq.com>
*
* 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 <http://www.gnu.org/licenses/>.
*/
package com.nextcloud.talk.models.json.signaling
import android.os.Parcelable
import com.bluelinelabs.logansquare.annotation.JsonField
import com.bluelinelabs.logansquare.annotation.JsonObject
import java.util.HashMap
import kotlinx.android.parcel.Parcelize
@Parcelize
@JsonObject
data class DataChannelMessageNick(
@JsonField(name = ["type"])
var type: String? = null,
@JsonField(name = ["payload"])
var payload: HashMap<String, String>? = null
) : Parcelable {
// This constructor is added to work with the 'com.bluelinelabs.logansquare.annotation.JsonObject'
constructor() : this(null, null)
}