Commit Graph

907 Commits

Author SHA1 Message Date
Benoit Marty 90027cc4d5 Login screens: reset password WIP 2019-11-22 12:15:19 +01:00
Benoit Marty 42c5adf08d ktlint 2019-11-22 12:15:19 +01:00
Benoit Marty 491a38a79f Login screens: send again 3pid 2019-11-22 12:15:19 +01:00
Benoit Marty 1a603742d0 Cleanup 2019-11-22 12:15:19 +01:00
Benoit Marty dd44078297 Login screens: fix several issue with check email screen 2019-11-22 12:15:19 +01:00
Benoit Marty 5770023593 Login screens: code cleanup 2019-11-22 12:15:19 +01:00
Benoit Marty 2e4c3f850a Cleanup 2019-11-22 12:15:19 +01:00
Benoit Marty 127916a8d9 Login screens: add MSISDN 2019-11-22 12:15:19 +01:00
Benoit Marty 248a584e1a Login screens: Add Msisdn - WIP 2019-11-22 12:15:19 +01:00
Benoit Marty b8a3ad0c43 Login screens: Wait for email validation screen 2019-11-22 12:15:19 +01:00
Benoit Marty 1f161b7e23 Login screens: Add 3Pid step 1 2019-11-22 12:15:19 +01:00
Benoit Marty 20ad3abb60 Login screens: set initial device name 2019-11-22 12:15:19 +01:00
Benoit Marty 1dc7dfc896 Login screens: registration fallback 2019-11-22 12:15:19 +01:00
Benoit Marty 1c03163a33 Login screens: prepare email and msisdn 2019-11-22 12:15:19 +01:00
Benoit Marty 9aa270c7ad Login screens: Perform dummy action when user does not want to enter an email -> account created! 2019-11-22 12:15:19 +01:00
Benoit Marty 3f80076fb1 Login screens: Terms step for registration 2019-11-22 12:15:19 +01:00
Benoit Marty dfbf448bb7 Login screens: Captcha step for registration 2019-11-22 12:15:19 +01:00
Benoit Marty 41ac2c6d70 Login screens: Registration WIP 2019-11-22 12:15:19 +01:00
Benoit Marty 9a628c7b5d ktlint 2019-11-22 12:15:19 +01:00
Benoit Marty fb46a14172 Fix compilation issue after rebase 2019-11-22 12:15:19 +01:00
Benoit Marty 2871e4f5b1 Login screens: forget password screens 2019-11-22 12:15:19 +01:00
Benoit Marty 4485d1c685 Registration flow: SDK side 2019-11-22 12:14:48 +01:00
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
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