6543/BayernMessenger
1
0
Fork 0
forked from GitHub-Mirror/riotX-android
Code Issues 4 Pull Requests Releases Wiki Activity
1,050 Commits 12 Branches 0 Tags 22 MiB
fe69206340
Commit Graph

529 Commits

Author SHA1 Message Date
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