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

911 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Valere
56aaa9dce3 Fix / updated unicode for smiling 2019-06-24 16:15:26 +02:00
Valere
43ead66991 Update quick reactions to new design 2019-06-24 16:13:58 +02:00
Benoit Marty
92eb7d55dc
Merge pull request #207 from vector-im/feature/version 
Display some version of Riot and SDK (Fix #185)
 2019-06-21 17:07:55 +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
1eb374fa49
Merge pull request #188 from vector-im/feature/disambiguation 
Disambiguation of display names
 2019-06-20 17:29:01 +02:00
Benoit Marty
285da114e7 better code (ganfra's review) 2019-06-20 17:27:15 +02:00
Benoit Marty
34870591b4 Update wording 2019-06-20 17:22:38 +02:00
ganfra
ee87c253fe Dagger: continue working on app side. Now compile but some DI are not branched yet. 2019-06-19 19:40:59 +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
b1f5b3ad96
Merge pull request #187 from vector-im/feature/issues_fix 
Add a few feature
 2019-06-18 16:03:36 +02:00
Benoit Marty
02f84a3b53 View source of encrypted event 2019-06-18 13:14:39 +02:00
Benoit Marty
7fe662598b Handle click on encryption message 2019-06-18 12:56:08 +02:00
Benoit Marty
5bfa67b442 Handle click on encrypted message 2019-06-18 12:45:24 +02:00
Benoit Marty
a53e40e1ee Create MessageInformationDataFactory for reusability 2019-06-18 12:33:07 +02:00
Benoit Marty
273c8a19b8 Fix UI issue notification troubleshot screen 2019-06-18 10:30:56 +02:00
Benoit Marty
53bdd58c1b Fix UI issue on BugReportActivity (send button not visible) 2019-06-18 10:25:13 +02:00
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