mirrors/SchildiChat-android
1
0
Fork 0
mirror of https://github.com/SchildiChat/SchildiChat-android.git synced 2024-12-29 04:18:38 +03:00
Code Issues Projects Releases Packages Wiki Activity
2110 commits 7 branches 124 tags 230 MiB
Commit graph

2110 commits

This branch
This branch
All branches
Author SHA1 Message Date
ganfra
3196dcb57e MessageActions: disable if not synced atm 2019-10-23 12:20:03 +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
02914495ce
Merge pull request #632 from vector-im/feature/cleanuo 
More cleanup
 2019-10-23 10:26:54 +02:00
Benoit Marty
70a14f6350
Merge pull request #619 from vector-im/feature/attachments 
Feature/attachments
 2019-10-23 10:09:57 +02:00
Benoit Marty
cac5fb725a Code cleanup 2019-10-22 18:35:05 +02:00
Benoit Marty
dbc17ae515 Use AppCompatEditText instead of EditText 2019-10-22 18:23:53 +02:00
Benoit Marty
1de02c2fbb Ensure android.text.TextUtils will never be used again 2019-10-22 17:41:59 +02:00
ganfra
6d55c15761 Fix lint issue 2019-10-22 17:41:21 +02:00
Benoit Marty
377a228f88 Improve code 2019-10-22 17:31:07 +02:00
ganfra
2974f8b200 Merge branch 'develop' into feature/attachments 2019-10-22 17:27:15 +02:00
ganfra
7388a408b8 Permissions: allow to provide the rationale message as it requires "context" and cannot be generic 2019-10-22 17:13:38 +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
4204ab262c Fix compilation issue 2019-10-22 12:42:01 +02:00
ganfra
c7a4d34192 Attachments: handle rich content from keyboard 2019-10-22 12:37:59 +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
9092b97fb8
Merge pull request #622 from Dominaezzz/kotlinify 
Some more clean up
 2019-10-22 12:17:25 +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
ganfra
2c8cd89533 Handle rich content from app (WIP not compiling) 2019-10-21 19:02:28 +02:00
Benoit Marty
11b5c2c3ba Restore previous log level 2019-10-21 18:17:03 +02:00
Benoit Marty
9d7c4abb97
Merge pull request #615 from vector-im/feature/report_content 
Add ability to report content
 2019-10-21 18:13:44 +02:00
ganfra
8e3234d188 Clean some code 2019-10-21 18:08:42 +02:00
Benoit Marty
b253722b98 Disable animation 2019-10-21 17:22:28 +02:00
Benoit Marty
fce576e3a4 Message action bottom sheet expanded 2019-10-21 17:22:28 +02:00
Benoit Marty
7ed7b18ccd Remove unused import 2019-10-21 17:22:28 +02:00
Benoit Marty
053bf7aeac Improve layout preview a bit 2019-10-21 17:22:28 +02:00
ganfra
6ccd083451 Bottom sheet: fix RecyclerView usage 2019-10-21 17:22:28 +02:00
Benoit Marty
e39c4a7925 fix ktlint issue 2019-10-21 17:22:28 +02:00
Benoit Marty
abdb83b9fd Report content: change log 2019-10-21 17:22:28 +02:00
Benoit Marty
0bcc84cbd6 Try to fix the bottom sheet showing expanded by default #2 
Seems ok now
 2019-10-21 17:22:00 +02:00
Benoit Marty
b2f6fb8c91 Try to fix the bottom sheet showing expanded by default. 
The second time it's open, it's not expanded... With this fix, the bug appear only at the third time...
 2019-10-21 17:22:00 +02:00
Benoit Marty
36042ed145 Report content: red color for "block user" button 2019-10-21 17:22:00 +02:00
Benoit Marty
6ad1932fe5 Report content: custom reason 2019-10-21 17:22:00 +02:00
Benoit Marty
4a6237b50e Report content: confirmation dialogs 2019-10-21 17:22:00 +02:00
Benoit Marty
a7a19dab11 Report content: Service and REST request 2019-10-21 17:22:00 +02:00
Benoit Marty
8d0aa0437c Report content: UI menu 2019-10-21 17:21:26 +02:00
Benoit Marty
0a79b8b315 Cleanup 2019-10-21 17:21:26 +02:00
Benoit Marty
1dacfa6744 Rework message menu bottom sheet: remove sub Fragment and use Epoxy 
- Also move some class to some dedicated package
 2019-10-21 17:21:26 +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