mirror of
https://codeberg.org/Mercury-IM/Mercury-IM
synced 2024-09-20 23:09:35 +02:00
Remove nickname field from contactModel
This commit is contained in:
parent
c22f9a8fe2
commit
c8f260c55f
|
@ -2,7 +2,7 @@
|
|||
"formatVersion": 1,
|
||||
"database": {
|
||||
"version": 1,
|
||||
"identityHash": "aa41a1d6727ebded374388bdd6cf8456",
|
||||
"identityHash": "3101152b94f78344b348b040386bb144",
|
||||
"entities": [
|
||||
{
|
||||
"tableName": "accounts",
|
||||
|
@ -121,7 +121,7 @@
|
|||
},
|
||||
{
|
||||
"tableName": "contacts",
|
||||
"createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`pk_contact_id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `fk_entity_id` INTEGER NOT NULL, `rostername` TEXT, `nickname` TEXT, `direction` TEXT, `sub_pending` INTEGER NOT NULL, `approved` INTEGER NOT NULL, FOREIGN KEY(`fk_entity_id`) REFERENCES `entities`(`pk_entity_id`) ON UPDATE NO ACTION ON DELETE RESTRICT )",
|
||||
"createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`pk_contact_id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `fk_entity_id` INTEGER NOT NULL, `rostername` TEXT, `direction` TEXT, `sub_pending` INTEGER NOT NULL, `approved` INTEGER NOT NULL, FOREIGN KEY(`fk_entity_id`) REFERENCES `entities`(`pk_entity_id`) ON UPDATE NO ACTION ON DELETE RESTRICT )",
|
||||
"fields": [
|
||||
{
|
||||
"fieldPath": "id",
|
||||
|
@ -141,12 +141,6 @@
|
|||
"affinity": "TEXT",
|
||||
"notNull": false
|
||||
},
|
||||
{
|
||||
"fieldPath": "nickname",
|
||||
"columnName": "nickname",
|
||||
"affinity": "TEXT",
|
||||
"notNull": false
|
||||
},
|
||||
{
|
||||
"fieldPath": "direction",
|
||||
"columnName": "direction",
|
||||
|
@ -277,13 +271,13 @@
|
|||
"notNull": true
|
||||
},
|
||||
{
|
||||
"fieldPath": "mostRecentMamMessage",
|
||||
"fieldPath": "mostRecentMamMessageId",
|
||||
"columnName": "most_recent_mam_msg",
|
||||
"affinity": "TEXT",
|
||||
"notNull": false
|
||||
},
|
||||
{
|
||||
"fieldPath": "earliestMamMsg",
|
||||
"fieldPath": "earliestMamMessageId",
|
||||
"columnName": "earliest_mam_msg",
|
||||
"affinity": "TEXT",
|
||||
"notNull": false
|
||||
|
@ -518,7 +512,7 @@
|
|||
"views": [],
|
||||
"setupQueries": [
|
||||
"CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
|
||||
"INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, 'aa41a1d6727ebded374388bdd6cf8456')"
|
||||
"INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, '3101152b94f78344b348b040386bb144')"
|
||||
]
|
||||
}
|
||||
}
|
|
@ -36,7 +36,6 @@ public class RoomContactModel implements ContactModel {
|
|||
public static final String KEY_ID = "pk_contact_id";
|
||||
public static final String KEY_ENTITY_ID = "fk_entity_id";
|
||||
public static final String KEY_ROSTER_NAME = "rostername";
|
||||
public static final String KEY_NICKNAME = "nickname";
|
||||
public static final String KEY_SUB_DIRECTION = "direction";
|
||||
public static final String KEY_SUB_PENDING = "sub_pending";
|
||||
public static final String KEY_SUB_APPROVED = "approved";
|
||||
|
@ -51,9 +50,6 @@ public class RoomContactModel implements ContactModel {
|
|||
@ColumnInfo(name = KEY_ROSTER_NAME)
|
||||
private String rosterName;
|
||||
|
||||
@ColumnInfo(name = KEY_NICKNAME)
|
||||
private String nickname;
|
||||
|
||||
@ColumnInfo(name = KEY_SUB_DIRECTION)
|
||||
@TypeConverters(DirectionConverter.class)
|
||||
private DIRECTION direction;
|
||||
|
@ -101,16 +97,6 @@ public class RoomContactModel implements ContactModel {
|
|||
this.rosterName = rosterName;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getNickname() {
|
||||
return nickname;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void setNickname(String nickname) {
|
||||
this.nickname = nickname;
|
||||
}
|
||||
|
||||
@Override
|
||||
public DIRECTION getDirection() {
|
||||
return direction;
|
||||
|
@ -159,7 +145,6 @@ public class RoomContactModel implements ContactModel {
|
|||
KEY_ID + ": " + getId() + ", " +
|
||||
KEY_ENTITY_ID + ": " + getEntityId() + ", " +
|
||||
KEY_ROSTER_NAME + ": " + getRosterName() + ", " +
|
||||
KEY_NICKNAME + ": " + getNickname() + ", " +
|
||||
KEY_SUB_DIRECTION + ": " + getDirection() + ", " +
|
||||
KEY_SUB_PENDING + ": " + isSubscriptionPending() + ", " +
|
||||
KEY_SUB_APPROVED + ": " + isApproved() +
|
||||
|
|
|
@ -14,10 +14,6 @@ public interface ContactModel<E extends EntityModel> {
|
|||
|
||||
void setRosterName(String rosterName);
|
||||
|
||||
String getNickname();
|
||||
|
||||
void setNickname(String nickname);
|
||||
|
||||
DIRECTION getDirection();
|
||||
|
||||
void setDirection(DIRECTION direction);
|
||||
|
|
Loading…
Reference in a new issue