Skip to content
This repository was archived by the owner on Jun 7, 2020. It is now read-only.

Commit eaccad7

Browse files
authored
Merge pull request #2280 from RocketChat/hotfix/chat-list-not-showing
[HOTFIX] Chat list now showing.
2 parents 25efdb1 + 142b6c4 commit eaccad7

File tree

14 files changed

+1229
-95
lines changed

14 files changed

+1229
-95
lines changed

app/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ android {
1818
applicationId "chat.rocket.android"
1919
minSdkVersion versions.minSdk
2020
targetSdkVersion versions.targetSdk
21-
versionCode 2060
22-
versionName "3.3.0"
21+
versionCode 2064
22+
versionName "3.3.1"
2323
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
2424
multiDexEnabled true
2525

app/schemas/chat.rocket.android.db.RCDatabase/11.json

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"formatVersion": 1,
33
"database": {
44
"version": 11,
5-
"identityHash": "fb9f1c815809b0217d326452aeb34e92",
5+
"identityHash": "1984b5661945bd83607d9a7043ed87b0",
66
"entities": [
77
{
88
"tableName": "users",
@@ -1013,7 +1013,7 @@
10131013
},
10141014
{
10151015
"tableName": "reactions",
1016-
"createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`reaction` TEXT NOT NULL, `messageId` TEXT NOT NULL, `count` INTEGER NOT NULL, `usernames` TEXT NOT NULL, PRIMARY KEY(`reaction`), FOREIGN KEY(`messageId`) REFERENCES `messages`(`id`) ON UPDATE NO ACTION ON DELETE CASCADE )",
1016+
"createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`reaction` TEXT NOT NULL, `messageId` TEXT NOT NULL, `count` INTEGER NOT NULL, `usernames` TEXT NOT NULL, `names` TEXT NOT NULL, PRIMARY KEY(`reaction`), FOREIGN KEY(`messageId`) REFERENCES `messages`(`id`) ON UPDATE NO ACTION ON DELETE CASCADE )",
10171017
"fields": [
10181018
{
10191019
"fieldPath": "reaction",
@@ -1038,6 +1038,12 @@
10381038
"columnName": "usernames",
10391039
"affinity": "TEXT",
10401040
"notNull": true
1041+
},
1042+
{
1043+
"fieldPath": "names",
1044+
"columnName": "names",
1045+
"affinity": "TEXT",
1046+
"notNull": true
10411047
}
10421048
],
10431049
"primaryKey": {
@@ -1099,7 +1105,7 @@
10991105
],
11001106
"setupQueries": [
11011107
"CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
1102-
"INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, \"fb9f1c815809b0217d326452aeb34e92\")"
1108+
"INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, \"1984b5661945bd83607d9a7043ed87b0\")"
11031109
]
11041110
}
11051111
}

0 commit comments

Comments
 (0)