Commit Graph

19740 Commits

Author SHA1 Message Date
Benoit Marty 51879845f2
Merge pull request #186 from vector-im/feature/crypto_up
Crypto work
2019-06-17 19:07:24 +02:00
Benoit Marty f2372841f6 KeysBackup: import change from https://github.com/vector-im/riot-android/pull/3127 2019-06-17 19:07:04 +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 0b6b95110f
Merge pull request #182 from vector-im/feature/cryptoKeys
Crypto: Import/export room keys (the old way)
2019-06-17 19:05:43 +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 907a1d1a4b Import keys: WIP 2019-06-17 19:05:26 +02:00
Benoit Marty 99d2e8388a Fix crash 2019-06-17 19:04:48 +02:00
Benoit Marty 38b1d24953 Use foldToCallback() whenever it's possible 2019-06-17 19:04:48 +02:00
Benoit Marty b682f3e982 Cleaner code 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 8c8a4dcbd1 Fix margin issue when second text is not displayed 2019-06-17 18:13:34 +02:00
Benoit Marty 7e9275831b
Merge pull request #180 from vector-im/feature/fix_timeline
Request can now be canceled properly
2019-06-17 18:01:46 +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 5b0cab3e8a Merge branch 'feature/i18n_sync' into develop 2019-06-17 14:55:54 +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 e3bc88e36c
Merge pull request #183 from vector-im/feature/motionLayout
Better anim of ome button
2019-06-14 16:17:27 +02:00
Benoit Marty eaf1e080ba format file 2019-06-14 16:14:39 +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
Benoit Marty 567c1fd7a5
Merge pull request #175 from vector-im/feature/crypto
Feature/crypto
2019-06-13 15:28:09 +02:00
Benoit Marty ab95cbee92 Improve keys backup banner rendering 2019-06-13 14:20:43 +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 6cd3b4dd95 Import https://github.com/vector-im/riot-android/pull/3111/files in RiotX 2019-06-13 10:33:04 +02:00
Benoit Marty 480d197ffa Keys share request handling 2019-06-12 18:32:24 +02:00
Benoit Marty a7c0e87f40 Alerter: upgrade lib and change status icon color when alert is displayed 2019-06-12 16:30:30 +02:00
Benoit Marty af1a48d918 SAS: fix issue on emoji rendering 2019-06-12 15:44:25 +02:00
Benoit Marty e17ffc85e7 KeysBackup: save recovery key to file 2019-06-12 14:59:54 +02:00
Benoit Marty 9c654ba72c Use observeEvent when appropriate 2019-06-12 13:19:52 +02:00
Benoit Marty b47ef9220e Keys backup: migrate settings to Epoxy and MvRx 2019-06-12 13:09:43 +02:00
ganfra 0204bade8b Content: hide some internal methods 2019-06-12 10:54:26 +02:00
ganfra 481a25d4df Settings: add some webview content 2019-06-12 10:53:48 +02:00
ganfra 3dd161d65a Sync: add progress indicator for sync, need UI inputs. 2019-06-11 16:54:44 +02:00
Benoit Marty 53dd9c3427 Keys backup fix some issue on layout 2019-06-11 16:48:48 +02:00
Benoit Marty 4827b76b80 Integrate keysbackup banner 2019-06-11 15:45:40 +02:00
Valere 1206107a73 Fix / visibility bug after scroll
+ refine animation
2019-06-11 15:43:40 +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