Commit Graph

369 Commits

Author SHA1 Message Date
Valere
a734c699ad Fix impure reducer and use live event 2019-07-01 09:56:00 +02:00
Valere
419ef7b46f
Merge pull request #243 from vector-im/feature/reply_e2e
Reply in e2e room
2019-06-28 16:07:08 +02:00
Benoit Marty
4ad23f0f37 Fix bad copyright block 2019-06-28 16:05:36 +02:00
Benoit Marty
0f039fce32 Add 30 missing copyright block 2019-06-28 15:59:20 +02:00
Benoit Marty
7ff2477a4f
Merge pull request #241 from vector-im/feature/api16
min API 19 - tested
2019-06-28 15:06:40 +02:00
Valere
75c1718252 code review 2019-06-28 14:57:22 +02:00
Valere
f83491fdfc Fix / impure reducer in action view model 2019-06-28 14:57:22 +02:00
Valere
a9dd06562a Reply in e2e room
+ Add reply option in e2e room
+ Fix bug 242
+ Show preview of messages in menu and in text composer preview
2019-06-28 14:57:22 +02:00
Benoit Marty
cea8abb9b1 Fix issue in test and add a test for Json canonicalization (will pass when reply_e2e branch will be merged) 2019-06-28 14:27:08 +02:00
Benoit Marty
13a0b809e1 Fix compilation issue in release 2019-06-28 14:08:38 +02:00
Valere
b92cc524b6 Fix / Day separator flickering in timeline
Sending events were not filtered, so sending events like reactions would make the day separator appear
2019-06-28 11:33:33 +02:00
Benoit Marty
7187cc23a1 code quality 2019-06-28 10:23:27 +02:00
ganfra
f18bc9bd00 Dagger: fix no session 2019-06-27 19:12:46 +02:00
ganfra
2063a3e535 Merge branch 'develop' into feature/dagger 2019-06-27 18:56:23 +02:00
Benoit Marty
a1c22c9aa6 Remove useless property for a SDK 2019-06-27 18:25:50 +02:00
ganfra
1fa7b7367a Dagger: merge develop compiling now. 2019-06-27 15:25:01 +02:00
Valere
338de3ebf5 Cleans notification pref screen
+ fix troubleshoots
2019-06-27 12:21:38 +02:00
Benoit Marty
ae7e617fdd Rename and format and remove duplicate EventType.REDACTION 2019-06-27 10:46:04 +02:00
ganfra
b2d2582e0f Merge branch 'develop' into feature/dagger [WIP] 2019-06-26 20:58:46 +02:00
ganfra
6e7adaec59 Dagger: prepare for multi session [WIP] 2019-06-26 17:51:24 +02:00
Benoit Marty
134c2fcd42 Notification: Fix TestAccountSettings test 2019-06-26 12:19:54 +02:00
Benoit Marty
2625e11508 rename method 2019-06-26 12:19:54 +02:00
Benoit Marty
71ae99012b Code review and cleanup 2019-06-26 12:19:54 +02:00
Benoit Marty
ab0141a5c6 Fix issue after rebase 2019-06-26 12:19:54 +02:00
Valere
1feb1f9c3f Fix test 2019-06-26 12:19:54 +02:00
Valere
090ee1d4e9 Fix / ignore message sent by me in push rules 2019-06-26 12:19:54 +02:00
Valere
7821ca12fd Fix / fetch from realm without copy (proxy error) 2019-06-26 12:19:54 +02:00
Valere
74099be316 Remove / Add pusher from enable notif preference
+Added Retrofit/Moshi null serializer for pusher kind
2019-06-26 12:19:54 +02:00
Valere
4e6b34b9d1 Fix issues on Notification Event resolver 2019-06-26 12:19:54 +02:00
Valere
6743dc6273 Set sync timeout to 30s when in foreground 2019-06-26 12:19:54 +02:00
Valere
0584fc3666 Get real push rules from server and evaluate them 2019-06-26 12:19:54 +02:00
Valere
2e417a9143 Basic FCM vs fdroid mode 2019-06-26 12:19:54 +02:00
Valere
0e46fc4c0a WIP 2019-06-26 12:19:54 +02:00
Valere
4505d13385 Fix / SAS verification infinite waiting on last step
Missing state update to verified after mac verification
2019-06-26 10:46:58 +02:00
Valere
8fe0bd5abe
Merge pull request #214 from vector-im/feature/update_quick_reactions
Feature/ Update quick reactions
2019-06-25 15:47:17 +02:00
Benoit Marty
76ade2957e Handle permalink click 2019-06-25 09:34:12 +02:00
Benoit Marty
b1e009f8b4 Handle eventId v4 (https://matrix.org/docs/spec/rooms/v4#event-ids) 2019-06-25 09:33:52 +02:00
Valere
43ead66991 Update quick reactions to new design 2019-06-24 16:13:58 +02:00
Benoit Marty
1cfc85a772 Display some version of Riot and SDK (Fix #185) 2019-06-21 11:13:16 +02:00
ganfra
47968c9447 Dagger: everything should be injected ok now 2019-06-21 10:36:02 +02:00
ganfra
07fee8ed3d Dagger: continue reworking on app and sdk [WIP] 2019-06-20 19:26:59 +02:00
Benoit Marty
285da114e7 better code (ganfra's review) 2019-06-20 17:27:15 +02:00
ganfra
9c1f870694 Dagger: start handling app dependencies [WIP] 2019-06-18 20:00:20 +02:00
Benoit Marty
56e0680398 Remove unused class 2019-06-18 16:11:24 +02:00
Benoit Marty
8c0a1ed37d Rename "sender" to "senderId" for code clarity 2019-06-18 16:11:24 +02:00
Benoit Marty
625500212d Manage display name disambiguation (Fixes #172) 2019-06-18 16:09:48 +02:00
Benoit Marty
02f84a3b53 View source of encrypted event 2019-06-18 13:14:39 +02:00
Benoit Marty
0497d14a08 SAS: import change from https://github.com/matrix-org/matrix-android-sdk/pull/467 2019-06-17 19:06:32 +02:00
Benoit Marty
191d80e5f5 Fix issue with key importation 2019-06-17 19:05:26 +02:00
Benoit Marty
659ba34fb3 Remove CryptoAsyncHelper and use only coroutine 2019-06-17 19:05:26 +02:00