Commit graph

799 commits

Author SHA1 Message Date
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
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
Benoit Marty
377a228f88 Improve code 2019-10-22 17:31:07 +02:00
Benoit Marty
f43dcb1183 Update room summary when saving local echo from DefaultRelationService 2019-10-22 16:54:48 +02:00
Benoit Marty
492ed3954a code cleanup 2019-10-22 16:54:48 +02:00
Benoit Marty
7890e83204
Merge pull request #630 from vector-im/feature/crypto_lock
Fix dead lock on crypto
2019-10-22 16:53:33 +02:00
Benoit Marty
00d1a2c380
Merge pull request #629 from vector-im/feature/fix_malformed_event_bug
Fix / event mapper persist the clear type in type
2019-10-22 14:47:08 +02:00
Benoit Marty
78dfd6b3e6 Fix potential lock due to nested synchronized(unknownSessionsFailure) 2019-10-22 14:20:43 +02:00
Benoit Marty
3abce34484 Add in existingRequest only if not filtered 2019-10-22 12:45:36 +02:00
Benoit Marty
7416fec93e Do not decrypt event if session is unknown 2019-10-22 12:37:17 +02:00
Benoit Marty
3c40f64fb7 Add a few comments 2019-10-22 12:33:25 +02:00
Benoit Marty
b57c71b1c9 Remove unused import 2019-10-22 12:27:55 +02:00
Benoit Marty
fea54952d3 Code quality 2019-10-22 12:26:56 +02:00
Benoit Marty
3dc5ef54ab Fix compilation warnings 2019-10-22 12:21:50 +02:00
Benoit Marty
cebd8136da
Merge branch 'develop' into kotlinify 2019-10-22 12:16:20 +02:00
Valere
64b3568d51 Fix / event mapper persist the clear type in type 2019-10-22 11:57:11 +02:00
Dominic Fischer
5e4e54153c Fix build error.
Signed-off-by: Dominic Fischer <dominicfischer7@gmail.com>
2019-10-21 22:52:58 +01:00
Dominic Fischer
d071324694 Address review comments.
Signed-off-by: Dominic Fischer <dominicfischer7@gmail.com>
2019-10-21 22:29:36 +01:00
Benoit Marty
e39c4a7925 fix ktlint issue 2019-10-21 17:22:28 +02:00
Benoit Marty
a7a19dab11 Report content: Service and REST request 2019-10-21 17:22:00 +02:00
Benoit Marty
723a007c39
Merge pull request #626 from vector-im/feature/myUserIdInject
Inject userId where possible
2019-10-21 16:01:48 +02:00
Benoit Marty
b1710fde60
Merge pull request #618 from vector-im/feature/mark_all_read
Mark all as read
2019-10-18 15:02:16 +02:00
Benoit Marty
cd0a40c18d Fix compil test issue 2019-10-18 14:34:44 +02:00
Benoit Marty
17636019e0 Change order of parameters 2019-10-18 14:32:34 +02:00
Benoit Marty
3986839801 Inject userId 2019-10-18 14:25:19 +02:00
Benoit Marty
28e5e42ab1
Merge pull request #614 from vector-im/feature/recycler_view_upgrade
Upgrade RecyclerView version to fix issues with a11y.
2019-10-15 10:47:59 +02:00
Dominic Fischer
f7f97e2098 Typos
Signed-off-by: Dominic Fischer <dominicfischer7@gmail.com>
2019-10-12 16:04:47 +01:00
Dominic Fischer
e28e2dadb9 Some more clean up
Signed-off-by: Dominic Fischer <dominicfischer7@gmail.com>
2019-10-12 15:37:20 +01:00
Benoit Marty
3622c0ecb4 Mark all as read 2019-10-11 16:22:32 +02:00
Benoit Marty
0a0c344bfb Upgrade RecyclerView version to fix issues with a11y.
Also minor upgrade of some other libs
2019-10-11 10:10:16 +02:00
Benoit Marty
fbb23dfb66 ktlint: fix (no-empty-first-line-in-method-block) issues 2019-10-09 16:43:12 +02:00
Benoit Marty
e5779d425a ktlint: fix (experimental:multiline-if-else) issues 2019-10-09 16:40:44 +02:00
Benoit Marty
30e43e47cd Fix filename ktlint issues 2019-10-09 15:44:01 +02:00
Benoit Marty
15dc4d6369 Fix ktlint issue automatically by running ./ktlint --android -v -F 2019-10-09 15:24:05 +02:00
Benoit Marty
eec470f2ce Fix code quality issues 2019-10-09 15:15:15 +02:00
Benoit Marty
cdfc402599 Fix Timber error in formatting 2019-10-09 15:06:38 +02:00
Benoit Marty
a9c474105a Fix warnings in the SDK 2019-10-09 12:49:00 +02:00
Benoit Marty
36c5f9af13
Merge pull request #583 from vector-im/feature/invot_notification
Invitation notifications are not dismissed automatically if room is joined from another client (#347)
2019-10-09 12:48:07 +02:00