Commit graph

321 commits

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