jarno
/
element-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
6,651 Commits 4 Branches 3 Tags 186 MiB
Commit Graph

2607 Commits

Author SHA1 Message Date
Benoit Marty 5237eb0638
Merge branch 'develop' into feature/bma/fix_cancel 2020-12-07 12:41:37 +01:00
Benoit Marty d889598b20 Fix DefaultLocale lint issue 2020-12-02 17:04:54 +01:00
Benoit Marty c426364618 Remove unused dependencies 2020-12-02 12:45:31 +01:00
Benoit Marty 42bc4d2445 Upgrade some dependencies and Kotlin version 2020-12-02 12:09:56 +01:00
Benoit Marty a813610c04 Room setting: update join rules and guest access (#2442) 2020-11-30 17:52:16 +01:00
Benoit Marty 9c53f0f881 Clarify aliasLocalPart 2020-11-30 10:59:07 +01:00
Benoit Marty 50ddd3cf31 Small cleanup, handle case of no local alias, handle unpublish of canonical alias 2020-11-30 10:59:07 +01:00
Benoit Marty 412fc78c9a Cleanup 2020-11-30 10:59:07 +01:00
Benoit Marty 0da0857970 Cleanup 2020-11-30 10:59:07 +01:00
Benoit Marty 90e0006cae Room directory visibility management 2020-11-30 10:59:07 +01:00
Benoit Marty 82b23d9a13 Ensure we push only clean m.room.canonical_alias event 2020-11-30 10:59:07 +01:00
Benoit Marty ed4676bb6c Cleanup and avoid duplicate 2020-11-30 10:59:07 +01:00
Benoit Marty 93580c902f Prepare to update canonical alias state 2020-11-30 10:59:07 +01:00
Benoit Marty 27fc5f265f Add/Remove local alias (#2428) 2020-11-30 10:59:07 +01:00
Benoit Marty 5b618ba1f3 Create RoomDirectoryAPI, and handle deletion of alias 2020-11-30 10:59:07 +01:00
Benoit Marty a6f56ace24 Create a dedicated screen to manage room alias (#2428) - WIP 2020-11-30 10:59:07 +01:00
Benoit Marty 0d93105bcd Rended m.room.canonical_alias event in the timeline, considering alt_aliases (#2428) 2020-11-30 10:59:07 +01:00
Benoit Marty 7c2fea8623 Typo 2020-11-30 10:59:07 +01:00
Benoit Marty 03715e0939 Do not use m.room.aliases event to compute a room name (#2428) 2020-11-30 10:59:07 +01:00
Benoit Marty 4d9b9cb959 Deprecated event m.room.aliases 2020-11-30 10:59:07 +01:00
Benoit Marty b004dfbdf2
Merge pull request #2457 from Dominaezzz/suspend_functions_2 
Convert IntegrationManagerService to suspend functions
 2020-11-30 10:49:46 +01:00
Benoit Marty 40ea91cce4
Merge pull request #2459 from Dominaezzz/suspend_functions_3 
Convert UploadsService to suspend functions
 2020-11-30 10:48:44 +01:00
Benoit Marty abcb02d4aa
Merge pull request #2460 from Dominaezzz/suspend_functions 
Convert TermsService to suspend functions
 2020-11-30 10:47:55 +01:00
Benoit Marty cd983de058 Fix cancellation of sending event (#2438) 2020-11-30 10:08:31 +01:00
Benoit Marty f6cc05634f Send task: small rework and cleanup 2020-11-30 10:08:05 +01:00
Dominic Fischer 33a5cc1488 Remove redundant returns 
Signed-off-by: Dominic Fischer <dominicfischer7@gmail.com>
 2020-11-27 13:18:07 +00:00
Benoit Marty bc889cbcf4
Merge pull request #2444 from vector-im/feature/bca/deeplink_mxto 
Fix issues with matrix.to deep linking
 2020-11-27 10:22:51 +01:00
Weblate d80927a8f9 Merge branch 'origin/develop' into Weblate. 2020-11-27 07:37:32 +00:00
Dominic Fischer 27050b911b Convert TermsService to suspend functions 
Signed-off-by: Dominic Fischer <dominicfischer7@gmail.com>
 2020-11-26 21:53:22 +00:00
Dominic Fischer a3a2c0a9a8 Convert UploadsService to suspend functions 
Signed-off-by: Dominic Fischer <dominicfischer7@gmail.com>
 2020-11-26 21:51:58 +00:00
Dominic Fischer 92ceb0e8fb Convert IntegrationManagerService to suspend functions 
Signed-off-by: Dominic Fischer <dominicfischer7@gmail.com>
 2020-11-26 21:17:58 +00:00
Valere 4c599d3d40
Merge pull request #2451 from vector-im/feature/bca/fix_update_profile_no_rooms 
Fix / update profile when no rooms
 2020-11-26 15:09:40 +01:00
Valere 67057bfac4
Merge pull request #2417 from vector-im/feature/bca/quick_invite_dm_tab 
Feature/bca/quick invite dm tab
 2020-11-26 14:58:14 +01:00
Valere fbc3f47eeb Fix / update profile when no rooms 2020-11-26 14:34:45 +01:00
Valere 8e6e6736a3 Code review 2020-11-26 09:09:27 +01:00
notramo d2398a7abb Translated using Weblate (Hungarian) 
Currently translated at 83.1% (158 of 190 strings)

Translation: Element Android/Element Android Sdk
Translate-URL: https://translate.element.io/projects/element-android/element-sdk/hu/
 2020-11-25 08:50:03 +00:00
Valere 1f69c7e992 Better e2e log reporting 2020-11-20 17:37:20 +01:00
Benoit Marty b888d13e62 Use orEmpty() 2020-11-20 14:50:21 +01:00
Benoit Marty 1070c23608 QR code invite flow support - invite friends 
Author: Valere
 2020-11-20 14:50:21 +01:00
Benoit Marty 5b278f704c
Merge pull request #2427 from vector-im/feature/bma/dominaezz_cleanup 
Feature/bma/dominaezz cleanup
 2020-11-20 14:11:53 +01:00
Benoit Marty 85bc5f54aa
Merge branch 'develop' into feature/bma_create_room_form 2020-11-20 13:57:35 +01:00
Benoit Marty 41f46d0810
Merge pull request #2367 from vector-im/feature/bma/sanity_test 
Feature/bma/sanity test
 2020-11-20 13:56:49 +01:00
Benoit Marty 9ce1222fd0 Kotlin optimization form #1435 2020-11-20 09:07:29 +01:00
Benoit Marty 8fb3c68573 Kotlin optimization form #1435 2020-11-20 09:05:53 +01:00
Benoit Marty eb7ee49096 Kotlin optimization form #1435 2020-11-20 09:04:04 +01:00
Benoit Marty 5eb50750e2
Merge branch 'develop' into feature/fix_user_vs_room_member 2020-11-19 17:02:35 +01:00
Benoit Marty 0046fe25c5
Merge branch 'develop' into feature/ons/fix_badge_color 2020-11-19 17:00:49 +01:00
Benoit Marty fdb13f0b77
Merge pull request #2385 from vector-im/feature/bma/fdroid_60_timeout 
F-Droid version: ensure timeout of sync request can be more than 60 s…
 2020-11-19 16:59:40 +01:00
Benoit Marty d5f83acaf5
Merge pull request #2414 from Dominaezzz/suspend_functions_2 
Convert PushRuleService to suspend functions
 2020-11-19 15:32:01 +01:00
Benoit Marty 4df68479ac
Merge pull request #2369 from vector-im/feature/bca/quick_invite_room_tile 
EmptyRoom tile with quick actions
 2020-11-19 09:46:25 +01:00