Matrix/element-android-Github
1
0
Fork 0
mirror of https://github.com/vector-im/element-android.git synced 2024-11-17 02:15:17 +08:00
Code Issues Packages Projects Releases Wiki Activity
1,827 Commits 530 Branches 157 Tags 485 MiB
4690754f5f
Commit Graph

835 Commits

Author SHA1 Message Date
Matthew Hodgson
2e87e0b4c1 fix typo 2019-11-21 01:41:59 +00:00
ganfra
6b1b3bec85 Clean code for klint 2019-11-14 13:25:04 +01:00
ganfra
6bd6ececb7 Timeline: handle sticker events 2019-11-14 13:23:12 +01:00
ganfra
c7db695e67 Timeline: handle join rules event 2019-11-14 12:21:55 +01:00
ganfra
79350899c5 Read receipts: use primary key to query 2019-11-13 19:21:14 +01:00
ganfra
2e50d2a36e Clean code for klint 2019-11-13 11:38:30 +01:00
ganfra
643c062858 Merge branch 'develop' into feature/perf_again 2019-11-13 10:44:59 +01:00
ganfra
ec71b53c1e RoomSummary: don't map read receipts 2019-11-12 19:25:21 +01:00
Benoit Marty
fc91694bdd
Merge pull request #673 from vector-im/feature/us 
Update strings
 2019-11-12 12:08:55 +01:00
ganfra
1bd2c0d220 Merge branch 'develop' into feature/perf_again 2019-11-08 17:09:22 +01:00
ganfra
bcb811a7e8 Realm perf: use Dispatchers.Default for write, as we don't want to create so many threads (and we can only have one write transaction at a time) 2019-11-08 17:08:44 +01:00
ganfra
17f3614288 Perf: try to optimize room summary updates 2019-11-08 13:48:35 +01:00
ganfra
61ac250e2b Merge branch 'develop' into feature/room_list_actions 2019-11-07 15:43:21 +01:00
Benoit Marty
b6bb714264 Display name and avatar of the user 2019-11-07 14:18:57 +01:00
Benoit Marty
a87310ac15 update comment 2019-11-07 14:18:57 +01:00
Benoit Marty
032e1b3d19 ktlint 2019-11-07 14:18:57 +01:00
Benoit Marty
9c952b6bc8 Display ignored users list 2019-11-07 14:18:57 +01:00
Benoit Marty
fbae3d27c2 Ignore/Unignore userIds 2019-11-07 14:13:29 +01:00
Benoit Marty
2f7d1f9f01 Ignored Users account data 2019-11-07 14:13:29 +01:00
Benoit Marty
114101699d Fix potential ignoring of account data (return@foreach) 2019-11-07 14:13:29 +01:00
Benoit Marty
2027802f82 Add debug screen for all SAS emoji 2019-11-07 10:37:49 +01:00
ganfra
3af7ca9ab0 Retrofit: lazy init okhttp 2019-11-06 20:07:28 +01:00
ganfra
93ef3edab3 Remove some use of sync write in realm 2019-11-06 18:47:11 +01:00
Benoit Marty
d0c3271628 Import string from Riot-Android and fix #671 2019-11-06 18:19:37 +01:00
ganfra
ad9a48d5fa Clean code 2019-11-05 18:36:30 +01:00
Benoit Marty
9d478dbfe2 Import change form https://github.com/matrix-org/matrix-android-sdk/pull/505 2019-11-05 11:18:22 +01:00
ganfra
93df8c56a8 Fix compilation error and use mockk instead of manual mocking (prone to error) 2019-11-04 17:09:03 +01:00
ganfra
6177e69855 Merge branch 'develop' into feature/room_list_actions 2019-11-04 15:11:20 +01:00
ganfra
5c71cabb5f Clean code 2019-11-04 15:08:08 +01:00
Benoit Marty
a85b5af761
Merge pull request #641 from vector-im/feature/fix_crash 
Fix crash
 2019-11-04 14:28:31 +01:00
ganfra
d47cf7e932
Merge branch 'develop' into feature/fix_#498 2019-10-30 19:26:11 +01:00
ganfra
101057520b Fix disambiguated with empty senderName 2019-10-30 19:25:24 +01:00
Benoit Marty
118870bc41 ktlint cleanup 2019-10-29 17:02:55 +01:00
Benoit Marty
d001ab5bef
Merge pull request #640 from Dominaezzz/kotlinify 
The last of the clean up.
 2019-10-29 17:01:38 +01:00
ganfra
035359cb35 Update CHANGES and clean code 2019-10-28 17:01:41 +01:00
ganfra
57b640622b Sender Name: we should use disambiguated display name over senderName. PrevContent fallback is now handled in SDK 2019-10-28 16:48:55 +01:00
ganfra
00ca5dc70a RoomListActions: handle room notification state. Still need to branch UI 2019-10-25 18:23:47 +02:00
Benoit Marty
0040f8e924 Fix crash reported by Rageshake, stateKey can be null 2019-10-24 18:51:47 +02:00
Benoit Marty
6cca242f77 Fix Android test compilation issue 2019-10-24 17:49:34 +02:00
Benoit Marty
2929b8f617 Ensure Android tests compile and fix warnings 2019-10-24 17:24:42 +02:00
Benoit Marty
7c567b04bb Make test compile and pass 2019-10-24 16:36:12 +02:00
Dominic Fischer
1ac99e92a6 Light refactoring. 
Signed-off-by: Dominic Fischer <dominicfischer7@gmail.com>
 2019-10-24 14:58:11 +01:00
Dominic Fischer
5ab975cc5c General kotlinification. 
Signed-off-by: Dominic Fischer <dominicfischer7@gmail.com>
 2019-10-24 14:53:44 +01:00
Dominic Fischer
2cf63ea92a Remove import java.util.* from kotlin files. 
Signed-off-by: Dominic Fischer <dominicfischer7@gmail.com>
 2019-10-24 14:53:10 +01:00
ganfra
b17b54d218
Merge pull request #637 from vector-im/feature/fix_room_summary 
Feature/fix some room related stuff
 2019-10-23 17:29:14 +02:00
ganfra
187e2a26db Clean after Benoit's review 2019-10-23 17:26:56 +02:00
ganfra
2f5fdbb7e2 Clean and fix lint 2019-10-23 16:20:38 +02:00
ganfra
8b1411f533 Read marker: test if local echo before hitting the SDK to change read marker id + reduce a bit delay 2019-10-23 16:13:35 +02:00
Benoit Marty
ff81715783 Import Strings from Riot 2019-10-23 14:18:40 +02:00
ganfra
50bf6df7fe Room summary: fix some issues with local echo and sending event 2019-10-23 11:55:19 +02:00