mirrors/SchildiChat-android
1
0
Fork 0
mirror of https://github.com/SchildiChat/SchildiChat-android.git synced 2024-12-18 15:22:07 +03:00
Code Issues Projects Releases Packages Wiki Activity
1941 commits 7 branches 122 tags 229 MiB
Commit graph

874 commits

Author SHA1 Message Date
Benoit Marty
65e123d87f Split long lines 2019-07-11 13:32:28 +02:00
Valere
d0b145d031 Edit emote 2019-07-11 12:29:02 +02:00
ganfra
1b95336ad3 EventEntity|TimelineEventEntity : remove UUID as primary key and use auto-incremented Long 2019-07-11 10:25:30 +02:00
ganfra
f007fb04b8 Timeline: clean listeners 2019-07-11 10:25:30 +02:00
ganfra
141434e8f8 Try getting things off the main thread 2019-07-11 10:25:30 +02:00
ganfra
b8669d5ed2 Sync: use a single threaded executor to ensure we have only one sync at a time 2019-07-11 10:23:24 +02:00
Benoit Marty
7a08a11b19 Fix compilation of test 2019-07-10 18:17:03 +02:00
Valere
54b1d18812 Merge remote-tracking branch 'origin/feature/clean' into feature/clean 2019-07-10 18:07:03 +02:00
Valere
3aa30e5f15 Fix reply of reply 2019-07-10 18:06:44 +02:00
Benoit Marty
794fd650a4 Mutualize code, and also, when replying to an edited event, use the last text in the reply prefix content 2019-07-10 17:37:22 +02:00
Benoit Marty
06699eaefc Cleaner code 2019-07-10 14:40:08 +02:00
Benoit Marty
e5082f662c Fix actually done TODO 2019-07-10 14:19:59 +02:00
Benoit Marty
e6409d4c60 Create a common canReact() method 2019-07-10 12:10:55 +02:00
Benoit Marty
1918302297 Reply with formatted content 2019-07-10 11:29:47 +02:00
Benoit Marty
92e3a02389 Create data class instead of Pair 2019-07-10 10:34:32 +02:00
Benoit Marty
0a54801fcc Code clarity 2019-07-10 10:16:21 +02:00
Benoit Marty
228ee52563 Remove extra space in <mx-reply> 2019-07-10 10:07:45 +02:00
Benoit Marty
e6c74dc1fe Convert a Task to a ConfigurableTask without parameter 2019-07-09 18:41:08 +02:00
Benoit Marty
fe82ad2002 Format 2019-07-09 18:31:04 +02:00
Benoit Marty
f66739491a
Merge pull request #321 from vector-im/feature/workManager_clean 
Fix bug on WorkManager: clean by tag
 2019-07-09 18:30:07 +02:00
Benoit Marty
c5dc9d4a9a Fix test 2019-07-09 18:29:32 +02:00
Valere
8f858f8119 Fix / line too long 2019-07-09 18:20:00 +02:00
Benoit Marty
6e036c24b8 Make the test be runnable 2019-07-09 18:14:58 +02:00
Benoit Marty
5e832e07cd Code cleanup 2019-07-09 18:04:19 +02:00
Benoit Marty
e9700e04d8 Move method to JsonCanonicalizer and fix test compilation 2019-07-09 18:04:19 +02:00
Benoit Marty
c19b1f917f Javadoc 2019-07-09 18:04:19 +02:00
Benoit Marty
4281b5967a Create object for work constraint 2019-07-09 18:04:19 +02:00
Benoit Marty
aa743d8469 Ensure we do not cancel Work from other lib or SDK client 2019-07-09 18:04:19 +02:00
Valere
a09850b16c
Merge pull request #316 from vector-im/feature/initial_sync_progress 
Feature/initial sync progress
 2019-07-09 17:58:24 +02:00
Valere
6cb94dd4d6 Fine tune task weights + more measure 2019-07-09 17:42:53 +02:00
Benoit Marty
34ac987494 Cleanup 2019-07-09 16:36:46 +02:00
Benoit Marty
ffe0b9712c Convert file to Kotlin 2019-07-09 15:50:15 +02:00
Benoit Marty
d92c090c30 Code quality: HashMap / HashSet 2019-07-09 15:40:49 +02:00
Valere
1a4157a663 review 2019-07-09 15:38:44 +02:00
Valere
4aae1f78d8 moved new strings + @StringRes annotation 2019-07-09 15:38:44 +02:00
Valere
8159a52bd7 cleaning 2019-07-09 15:38:44 +02:00
Valere
95d83db90c WIP 2019-07-09 15:38:44 +02:00
Benoit Marty
e80473903e Code quality: import static 2019-07-09 15:35:27 +02:00
Benoit Marty
d08778c674 Code quality: equalTo 2019-07-09 15:33:31 +02:00
Benoit Marty
0919b9460d Code quality: split long lines 2019-07-09 15:26:32 +02:00
Benoit Marty
66a018c79e Code quality: trim() 2019-07-09 15:11:20 +02:00
Benoit Marty
9a4eb8e9a4 add getFileUrl extension 2019-07-09 15:03:21 +02:00
Benoit Marty
058e7153a1 Fix bug 2019-07-09 15:03:21 +02:00
Benoit Marty
b0c939866f Download file - typo 2019-07-09 15:03:21 +02:00
Benoit Marty
a07f8b615e Download file - WIP 2019-07-09 15:03:21 +02:00
Benoit Marty
12bd85e0a9 Decrypt video file 2019-07-09 15:02:31 +02:00
Benoit Marty
c13ab62187 Fix issue when sending video in encrypted room 2019-07-09 15:02:31 +02:00
Benoit Marty
ea77686746 Send file: cleanup 2019-07-09 15:02:31 +02:00
Benoit Marty
8a5612be3d Send file: improve UI feedback 2019-07-09 15:02:31 +02:00
Benoit Marty
d24ce27903 Add missing call to contentUploadStateTracker.setFailure 2019-07-09 15:02:31 +02:00
Benoit Marty
2099965508 Avoid returning Result.failure() from appendable worker. 2019-07-09 15:02:31 +02:00
Benoit Marty
829e8da8dc lastFailureMessage is val, not var 2019-07-09 15:02:31 +02:00
Benoit Marty
e149ee53de Fix bad mime type for encrypted thumbnail 2019-07-09 15:02:31 +02:00
Valere
61d7f23870 remove dead code 2019-07-09 15:00:37 +02:00
ganfra
b5650b2b8f Pagination : avoid breaking timeline when paginating twice from same token (race condition) 2019-07-09 14:44:59 +02:00
Valere
8777d13d8b Fix / view source, decrypted source was not correct 2019-07-09 14:22:40 +02:00
ganfra
dd07f5c2a6 TimelineEvent : update sender data when loading room members and prune event (+ remove RoomSummaryMapper param) 2019-07-08 15:32:24 +02:00
Valere
57bd103de8 Fix / decrypt room summary latest event 2019-07-08 14:58:49 +02:00
Valere
e4c52484b1 Fix / ensure equals check for encryption result 2019-07-08 14:57:02 +02:00
Valere
a30da07fd1 Fix / timeline auto refresh on new session 2019-07-08 14:12:46 +02:00
Valere
ee27d3e047 Fix / clear unknown session map before re-request decrypt 2019-07-08 12:49:22 +02:00
Valere
7096094224 wip crypto 2019-07-08 12:05:41 +02:00
Valere
94b4351e19 wip async crypto + persist 2019-07-08 11:18:27 +02:00
Valere
e50dd265d4 merge develop 2019-07-08 10:58:41 +02:00
Valere
4521ea14ee Merge branch 'develop' into feature/realm_entity_rework 2019-07-08 10:55:20 +02:00
Valere
98a7652403 Put back local echo 2019-07-05 19:13:34 +02:00
ganfra
78951b9155 Timeline event: handle displayName/avatar [WIP] 2019-07-05 19:07:33 +02:00
Benoit Marty
8c86a653b2
Merge pull request #309 from vector-im/feature/crypto_cleanup 
Rework Crypto using Try
 2019-07-05 19:03:59 +02:00
Valere
c503445092 Branch back relation summaries 2019-07-05 18:38:20 +02:00
Benoit Marty
205af8b122
Merge pull request #280 from Dominaezzz/kotlinify-1 
Enhance CancelableBag
 2019-07-05 18:34:28 +02:00
ganfra
79a704d240 Timeline : Uncomment liveChunk to make pagination working 2019-07-05 17:27:24 +02:00
Valere
f01e796271 Timeline is back 2019-07-05 17:00:13 +02:00
Benoit Marty
302d23ba96 Create a realm locker to fast up next Realm.getInstance calls 2019-07-05 16:28:15 +02:00
Benoit Marty
03050c3f25 Cleanup 2019-07-05 16:11:54 +02:00
ganfra
cbfd2af74b Start branching TimelineEventEntity 2019-07-05 16:07:12 +02:00
Benoit Marty
f3fab0dc08 Rename ErrorTypes 2019-07-05 15:52:37 +02:00
Benoit Marty
4a512d2425 Create enum for errorType and fix a few issues 2019-07-05 15:43:28 +02:00
Benoit Marty
87dec337d8 Rework Crypto using Try 2019-07-05 14:41:32 +02:00
ganfra
b37877746a Introduce TimelineEventEntity to begin with the rework 2019-07-05 14:39:15 +02:00
Dominic Fischer
b0e5612bdc Convert java-esque code to Kotlin 
Signed-off-by: Dominic Fischer <dominicfischer7@gmail.com>
 2019-07-05 12:32:21 +01:00
ganfra
25b0cd0e4b Remove some work from UI thread 2019-07-04 19:02:37 +02:00
Benoit Marty
f2a52f0253
Merge pull request #297 from vector-im/feature/crypto_stabilization 
Safely remove all usage of `!![`
 2019-07-04 15:17:26 +02:00
Benoit Marty
baaf493cb4
Merge pull request #299 from vector-im/feature/dix_concurrent_sync 
Fix / Push worker could launch concurrent syncs
 2019-07-04 15:10:18 +02:00
Benoit Marty
6cbd6d3a33 Valere's review 2019-07-04 14:59:29 +02:00
Benoit Marty
c0f085cdf8 SyncTask now handles by itself the sync token 2019-07-04 14:46:59 +02:00
Valere
10bc2297d4 Fix / Push worker could launch concurrent syncs 2019-07-04 14:04:36 +02:00
Benoit Marty
8fa5e63b07 Fix issue: reply to e2e event does not contain the base message 2019-07-04 12:52:43 +02:00
Benoit Marty
9d0c50907c Fix issue when quoting event in e2e rooms (Fixes #295) 2019-07-04 12:39:59 +02:00
Benoit Marty
e5958983d8 Safely remove all usage of !![ 2019-07-04 11:44:09 +02:00
ganfra
a79a6443e7 Realm: update realm dependencie 2019-07-03 20:08:27 +02:00
ganfra
9ff24cbf2a Merge branch 'feature/fix_issues' into develop 2019-07-03 19:46:34 +02:00
Valere
4041e2e8ca code review 2019-07-03 18:40:42 +02:00
Valere
031c4e5746 Crash on loggout 
https://github.com/matrix-org/riot-android-rageshakes/issues/5881
 2019-07-03 18:40:04 +02:00
Valere
b4ea85fc76 Fix / Rageshake crashes + cleaning !! 
https://github.com/matrix-org/riot-android-rageshakes/issues/5880
https://github.com/matrix-org/riot-android-rageshakes/issues/5877
https://github.com/matrix-org/riot-android-rageshakes/issues/5873
https://github.com/matrix-org/riot-android-rageshakes/issues/5871
 2019-07-03 18:40:04 +02:00
Benoit Marty
9cdecced57
Merge pull request #291 from vector-im/feature/start_crypto_earlier 
Start crypto manager before handling first sync events
 2019-07-03 18:05:44 +02:00
Benoit Marty
60d46538de
Merge pull request #292 from vector-im/feature/sonar_fix 
Feature sonar fix and convert remaining Java files to Kotlin
 2019-07-03 18:03:23 +02:00
Benoit Marty
223295c2f1 Convert MXUsersDevicesMap to kotlin - Fix issue 2019-07-03 18:01:28 +02:00
Benoit Marty
f789fb275d Convert MXUsersDevicesMap to kotlin 2019-07-03 17:34:22 +02:00
Valere
a7c12aeb93 Start crypto manager before handling first sync events 2019-07-03 17:17:58 +02:00
Benoit Marty
0ca9a5f68b Convert MXKey to kotlin 2019-07-03 16:45:08 +02:00
Benoit Marty
7d5c31c510 Fix Javadoc issues 2019-07-03 15:52:53 +02:00
Benoit Marty
1ee1c31b9c Fix bugs detected by Sonar 2019-07-03 15:42:35 +02:00
Benoit Marty
e9eada77f9 Add comment to run sonar analysis and fix compilation issue 2019-07-03 15:42:35 +02:00
ganfra
93ce0cc5e9 Realm: avoid using monarchy thread for custom work 2019-07-03 14:48:45 +02:00
ganfra
eefd09d022 Dagger: don't create MatrixCoroutineDispatchers multiple time!! 2019-07-03 14:48:03 +02:00
ganfra
ef597cc67a RoomSummary: set unreadNotification to 0 by default 2019-07-03 14:47:33 +02:00
Valere
5d171e0240 Moved incoming key/verif to active session holder 2019-07-03 12:56:08 +02:00
Valere
39070820be
Merge pull request #283 from vector-im/feature/check_pushrule_on_sync_only 
Check Push rule on sync only + fix bad room name in notif
 2019-07-03 12:37:49 +02:00
Valere
1fdad38b9d Check Push rule on sync only + fix bad room name in notif 2019-07-03 11:59:45 +02:00
Benoit Marty
f41c0311fa Fix done TODO 2019-07-03 11:58:50 +02:00
Benoit Marty
a476ac71da Import translations from Riot 2019-07-03 10:20:07 +02:00
ganfra
bc2d321a84 Merge branch 'feature/Perf' into develop 2019-07-02 23:07:16 +02:00
Dominic Fischer
0f3a63e366 Enhance CancelableBag 
Signed-off-by: Dominic Fischer <dominicfischer7@gmail.com>
 2019-07-02 21:46:44 +01:00
ganfra
2f66321c2a RoomSummary: don't fetch last event by default as it takes some time 2019-07-02 19:59:01 +02:00
ganfra
5b102485bc Perf: timeline should reuse one background looper thread 2019-07-02 19:12:20 +02:00
Valere
ec5ec3375a Fix / sometime sent reaction is count twice 
Now use eventId format to check if local echo instead of state
 2019-07-02 18:05:14 +02:00
ganfra
11bf00030d Merge branch 'develop' into feature/Perf 2019-07-02 17:00:09 +02:00
Benoit Marty
73277c5b08
Merge pull request #259 from vector-im/feature/fix_read_receipts_not_updated 
Fix / send read marker for collapsed items
 2019-07-02 16:51:53 +02:00
Benoit Marty
f21f4dbe91
Merge pull request #262 from vector-im/feature/update_timeline_when_new_key 
Update timeline on new session
 2019-07-02 16:51:07 +02:00
Benoit Marty
62d2443b85 Remove duplicated method 2019-07-02 16:48:58 +02:00
Benoit Marty
bc1edcf33d Code review 2019-07-02 16:48:58 +02:00
Valere
363f52b10c Encrypt Realm databases 2019-07-02 16:48:58 +02:00
Benoit Marty
498b1f2b06
Merge pull request #261 from vector-im/feature/e2e_file 
Encrypt attachment in e2e rooms
 2019-07-02 16:44:17 +02:00
Valere
92222c269e Update timeline on new session 2019-07-02 16:18:16 +02:00
Benoit Marty
994ee1d23f Encrypt file + propagate error between chained workers 2019-07-02 14:07:48 +02:00
Benoit Marty
f0e43d31f5 Encrypt file WIP 2019-07-02 12:34:56 +02:00
Valere
85e850bcde Fix / unwanted auto-mardown when trailing space 2019-07-02 12:29:36 +02:00
Valere
6cf24cc43b Fix / some state events are missing context action (view source) 2019-07-02 12:21:27 +02:00
Valere
c7df433a44 Fix / send read marker for collapsed items 
Also remove unnecessary check on matrix id format
 2019-07-02 12:08:44 +02:00
ganfra
9378d30601 Merge branch 'develop' into feature/Perf 2019-07-02 11:25:39 +02:00
Benoit Marty
0c2d3f36c3 Encrypt file WIP 2019-07-02 09:56:20 +02:00
ganfra
164c8dab09 Glide: try to handle encrypted image. [WIP] 2019-07-02 09:56:20 +02:00
Benoit Marty
b54ca5a8a0 Decrypt Attachment - WIP 2019-07-02 09:56:20 +02:00
Benoit Marty
707a4712fc Add some javadoc from Matrix spec and add EncryptedFileInfo where necessary 2019-07-02 09:56:20 +02:00
Benoit Marty
8e76700c8d Handle redacted e2e event 2019-07-02 09:56:20 +02:00
Benoit Marty
3f74c4e933 Report change from https://github.com/matrix-org/matrix-android-sdk/pull/471 2019-07-02 09:56:20 +02:00
ganfra
41ed4b23d8 Update dependencies (tested ok) 2019-07-02 09:39:45 +02:00
Valere
f4b124d29f
Merge pull request #257 from vector-im/feature/room_list_improvements 
Room list: last event preview - invitations list
 2019-07-01 20:38:32 +02:00
Valere
8e653979fd
Merge pull request #258 from vector-im/feature/fix_signout 
Fix / signout sign-in not working
 2019-07-01 20:37:32 +02:00
Valere
a5584d27af QuickFIx / regression cannot decrypt message (no sender_key) 2019-07-01 20:34:42 +02:00
Valere
95d64008aa Move to sdk 2019-07-01 20:12:05 +02:00
ganfra
19202cfca6 Perf: try to get better 2019-07-01 20:05:48 +02:00
Valere
ca2223f201 Force passing realm to TimelineEvent factory 2019-07-01 19:46:18 +02:00
Valere
a1ddd73d7d Fix / signout sign-in not working 2019-07-01 18:55:40 +02:00
Benoit Marty
01e3e71f98 Handle room invitation actions 2019-07-01 18:50:33 +02:00
Benoit Marty
5e9ecfbcc0 Room summary; handle encrypted events 2019-07-01 15:12:35 +02:00
Benoit Marty
4d79485fee Last event on room list 2019-07-01 15:12:35 +02:00
Valere
9224fcabfa Fix #253 / Image with no mimetype in info 2019-07-01 15:10:12 +02:00
Valere
0d433b2620 fix / missing reaction event in filter 2019-07-01 13:53:10 +02:00
Valere
6a829caf0f Perf / filter events for aggregation updater 2019-07-01 13:33:43 +02:00
ganfra
d643abbb22 Sender name: fix for not synced events. 2019-07-01 13:20:03 +02:00
Valere
e838794587 Do not check push rule on initial sync 2019-07-01 13:08:16 +02:00
Valere
b0ad568df0 Fix / fdroid notif was broken due to merge 2019-07-01 13:07:52 +02:00
Valere
3960742f38
Merge pull request #250 from vector-im/feature/fix_impure_reducers 
Fix impure reducer and use live event
 2019-07-01 11:33:34 +02:00
Benoit Marty
466a39d239 Robustness 2019-07-01 11:08:05 +02:00
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
Benoit Marty
38b1d24953 Use foldToCallback() whenever it's possible 2019-06-17 19:04:48 +02:00
Benoit Marty
5f0d1d9536 Crypto: export room keys 2019-06-17 19:04:48 +02:00
ganfra
c2c2d0b21e Dagger: make SDK DI working 2019-06-17 18:17:37 +02:00
Benoit Marty
6266f9e6a1 Handle device deletion the proper way 2019-06-17 17:32:35 +02:00
Benoit Marty
9649e190ef Fix compilation issue after rebase 2019-06-17 16:28:27 +02:00
ganfra
1547045165 Request can now be canceled properly: it should fix the issue with live chunk being deleted. 2019-06-17 15:08:16 +02:00
Benoit Marty
97b066b8fa Import strings from Riot 2019-06-17 14:55:17 +02:00
ganfra
4be0ab87fc Dagger: continue adding it to SDK [WIP] 2019-06-16 17:00:47 +02:00
ganfra
3d465f6fdf Start to introduce Dagger into SDK [WIP] 2019-06-14 16:32:23 +02:00
Benoit Marty
02ef1172ce
Merge pull request #179 from vector-im/feature/cryptoFinalization 
Crypto: Delete device
 2019-06-14 16:06:23 +02:00
Benoit Marty
8f6f72ca48 Review: Added optional to stage and renamed to "InteractiveAuthenticationFlow" 2019-06-14 16:06:07 +02:00
ganfra
df4f0eac20 Merge branch 'feature/sync_ui' into develop 2019-06-13 18:16:45 +02:00
Benoit Marty
d353e9314b Crypto: Delete device 2019-06-13 16:48:42 +02:00
ganfra
9dc1684179 Crypto: check for encryption state event to know if room isEncrypted 2019-06-13 11:49:11 +02:00
Benoit Marty
c20b256b24 Move KeysBackupStateListener to a dedicated file 2019-06-13 11:13:05 +02:00
Benoit Marty
02d3fea4a9 Move javadoc to interface 2019-06-13 11:10:26 +02:00
Benoit Marty
ca98ff5864 Clear crypto database when signing out 2019-06-13 10:58:45 +02:00
Benoit Marty
480d197ffa Keys share request handling 2019-06-12 18:32:24 +02:00
ganfra
0204bade8b Content: hide some internal methods 2019-06-12 10:54:26 +02:00
ganfra
3dd161d65a Sync: add progress indicator for sync, need UI inputs. 2019-06-11 16:54:44 +02:00
Benoit Marty
5621f0661e Merge branch 'develop' into feature/crypto 2019-06-11 14:56:27 +02:00
Benoit Marty
875947dd61 Give the opportunity to override log configuration in local gradle properties file 2019-06-11 14:52:39 +02:00
Benoit Marty
61b1d83bbd Clean 2019-06-11 14:37:02 +02:00
Benoit Marty
64e5fed7ac Fix issue: lastSeenTs can be null 2019-06-11 13:57:35 +02:00
Benoit Marty
f6c36670c3 Rename class members and class name for code clarity 2019-06-11 13:32:09 +02:00
Benoit Marty
6dacb9894e Merge branch 'develop' into feature/crypto 2019-06-11 10:11:53 +02:00
ganfra
612b13808f Crypto: clean some code + add failure send state (but not handled yet). 2019-06-10 19:22:48 +02:00
Benoit Marty
3439a9ca27
Merge pull request #173 from vector-im/feature/create_room 
Create Room screen
 2019-06-10 17:01:44 +02:00
Benoit Marty
9772bbe157 Ganfra's review: revert change 2019-06-10 16:58:48 +02:00
Benoit Marty
b437837809 Ganfra's review: use RealmQueryLatch 2019-06-10 16:35:51 +02:00
Benoit Marty
33f8059846 Increase connect timeout from 30 seconds to 1 minute, for slow Homeserver (should fix #170) 2019-06-10 15:57:42 +02:00
Benoit Marty
4c5bffe0f5 Create room screen - WIP TODO: screen rotation - navigate to created room 2019-06-10 13:39:51 +02:00
ganfra
f2722f4766 Crypto: fix a small issue 2019-06-07 20:38:39 +02:00
ganfra
07c516ccdd Merge branch 'develop' into feature/crypto 2019-06-07 19:25:55 +02:00
ganfra
81330d30cf Merge branch 'develop' into feature/crypto 2019-06-07 18:53:24 +02:00
Valere
a4a813708c Fix / send state always returning Unknown 2019-06-07 16:39:45 +02:00
ganfra
664e5354d3 Crypto: continue cleaning + fix some issues. 2019-06-07 16:01:24 +02:00
Valere
220e6224e7 Merge develop 2019-06-07 15:42:04 +02:00
Valere
d3518c4944
Merge pull request #161 from vector-im/feature/fix_timeline_clicks 
Fix / click|longclick link interference
 2019-06-07 14:43:04 +02:00
Valere
7409003949 Fix / Bug aggregation on initial sync 
fix / All messages were not processed due to a test exiting the for loop
+ started adding context menu for non room messages
 2019-06-07 14:14:51 +02:00
Valere
297f202005 Fix / Local echo taking too much time 2019-06-07 14:14:51 +02:00
Valere
440442bb99 New View Reactions bottom sheet 
+ visible on reaction long click
+ Reaction pills size adapt to count, and number format
 2019-06-07 14:14:51 +02:00
Valere
53c91dc0c2 Ignore server aggregation until API ready 2019-06-07 14:14:51 +02:00
Valere
1b3ec2d0fb fix / review 2019-06-07 13:38:58 +02:00
ganfra
c4d7711d2f Crypto: finally get a working encrypt/decrypt + SAS 2019-06-06 19:10:04 +02:00
ganfra
6b0ab10231 Crypto: continue threading rework. WIP to shash 2019-06-05 22:18:16 +02:00
Benoit Marty
2ba7ec48f6 Code cleanup, remove duplicate code, and add some comments 2019-06-04 17:36:49 +02:00
ganfra
e125862794 Crypto: start reworking threading - WIP (to squash) 2019-06-04 16:26:37 +02:00
Benoit Marty
2b6eee4237 Merge branch 'develop' into feature/home_rework 2019-06-04 12:54:16 +02:00
Valere
471170a3e0 Fix / click|longclick link interference 
+ some missing long click (image content wrapper)
+ update markwon version
 2019-06-04 10:29:56 +02:00
Benoit Marty
43521c6e09 Cleanup 2019-06-04 10:25:29 +02:00
ganfra
3d50393b33 Crypto: continue cleaning. Need threading refactoring 2019-06-03 18:39:37 +02:00
Valere
424fd1347d Code review 2019-06-03 18:23:40 +02:00
Benoit Marty
c1fa728c24 Public rooms little rework 2019-06-03 16:44:31 +02:00
ganfra
784d55c16c Crypto: WIP cleaning 2019-06-02 20:34:19 +02:00
Valere
99925d7cf9 Local echo for reactions/edits/redacts 2019-05-29 18:43:33 +02:00
ganfra
3f7d20ec5b Crypto: make encryption working. 2019-05-28 15:54:16 +02:00
Valere
466be1dca5 Fix / issue with avatar url 2019-05-28 15:17:06 +02:00
Valere
deba756598 Added doc 2019-05-28 10:51:02 +02:00
Valere
3cb99ff64f Renamed package .internal.session.room.annotation to xx.relation 2019-05-28 10:45:58 +02:00
Valere
20e903914c Cleaning / code review 2019-05-28 10:43:36 +02:00
Valere
71ea1c5f9b Fix / avoid newlines and ws in reply event representations 2019-05-27 18:21:59 +02:00
Valere
4a4c0a3da1 Added auto markdown (as per preference) 
Fix / show formatted message preview upon composer in edit/quote/reply
Fix / use aggregated content to decide for actions on long click
 2019-05-27 18:08:29 +02:00
Benoit Marty
8f2754493c Fix issue with Avatar URL 2019-05-27 17:42:29 +02:00
Valere
00d66ffd48
Merge branch 'develop' into feature/edit_message 2019-05-27 17:08:39 +02:00
ganfra
b9d76f5047 Room list & event : decouple notice events formatting to be used within room controller 2019-05-27 15:37:18 +02:00
ganfra
275521db70 Home: continue architecture rework. WIP 2019-05-27 15:30:47 +02:00
Benoit Marty
14611d1f7b Disable log 2019-05-27 12:28:06 +02:00
Valere
0e06908a48 Design update 
+ Reply 
+ Better preview in action menu
 2019-05-27 11:55:52 +02:00
ganfra
af338b0607 Crypto: decryption is working (but still a lot to do) 2019-05-26 19:21:45 +02:00
Benoit Marty
2404eeadf0 RoomDirectoryPicker WIP 2019-05-24 15:43:12 +02:00
Benoit Marty
877de1f597 Get Public rooms and join public room 2019-05-24 11:36:04 +02:00
ganfra
3519ad7c8d Crypto : WIP 2019-05-23 19:12:06 +02:00
Valere
45ea5c356e WIP / edit message 2019-05-23 16:44:51 +02:00
Benoit Marty
71f8ce001d Fix Crash when connecting to a homeserver URL with a subpath (Fixes #133) 2019-05-22 15:23:36 +02:00
Benoit Marty
bb39db3f42 WIP 2019-05-21 16:33:43 +02:00
Benoit Marty
52d9adad70 WIP 2019-05-21 15:42:09 +02:00
Valere
118a4392a2 Fix / Support redaction of a m.replace event 
+ refactoring
 2019-05-21 15:33:16 +02:00
Valere
6f103101b6 Show edited annotation in timeline + simple edit history 2019-05-21 14:12:18 +02:00
Valere
a5a9fa3750 Color provider need to be aware of theme 2019-05-21 14:10:19 +02:00
Valere
efcac6b3e4 Fix / Missing schema for realm 2019-05-21 09:50:10 +02:00
Valere
8cb884f10e Support message edition 2019-05-20 18:52:48 +02:00
Benoit Marty
6d8000b957 Log 2019-05-20 17:13:08 +02:00
Benoit Marty
f5bd215f36 rework 2019-05-20 16:55:45 +02:00
Benoit Marty
532a028e41 Split again 2019-05-20 16:13:50 +02:00
Valere
2da4823e33 Fix / crash on logout 
cannot access deleted object from delete
 2019-05-20 13:58:45 +02:00
Valere
70c4b7528d Fix doc 2019-05-20 12:49:35 +02:00
Valere
5dfc0b3c0e Toggle Quick React (agree/disagree like/dislike) 2019-05-20 12:43:02 +02:00
Valere
71e50b1bb9 Fix / Missing inject after rebase 2019-05-20 10:16:00 +02:00
Valere
64c307077f Refactoring / PruneWorker should be a task not a worker 2019-05-20 10:16:00 +02:00
Valere
054d339b48 Fix / Reaction stays highlighted when undone 
When undoing my reaction, the reactji stays selected as if i have done the reaction
 2019-05-20 10:16:00 +02:00
Valere
e3b9031e71 Fix / day separator flicker when adding reaction 
When adding a reaction, the tmp local echo force the display of a new 'day separator' at the bottom if there was no new message for this day yet (then disappears just after -flicker-)
 2019-05-20 10:16:00 +02:00
Valere
6eafa3c43d Undo Reaction 2019-05-20 10:16:00 +02:00
ganfra
2780ca30a8 Merge branch 'feature/invites' into develop 2019-05-17 17:38:09 +02:00
Benoit Marty
e0e41d9e5c Create common action 2019-05-17 15:33:38 +02:00
Benoit Marty
340830d45f Test passed 2019-05-17 15:21:44 +02:00
Benoit Marty
de4662b9d5 Remove all async thread 2019-05-17 15:05:07 +02:00
Benoit Marty
c66e82c4ae Create OneTimeKeysManager 2019-05-17 12:39:18 +02:00
Benoit Marty
a2210a6b0d WIP 2019-05-17 11:20:22 +02:00
Benoit Marty
102bc9c01b SAS Tested 2019-05-16 17:28:51 +02:00
Valere
ef26519993 Send reaction view quick react and picker 
+ fix / Error when to many reactions in cells (more than placeholders -8-)
+ fix / DefaultTimeline quick map access was not shifted when items inserted at given index
 2019-05-16 16:35:54 +02:00
Benoit Marty
e70fd8e351 canonicalize 2019-05-16 15:36:51 +02:00
Valere
6fe455dac0 Support AddedByMe in reaction + context menu reflect agree/like state 2019-05-16 10:49:52 +02:00
Benoit Marty
1436667e7d Crypto 2019-05-16 10:34:17 +02:00
Valere
d68b447874 Relations Model + Aggregation + Reactions Summary 2019-05-16 09:21:10 +02:00
ganfra
8d0322c0c3 Hot fix LL not working 2019-05-15 11:11:38 +02:00
Valere
6bf1deb99b Code Review 2019-05-10 12:14:40 +02:00
Valere
cfca4927e2 Cleaning 2019-05-10 09:28:52 +02:00
ganfra
c39cfbe2ae Invites : allow to accept or reject the invite + clean some code. Require UI polishing. 2019-05-07 19:33:58 +02:00
Valere
56a2a3a065 [WIP] Emoji Reactions 2019-05-07 18:01:51 +02:00
ganfra
72cd409735 Invites : start handling invite/left sync 2019-05-06 19:17:30 +02:00
ganfra
ceac06caf6
Merge pull request #109 from vector-im/feature/timeline_formatting 2019-05-06 15:01:08 +02:00
ganfra
694df9d845 Timeline : fix some timeline rendering issues (senderName, merge item, left event). Still need to work on it. 2019-05-06 14:26:41 +02:00
Benoit Marty
b1b526a516 Clear cache and rework Signout 2019-04-17 15:55:38 +02:00
Benoit Marty
ab7b807740 Rename APIs 2019-04-17 12:06:15 +02:00
Benoit Marty
4c02721ada Create realm module to avoid losing credentials when Realm model change. 2019-04-17 12:06:15 +02:00
Benoit Marty
5dca31e6f9 Do not loop sync in case of JsonEncodingException (if HS is down) 2019-04-17 12:05:39 +02:00
Benoit Marty
d2e1aff453 Convert JsonFilter to FilterId 2019-04-17 12:05:39 +02:00
ganfra
dab80466c5 Timeline : extract video thumbnail and upload it 2019-04-16 17:24:28 +02:00
ganfra
2c83ba0824 Timeline : start to handle video media. Probably to amend 2019-04-12 13:46:59 +02:00
ganfra
dcac9aed55 Merge branch 'feature/media_attachment' into develop 2019-04-11 13:21:51 +02:00
ganfra
0225fc7120 Media upload: handle local echo by pinning at the bottom... will probably be changed 2019-04-11 12:48:35 +02:00
Benoit Marty
2a2b4e7bd9
Merge pull request #104 from vector-im/feature/emote 
Send emote and update room topic
 2019-04-10 09:40:32 +02:00
Benoit Marty
0055514f90 Update room topic 2019-04-09 18:33:28 +02:00
Benoit Marty
6248cc5552 Send emote 2019-04-09 17:53:23 +02:00
Benoit Marty
347967700b Linkification: import workaround done on Riot 2019-04-09 17:33:47 +02:00
Benoit Marty
81ddb8c5fb SlashCommand: handle user invitation 2019-04-09 14:44:48 +02:00
ganfra
c9658918ed Media upload : start handling progress. 2019-04-08 16:39:08 +02:00
Benoit Marty
6d3028c2d7 Autocomplete : start fetching users. Still need to adjust UI and manage selection. 2019-04-08 16:18:36 +02:00
Benoit Marty
aec7b73345 Introduce room member service 2019-04-08 15:53:02 +02:00
Benoit Marty
460a72e6b5 Create Room 2019-04-08 13:49:28 +02:00
Benoit Marty
748090d0f9 Avoid critical log for timeout on event thread 2019-04-05 11:07:45 +02:00
Benoit Marty
57cea677e4 Import resource from Riot 2019-04-05 10:14:45 +02:00
ganfra
c47eeb9cec Send media: first working implementation. Then, need to fix local echo and handle other types than image. 2019-04-04 19:55:58 +02:00
Benoit Marty
43659dffd3 Improve signout task 2019-04-04 11:10:45 +02:00
ganfra
18591d0287 Media: start to play with uploading media 2019-04-03 23:06:17 +02:00
Benoit Marty
08dacacdda SignOut 2019-04-03 18:25:39 +02:00
Benoit Marty
73580493ea Import resource from riot 2019-04-03 14:34:52 +02:00
Benoit Marty
87c9f6b2a0 Improve lint configuration 2019-04-03 12:04:24 +02:00
Benoit Marty
6830957d31 Import settings from Riot - not all fonctional of course 2019-04-02 18:08:43 +02:00
Benoit Marty
10520fb1bd Upgrade string from Riot 2019-04-02 11:57:12 +02:00
ganfra
04b4f32e16 Sync : add log and continue when read_receipts fail 2019-04-01 17:39:27 +02:00
ganfra
d110dac0a6 Merge feature/replace_paged_list into develop 2019-04-01 17:33:53 +02:00
ganfra
be6a4efacb Timeline : make tests compile and pass 2019-04-01 15:18:52 +02:00
ganfra
94db36d6c4 Fix room summary not being updated when room members are loaded 2019-03-29 11:15:27 +01:00
Benoit Marty
317503aa2b userAgent, userId and deviceId in rageshake 2019-03-28 17:49:13 +01:00
ganfra
a6366e47fe Timeline : change some database details to make it faster 2019-03-28 12:00:45 +01:00
ganfra
4154df7c21 Timeline : stabilize the pagedList replacement. Seems ok for phase0 2019-03-27 19:57:36 +01:00
Benoit Marty
79e273b1ca Add Doc 2019-03-27 18:03:36 +01:00
ganfra
ad243ae41f Clean code and update dependencies 2019-03-20 18:24:17 +01:00
ganfra
2898eae566 Timeline : reactivate loaders and get off the main thread 2019-03-20 16:24:50 +01:00
Benoit Marty
cbd62b9e93 Rename Realm DB file 2019-03-20 14:36:47 +01:00
Benoit Marty
a4ef259bd2 Add FIXME 2019-03-19 18:17:40 +01:00
Benoit Marty
40d4e3fe83 Log http requests, for easy debugging 2019-03-19 12:55:14 +01:00
Benoit Marty
f4170f55b7 Configure user agent 2019-03-19 12:29:45 +01:00
Benoit Marty
b8cceaa17a Upgrade gradle wrapper to 5.2.1, and pass first sonar analysis 2019-03-18 18:16:59 +01:00
Benoit Marty
e938866081 Fix issue in Strings 2019-03-18 16:42:19 +01:00
Benoit Marty
02c7deb783 Import strings from Riot and create a script to do so 2019-03-18 16:06:06 +01:00
ganfra
c12bc5e02d Timeline rework : first version working for backward navigation (need more testing) 2019-03-15 19:27:56 +01:00
Benoit Marty
0db1d98f41 Fix compilation issue 2019-03-15 19:18:43 +01:00
ganfra
820709d433 Timeline rework : initial commit - to amend. 2019-03-13 22:30:05 +01:00
Benoit Marty
d5838262ea Fix i18n issue 2019-03-13 18:36:57 +01:00
ganfra
2c0bc93f5a Home: getting Room interface slow (blocking Main Thread). Maybe we should get this async. 2019-02-27 17:41:06 +01:00
ganfra
41b06bca60 User : rework UserEntityUpdater (and make others RealmLiveEntityObserver process on MonarchyThread instead of Main) 2019-02-26 19:32:01 +01:00
ganfra
f59977f884 Room state: fix sync state events duplicates with timeline 2019-02-26 14:50:53 +01:00
ganfra
40f1fcab18 User : start handling users. Need to fine a good strategy to process room member events. 2019-02-25 21:55:33 +01:00
ganfra
6c7bc2b40c Timeline: get better perf 2019-02-25 18:10:37 +01:00
ganfra
ca890e1ef4 Room tag: let the tag order be anything to avoid breaking at the moment. 2019-02-20 18:09:07 +01:00
ganfra
28c837a47f Timeline: handle call events 2019-02-20 15:47:20 +01:00
ganfra
42cf45c8f3 Timeline: handle room history visibility 2019-02-20 12:06:33 +01:00
ganfra
9477316b61 Sync : add timber log on sync failure 2019-02-19 19:37:16 +01:00
ganfra
b5f40f9732 Add stetho in debug to allow some inspection 2019-02-19 17:40:38 +01:00
ganfra
a12a9da627 Update Realm 2019-02-18 17:42:03 +01:00
ganfra
c42294a21e Handle room v3 event id format 2019-02-18 17:41:35 +01:00
ganfra
03437885ef Read receipts : fix issues with receipts not being sent 2019-02-18 17:41:21 +01:00
ganfra
30bfada5d2 Merge branch 'feature/room_list' into develop 2019-01-31 12:15:43 +01:00
ganfra
6c653287e1 Read receipts : fix read receipt being sent for dummyEvent + scroll appearing index 2019-01-31 11:45:11 +01:00
ganfra
6113bba703 Timeline : send read-receipt when scrolling. Still need to handle read marker. 2019-01-30 18:39:54 +01:00
ganfra
0e491af8ab Room list : adjust some params 2019-01-29 18:31:11 +01:00
ganfra
6df8809ee0 Room list : add quick ordering 2019-01-29 16:02:42 +01:00
ganfra
d3d536f4f0 Room : add RoomTag to handle favourites, low priority and system alerts in room list. 2019-01-29 14:16:22 +01:00
ganfra
0f66fa0895 Room : refactoring how a room is created 2019-01-28 18:42:29 +01:00
ganfra
b2e2c14e69 Room : start to handle read markers. Only used when you open the room at the moment. 2019-01-28 17:56:23 +01:00
ganfra
ad2abd5cdd Fix messages content info can be null 2019-01-25 18:40:02 +01:00
ganfra
9a42c121e4 Room list : show unread badge with room name. Still need to mark a room as read to update marker. 2019-01-25 18:04:08 +01:00
ganfra
c33e96b82c Add comments in API packages 2019-01-25 15:44:41 +01:00
ganfra
9dccad11fe Update copyright and add to last merged commits 2019-01-25 14:04:59 +01:00
ganfra
4c7a6dfe33 Merge branch 'feature/timeline_media' into develop 2019-01-25 12:36:01 +01:00
ganfra
946ae32cd8 Let the app be compatible with android 16 2019-01-24 16:30:05 +01:00
ganfra
7c4ac7b53a Media : start to refact renderer to be more generic 2019-01-23 20:29:47 +01:00
ganfra
f9ca8f35bc Fix MessageFileContent crash (no filename) 2019-01-23 16:25:51 +01:00
ganfra
cc4c1cf308 Content : make content url resolution aware of homeserver url 2019-01-23 16:25:24 +01:00
ganfra
1d400180bc Timeline : start to handle media images/gif. Still a lot to do, but it's a first step. 2019-01-22 18:43:15 +01:00
ganfra
32b29c47e7 Hot fix : makes room topic optional as it may be null. 2019-01-21 18:31:19 +01:00
ganfra
dbb812ad84 Message type : add data classes for all the types 2019-01-21 18:16:15 +01:00