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

Commit 68a1626

Browse files
rafaelksrafaelks
authored
Merge pull request #1490 from RocketChat/beta
[RELEASE] Merge BETA into MASTER
2 parents 1bb668c + 8dd30e5 commit 68a1626

508 files changed

Lines changed: 10599 additions & 3848 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.circleci/config.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ jobs:
9393
- run:
9494
name: Build APK
9595
command: |
96-
./gradlew assembleRelease --quiet --console=plain --stacktrace
96+
./gradlew assembleRelease --info --console=plain --stacktrace
9797
- store_artifacts:
9898
path: app/build/outputs/apk
9999
destination: apks

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ This repository contains all the code related to the Android native application
1111

1212
## How to build
1313

14-
- Android Studio 3.0+ comes with built in kotlin support, so install the latest version (3.0+) of Android Studio (recommended). For older versions, you need to manually install kotlin plugin. Go to `File > Settings > Plugins` and search for `kotlin` and install it. You'll need to restart the IDE in order to see the changes.
14+
- You need to download the latest [Android Studio Preview](https://developer.android.com/studio/preview/) version since the stable IDE version does not support the [JetPack](https://developer.android.com/jetpack/) that is beeing used on this application.
1515
- Make sure that you have the latest **gradle** and the **android plugin** versions installed. Go to `File > Project Structure > Project` and make sure that you have the latest versions installed. Refer [this](https://developer.android.com/studio/releases/gradle-plugin.html#updating-gradle) to see the compatible versions.
1616
- Kotlin is already configured in the project. To check, go to `Tools > Kotlin > Configure Kotlin in project`. A message saying kotlin is already configured in the project pops up. You can update kotlin to the latest version by going to `Tools > Kotlin > Configure Kotlin updates` and download the latest version of kotlin.
1717

‎app/build.gradle‎

Lines changed: 21 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -3,20 +3,25 @@ apply plugin: 'io.fabric'
33
apply plugin: 'kotlin-android'
44
apply plugin: 'kotlin-android-extensions'
55
apply plugin: 'kotlin-kapt'
6-
apply plugin: 'realm-android'
76

87
android {
98
compileSdkVersion versions.compileSdk
109
buildToolsVersion versions.buildTools
1110

1211
defaultConfig {
1312
applicationId "chat.rocket.android"
14-
minSdkVersion 21
13+
minSdkVersion versions.minSdk
1514
targetSdkVersion versions.targetSdk
16-
versionCode 2027
17-
versionName "2.4.0"
18-
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
15+
versionCode 2034
16+
versionName "2.5.0"
17+
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
1918
multiDexEnabled true
19+
20+
javaCompileOptions {
21+
annotationProcessorOptions {
22+
arguments = ["room.schemaLocation": "$projectDir/schemas".toString()]
23+
}
24+
}
2025
}
2126

2227
signingConfigs {
@@ -62,18 +67,22 @@ dependencies {
6267
implementation fileTree(include: ['*.jar'], dir: 'libs')
6368

6469
implementation project(':player')
70+
implementation project(':emoji')
71+
implementation project(':draw')
72+
implementation project(':util')
73+
implementation project(':core')
6574

6675
implementation libraries.kotlin
6776
implementation libraries.coroutines
6877
implementation libraries.coroutinesAndroid
6978

7079
implementation libraries.appCompat
7180
implementation libraries.recyclerview
72-
implementation libraries.design
73-
implementation libraries.constraintLayout
74-
implementation libraries.cardView
81+
implementation libraries.material
82+
implementation libraries.constraintlayout
83+
implementation libraries.cardview
7584
implementation libraries.flexbox
76-
implementation libraries.customTabs
85+
implementation libraries.browser
7786

7887
implementation libraries.androidKtx
7988

@@ -87,7 +96,6 @@ dependencies {
8796

8897
implementation libraries.room
8998
kapt libraries.roomProcessor
90-
implementation libraries.roomRxjava
9199
implementation libraries.lifecycleExtensions
92100
kapt libraries.lifecycleCompiler
93101

@@ -100,7 +108,6 @@ dependencies {
100108

101109
implementation libraries.timber
102110
implementation libraries.threeTenABP
103-
implementation libraries.rxBinding
104111

105112
implementation libraries.fresco
106113
api libraries.frescoOkHttp
@@ -115,11 +122,11 @@ dependencies {
115122

116123
implementation libraries.markwon
117124

118-
implementation libraries.sheetMenu
119-
120125
implementation libraries.aVLoadingIndicatorView
121126

122-
implementation('com.crashlytics.sdk.android:crashlytics:2.6.8@aar') {
127+
implementation "com.github.luciofm:livedata-ktx:b1e8bbc25a"
128+
129+
implementation('com.crashlytics.sdk.android:crashlytics:2.9.2@aar') {
123130
transitive = true
124131
}
125132

‎app/schemas/chat.rocket.android.db.RCDatabase/3.json‎

Lines changed: 273 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,273 @@
1+
{
2+
"formatVersion": 1,
3+
"database": {
4+
"version": 3,
5+
"identityHash": "06359a8c2943365dd094bc5dff210203",
6+
"entities": [
7+
{
8+
"tableName": "users",
9+
"createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` TEXT NOT NULL, `username` TEXT, `name` TEXT, `status` TEXT NOT NULL, `utcOffset` REAL, PRIMARY KEY(`id`))",
10+
"fields": [
11+
{
12+
"fieldPath": "id",
13+
"columnName": "id",
14+
"affinity": "TEXT",
15+
"notNull": true
16+
},
17+
{
18+
"fieldPath": "username",
19+
"columnName": "username",
20+
"affinity": "TEXT",
21+
"notNull": false
22+
},
23+
{
24+
"fieldPath": "name",
25+
"columnName": "name",
26+
"affinity": "TEXT",
27+
"notNull": false
28+
},
29+
{
30+
"fieldPath": "status",
31+
"columnName": "status",
32+
"affinity": "TEXT",
33+
"notNull": true
34+
},
35+
{
36+
"fieldPath": "utcOffset",
37+
"columnName": "utcOffset",
38+
"affinity": "REAL",
39+
"notNull": false
40+
}
41+
],
42+
"primaryKey": {
43+
"columnNames": [
44+
"id"
45+
],
46+
"autoGenerate": false
47+
},
48+
"indices": [
49+
{
50+
"name": "index_users_username",
51+
"unique": false,
52+
"columnNames": [
53+
"username"
54+
],
55+
"createSql": "CREATE INDEX `index_users_username` ON `${TABLE_NAME}` (`username`)"
56+
}
57+
],
58+
"foreignKeys": []
59+
},
60+
{
61+
"tableName": "chatrooms",
62+
"createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` TEXT NOT NULL, `subscriptionId` TEXT NOT NULL, `type` TEXT NOT NULL, `name` TEXT NOT NULL, `fullname` TEXT, `userId` TEXT, `ownerId` TEXT, `readonly` INTEGER, `isDefault` INTEGER, `favorite` INTEGER, `open` INTEGER NOT NULL, `alert` INTEGER NOT NULL, `unread` INTEGER NOT NULL, `userMentions` INTEGER, `groupMentions` INTEGER, `updatedAt` INTEGER, `timestamp` INTEGER, `lastSeen` INTEGER, `lastMessageText` TEXT, `lastMessageUserId` TEXT, `lastMessageTimestamp` INTEGER, PRIMARY KEY(`id`), FOREIGN KEY(`ownerId`) REFERENCES `users`(`id`) ON UPDATE NO ACTION ON DELETE NO ACTION , FOREIGN KEY(`userId`) REFERENCES `users`(`id`) ON UPDATE NO ACTION ON DELETE NO ACTION , FOREIGN KEY(`lastMessageUserId`) REFERENCES `users`(`id`) ON UPDATE NO ACTION ON DELETE NO ACTION )",
63+
"fields": [
64+
{
65+
"fieldPath": "id",
66+
"columnName": "id",
67+
"affinity": "TEXT",
68+
"notNull": true
69+
},
70+
{
71+
"fieldPath": "subscriptionId",
72+
"columnName": "subscriptionId",
73+
"affinity": "TEXT",
74+
"notNull": true
75+
},
76+
{
77+
"fieldPath": "type",
78+
"columnName": "type",
79+
"affinity": "TEXT",
80+
"notNull": true
81+
},
82+
{
83+
"fieldPath": "name",
84+
"columnName": "name",
85+
"affinity": "TEXT",
86+
"notNull": true
87+
},
88+
{
89+
"fieldPath": "fullname",
90+
"columnName": "fullname",
91+
"affinity": "TEXT",
92+
"notNull": false
93+
},
94+
{
95+
"fieldPath": "userId",
96+
"columnName": "userId",
97+
"affinity": "TEXT",
98+
"notNull": false
99+
},
100+
{
101+
"fieldPath": "ownerId",
102+
"columnName": "ownerId",
103+
"affinity": "TEXT",
104+
"notNull": false
105+
},
106+
{
107+
"fieldPath": "readonly",
108+
"columnName": "readonly",
109+
"affinity": "INTEGER",
110+
"notNull": false
111+
},
112+
{
113+
"fieldPath": "isDefault",
114+
"columnName": "isDefault",
115+
"affinity": "INTEGER",
116+
"notNull": false
117+
},
118+
{
119+
"fieldPath": "favorite",
120+
"columnName": "favorite",
121+
"affinity": "INTEGER",
122+
"notNull": false
123+
},
124+
{
125+
"fieldPath": "open",
126+
"columnName": "open",
127+
"affinity": "INTEGER",
128+
"notNull": true
129+
},
130+
{
131+
"fieldPath": "alert",
132+
"columnName": "alert",
133+
"affinity": "INTEGER",
134+
"notNull": true
135+
},
136+
{
137+
"fieldPath": "unread",
138+
"columnName": "unread",
139+
"affinity": "INTEGER",
140+
"notNull": true
141+
},
142+
{
143+
"fieldPath": "userMentions",
144+
"columnName": "userMentions",
145+
"affinity": "INTEGER",
146+
"notNull": false
147+
},
148+
{
149+
"fieldPath": "groupMentions",
150+
"columnName": "groupMentions",
151+
"affinity": "INTEGER",
152+
"notNull": false
153+
},
154+
{
155+
"fieldPath": "updatedAt",
156+
"columnName": "updatedAt",
157+
"affinity": "INTEGER",
158+
"notNull": false
159+
},
160+
{
161+
"fieldPath": "timestamp",
162+
"columnName": "timestamp",
163+
"affinity": "INTEGER",
164+
"notNull": false
165+
},
166+
{
167+
"fieldPath": "lastSeen",
168+
"columnName": "lastSeen",
169+
"affinity": "INTEGER",
170+
"notNull": false
171+
},
172+
{
173+
"fieldPath": "lastMessageText",
174+
"columnName": "lastMessageText",
175+
"affinity": "TEXT",
176+
"notNull": false
177+
},
178+
{
179+
"fieldPath": "lastMessageUserId",
180+
"columnName": "lastMessageUserId",
181+
"affinity": "TEXT",
182+
"notNull": false
183+
},
184+
{
185+
"fieldPath": "lastMessageTimestamp",
186+
"columnName": "lastMessageTimestamp",
187+
"affinity": "INTEGER",
188+
"notNull": false
189+
}
190+
],
191+
"primaryKey": {
192+
"columnNames": [
193+
"id"
194+
],
195+
"autoGenerate": false
196+
},
197+
"indices": [
198+
{
199+
"name": "index_chatrooms_userId",
200+
"unique": false,
201+
"columnNames": [
202+
"userId"
203+
],
204+
"createSql": "CREATE INDEX `index_chatrooms_userId` ON `${TABLE_NAME}` (`userId`)"
205+
},
206+
{
207+
"name": "index_chatrooms_ownerId",
208+
"unique": false,
209+
"columnNames": [
210+
"ownerId"
211+
],
212+
"createSql": "CREATE INDEX `index_chatrooms_ownerId` ON `${TABLE_NAME}` (`ownerId`)"
213+
},
214+
{
215+
"name": "index_chatrooms_subscriptionId",
216+
"unique": true,
217+
"columnNames": [
218+
"subscriptionId"
219+
],
220+
"createSql": "CREATE UNIQUE INDEX `index_chatrooms_subscriptionId` ON `${TABLE_NAME}` (`subscriptionId`)"
221+
},
222+
{
223+
"name": "index_chatrooms_updatedAt",
224+
"unique": false,
225+
"columnNames": [
226+
"updatedAt"
227+
],
228+
"createSql": "CREATE INDEX `index_chatrooms_updatedAt` ON `${TABLE_NAME}` (`updatedAt`)"
229+
}
230+
],
231+
"foreignKeys": [
232+
{
233+
"table": "users",
234+
"onDelete": "NO ACTION",
235+
"onUpdate": "NO ACTION",
236+
"columns": [
237+
"ownerId"
238+
],
239+
"referencedColumns": [
240+
"id"
241+
]
242+
},
243+
{
244+
"table": "users",
245+
"onDelete": "NO ACTION",
246+
"onUpdate": "NO ACTION",
247+
"columns": [
248+
"userId"
249+
],
250+
"referencedColumns": [
251+
"id"
252+
]
253+
},
254+
{
255+
"table": "users",
256+
"onDelete": "NO ACTION",
257+
"onUpdate": "NO ACTION",
258+
"columns": [
259+
"lastMessageUserId"
260+
],
261+
"referencedColumns": [
262+
"id"
263+
]
264+
}
265+
]
266+
}
267+
],
268+
"setupQueries": [
269+
"CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
270+
"INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, \"06359a8c2943365dd094bc5dff210203\")"
271+
]
272+
}
273+
}

0 commit comments

Comments
 (0)