mirrors/element-android
1
0
Fork 0
mirror of https://github.com/element-hq/element-android synced 2024-10-26 04:36:48 +03:00
Code Issues Projects Releases Packages Wiki Activity
6664 commits 162 branches 157 tags 267 MiB
Commit graph

4113 commits

Author SHA1 Message Date
Valere
a8b5a5227f Code review update 2020-11-25 15:47:27 +01:00
Daniel Løvbrøtte Olsen
0e908ad882 Translated using Weblate (Norwegian Bokmål) 
Currently translated at 43.1% (834 of 1933 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/nb_NO/
 2020-11-25 08:50:02 +00:00
ganfra
7620aa4264 VoIP: continue refactoring 2020-11-24 22:21:21 +01:00
ganfra
d7f7aa09fc VoIP: continue refactoring by introducing WebRtcCall 2020-11-23 18:30:15 +01:00
Ed Geraghty
bc6debea89
Disable native dialler integration on jitsi widget 
Native dialler integration breaks the jitsi widget for those of us with non-vanilla telephony frameworks.

Disabling this integration (as is default on the Jitsi Meet Android app) allows us to also join conference calls, with no adverse effect on those for whom it already works.

Signed-off-by: Ed Geraghty <ed@geraghty.london>
 2020-11-22 23:13:01 +00:00
keraint
d5523b18b9 Translated using Weblate (French) 
Currently translated at 100.0% (1933 of 1933 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/fr/
 2020-11-21 08:49:59 +00:00
Valere
d9757cc660 Fix lint 2020-11-20 16:23:04 +01:00
Valere
1cb3522e73 Fix string 2020-11-20 15:46:21 +01:00
Valere
7583b0a358 Fix rebase 2020-11-20 15:17:35 +01:00
Valere
77863e2e88 copy tweaks 2020-11-20 14:50:21 +01:00
Valere
564404d4ae Design review 2020-11-20 14:50:21 +01:00
Valere
e2320cd3b2 Upgrade to new design input 2020-11-20 14:50:21 +01:00
Valere
fd92d6559c Refact move utility method open settings 2020-11-20 14:50:21 +01:00
Valere
6146925757 Better error handling Rx call 2020-11-20 14:50:21 +01:00
Valere
baef9f5aa7 Fix permission handling + share my code by text 2020-11-20 14:50:21 +01:00
Benoit Marty
ae6de8fdf1 Small cleanup 2020-11-20 14:50:21 +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
TR-SLimey
e8d084b855 Add ability to share profile by QR code 2020-11-20 14:49:39 +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
ganfra
be3bfe7e5e VoIP: remove dependency over WebRtc on SDK 2020-11-20 12:19:30 +01:00
ganfra
f960cf2ce9 VoIP: allow hold/resume from sdk (activate unified plan semantics) 2020-11-19 20:44:33 +01:00
Benoit Marty
675e4579ac
Merge branch 'develop' into feature/bma/fix_crash 2020-11-19 18:44:17 +01:00
Benoit Marty
d2880432da
Merge pull request #2366 from vector-im/feature/bma/cleanup 
Feature/bma/cleanup
 2020-11-19 17:49:17 +01:00
Benoit Marty
f9e4b689b7
Merge branch 'develop' into feature/bma/crop_issue 2020-11-19 17:25:36 +01:00
Benoit Marty
5eb50750e2
Merge branch 'develop' into feature/fix_user_vs_room_member 2020-11-19 17:02:35 +01:00
Besnik Bleta
029d8574f1 Translated using Weblate (Albanian) 
Currently translated at 99.4% (1923 of 1933 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/sq/
 2020-11-19 15:49:59 +00: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
c50c028c9e Code quality 2020-11-19 15:22:24 +01:00
Benoit Marty
465b33b006
Merge pull request #2407 from vector-im/feature/bma/move_enable_encryption 
Move "Enable Encryption" from room setting screen to room profile screen
 2020-11-19 15:17:13 +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
Benoit Marty
3ec25f3634
Merge pull request #2413 from Dominaezzz/suspend_functions 
Convert Group to suspend functions
 2020-11-19 02:05:06 +01:00
Benoit Marty
c29e4648ea Small cleanup 2020-11-18 18:13:49 +01:00
Benoit Marty
9ed8f26d7c Make the room default avatar clickable to set it (as per the small picto) 
And do some cleanup
 2020-11-18 18:13:49 +01:00
Valere
1de5cd2e61 Code review 2020-11-18 18:13:49 +01:00
Valere
264bc52bcc WIP review 2020-11-18 18:13:49 +01:00
Valere
2626a761ea EmptyRoom tile with quick actions 2020-11-18 18:13:49 +01:00
Benoit Marty
ca0da2c509
Merge pull request #2405 from Dominaezzz/suspend_functions_1 
Convert DraftService to suspend functions
 2020-11-18 16:00:33 +01:00
Benoit Marty
57d55e05e7 Update comment 2020-11-18 15:36:05 +01:00
Benoit Marty
702d21fbc3 No encryption for public room (#1314) 2020-11-18 15:27:59 +01:00
Dominic Fischer
796ba72bde Reorder 
Signed-off-by: Dominic Fischer <dominicfischer7@gmail.com>
 2020-11-18 14:27:46 +00:00
Benoit Marty
0c7f4c2af5 Reset error in the form 2020-11-18 15:13:43 +01:00
Benoit Marty
f6aee3d64e Cleanup 2020-11-18 14:54:01 +01:00
Benoit Marty
514263ae12 Room creation Fragment: no more "Retry" action, loading and error displayed in a dialog 2020-11-18 14:51:10 +01:00
Benoit Marty
507d5d3758 Warn the user if room alias is not empty and he wants to leave the form. 2020-11-18 14:21:53 +01:00
Benoit Marty
16b6678aa2 CreateRoomFragment: use argument instead of Activity ViewModel to pass the initial room name 2020-11-18 14:14:43 +01:00
Benoit Marty
af8b400bf4 Room creation form: input an alias for public room (#1314) 2020-11-18 13:44:55 +01:00
Dominic Fischer
94b135ae95 Convert PushRuleService to suspend functions 
Signed-off-by: Dominic Fischer <dominicfischer7@gmail.com>
 2020-11-18 12:19:58 +00:00
Dominic Fischer
e42cad68b4 Convert Group to suspend functions 
Signed-off-by: Dominic Fischer <dominicfischer7@gmail.com>
 2020-11-18 12:16:53 +00:00
Rintan
5bf4fffd2f Translated using Weblate (Japanese) 
Currently translated at 50.5% (978 of 1933 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/ja/
 2020-11-18 09:50:01 +00:00
ganfra
48354721a2 VoIP: start handling negotiation flow (wip) 2020-11-17 17:06:49 +01:00
Dominic Fischer
82b21e6a09 Ensure draft is saved with NonCancellable 
Signed-off-by: Dominic Fischer <dominicfischer7@gmail.com>
 2020-11-17 10:53:57 +00:00
AlexanderLevchenkoTechs
a8f2fd3f4b Translated using Weblate (Ukrainian) 
Currently translated at 43.6% (844 of 1933 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/uk/
 2020-11-16 23:50:02 +00:00
Rob Johnson
7223959fda Translated using Weblate (Spanish) 
Currently translated at 100.0% (1933 of 1933 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/es/
 2020-11-16 23:50:01 +00:00
Victor Cuadrado Juan
cf5d112e31 Translated using Weblate (Spanish) 
Currently translated at 100.0% (1933 of 1933 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/es/
 2020-11-16 23:50:01 +00:00
Pol Gómez Riquelme
b24608891e Translated using Weblate (Catalan) 
Currently translated at 60.5% (1171 of 1933 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/ca/
 2020-11-16 23:49:58 +00:00
Benoit Marty
579efb016a Room creation form: add advanced section to disable federation (#1314) 2020-11-16 18:02:18 +01:00
Benoit Marty
75c105a400 Move "Enable Encryption" from room setting screen to room profile screen (#2394) 2020-11-16 15:08:10 +01:00
Dominic Fischer
0a318f618b Convert RawService to suspend functions 
Signed-off-by: Dominic Fischer <dominicfischer7@gmail.com>
 2020-11-16 13:48:19 +00:00
Dominic Fischer
574d5055bd Convert DraftService to suspend functions 
Signed-off-by: Dominic Fischer <dominicfischer7@gmail.com>
 2020-11-16 13:46:24 +00:00
Benoit Marty
4c6996bc09
Merge branch 'develop' into feature/bma/consent 2020-11-16 13:43:02 +01:00
Benoit Marty
6ff12b3a88
Merge pull request #2402 from Dominaezzz/suspend_functions_1 
Convert ReportingService to suspend functions
 2020-11-16 13:39:47 +01:00
Benoit Marty
babbb82a49
Merge pull request #2401 from Dominaezzz/suspend_functions 
Convert TagsService to suspend functions
 2020-11-16 13:38:22 +01:00
Dominic Fischer
d67029c42c Convert ReportingService to suspend functions 
Signed-off-by: Dominic Fischer <dominicfischer7@gmail.com>
 2020-11-16 11:47:18 +00:00
Dominic Fischer
4dff9316c2 Convert TagsService to suspend functions 
Signed-off-by: Dominic Fischer <dominicfischer7@gmail.com>
 2020-11-16 11:44:30 +00:00
Benoit Marty
a056cbd19f Registration: annoying error message scares every new user when they add an email (#2391) 2020-11-16 10:57:29 +01:00
sr093906
b739aa35f2 Translated using Weblate (Chinese (Simplified)) 
Currently translated at 99.1% (1917 of 1933 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/zh_Hans/
 2020-11-14 16:50:02 +00:00
LinAGKar
fa3035f9cf Translated using Weblate (Swedish) 
Currently translated at 100.0% (1933 of 1933 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/sv/
 2020-11-14 16:50:01 +00:00
notramo
daf1362d28 Translated using Weblate (Hungarian) 
Currently translated at 94.9% (1835 of 1933 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/hu/
 2020-11-14 16:50:01 +00:00
XoseM
8e7d5ddfd4 Translated using Weblate (Galician) 
Currently translated at 27.3% (529 of 1933 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/gl/
 2020-11-14 16:50:01 +00:00
François FERREIRA DE SOUSA
71a70ffafa Translated using Weblate (French) 
Currently translated at 100.0% (1933 of 1933 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/fr/
 2020-11-14 16:50:00 +00:00
Danial Behzadi
d9ceb32e2f Translated using Weblate (Persian) 
Currently translated at 98.4% (1904 of 1933 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/fa/
 2020-11-14 16:50:00 +00:00
Victor Cuadrado Juan
13f716a395 Translated using Weblate (Spanish) 
Currently translated at 97.3% (1881 of 1933 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/es/
 2020-11-14 16:50:00 +00:00
Nils Büchner
b9375a1b4e Translated using Weblate (German) 
Currently translated at 100.0% (1933 of 1933 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/de/
 2020-11-14 16:49:58 +00:00
Auri B. P
38a98a51cb Translated using Weblate (Catalan) 
Currently translated at 60.5% (1170 of 1933 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/ca/
 2020-11-14 16:49:57 +00:00
Benoit Marty
8ae0501c22 Try to fix cropped image in timeline (#2126) 2020-11-13 17:52:02 +01:00
ganfra
03e89743b4 VoIP: add select answer 2020-11-13 16:32:45 +01:00
Benoit Marty
8dff0b2c5d Cleanup 2020-11-13 15:33:44 +01:00
Benoit Marty
a713b97e36
Merge pull request #2382 from Dominaezzz/suspend_functions_1 
Convert RoomPushRuleService to suspend functions
 2020-11-13 15:25:31 +01:00
Benoit Marty
b6acc8da70
Merge pull request #2376 from Dominaezzz/suspend_functions 
Convert RoomCryptoService to suspend functions
 2020-11-13 15:23:06 +01:00
ganfra
ba11ca0e9d VoIP: add partyId and handle version as string 2020-11-13 11:53:22 +01:00
Benoit Marty
b99cdf7367 Handle events of type "m.room.server_acl" - details only in developer mode (#890) 2020-11-13 11:07:50 +01:00
Dominic Fischer
60ce351a27 Convert RoomPushRuleService to suspend functions 
Signed-off-by: Dominic Fischer <dominicfischer7@gmail.com>
 2020-11-13 00:10:53 +00:00
Benoit Marty
413a55623e Handle events of type "m.room.server_acl" (#890) 2020-11-13 00:39:16 +01:00
Marcelo Filho
5b2f95d270 Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 100.0% (1933 of 1933 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/pt_BR/
 2020-11-12 18:50:01 +00:00
Deleted User
44604c2509 Translated using Weblate (Norwegian Bokmål) 
Currently translated at 42.2% (816 of 1933 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/nb_NO/
 2020-11-12 18:50:01 +00:00
Kaede
bf2a7c2efd Translated using Weblate (Japanese) 
Currently translated at 48.6% (941 of 1933 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/ja/
 2020-11-12 18:50:00 +00:00
notramo
ba5c42cc51 Translated using Weblate (Hungarian) 
Currently translated at 94.9% (1835 of 1933 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/hu/
 2020-11-12 18:49:59 +00:00
OLIVIER Thomas
cf2ea0f51c Translated using Weblate (French) 
Currently translated at 99.9% (1932 of 1933 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/fr/
 2020-11-12 18:49:58 +00:00
Valere
9df002fe4e Translated using Weblate (French) 
Currently translated at 99.9% (1932 of 1933 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/fr/
 2020-11-12 18:49:58 +00:00
François FERREIRA DE SOUSA
1a191c7d51 Translated using Weblate (French) 
Currently translated at 99.9% (1932 of 1933 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/fr/
 2020-11-12 18:49:58 +00:00
Hivaa
7ca57d918e Translated using Weblate (Persian) 
Currently translated at 98.2% (1899 of 1933 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/fa/
 2020-11-12 18:49:58 +00:00
Auri B. P
fe40e74809 Translated using Weblate (Catalan) 
Currently translated at 60.1% (1162 of 1933 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/ca/
 2020-11-12 18:49:57 +00:00
Benoit Marty
6020f423f4 Ask for explicit user consent to send their contact details to the identity server (#2375) 2020-11-11 17:51:39 +01:00
Benoit Marty
99bea8f7c3 small change in signature 2020-11-11 16:40:33 +01:00
Benoit Marty
d1e2d06538 Add userConsent UI to the Discovery screen 2020-11-11 16:15:38 +01:00
Dominic Fischer
3ce8deec07 Convert RoomCryptoService to suspend functions 
Signed-off-by: Dominic Fischer <dominicfischer7@gmail.com>
 2020-11-11 13:01:46 +00:00
Benoit Marty
d1848fd5f7 Fix compilation issue :) 2020-11-10 16:01:19 +01:00
Benoit Marty
f57fc827fe Last cleanup 2020-11-10 15:37:28 +01:00
Benoit Marty
45e534bbf5 DRY again 2020-11-10 15:33:24 +01:00
Benoit Marty
bfcd4b8250 Extract AttachmentProviderFactory to its own file 2020-11-10 15:26:59 +01:00
Benoit Marty
510f8ae0f5 DRY 2020-11-10 15:26:13 +01:00
ganfra
c9defec75d Update CHANGES and clean files 2020-11-10 15:18:41 +01:00
Benoit Marty
ca70ddb810 DRY 2020-11-10 15:15:42 +01:00
ganfra
bf9d80c14c Merge branch 'develop' into feature/fix_user_vs_room_member 2020-11-10 15:15:28 +01:00
Benoit Marty
83467b8597 Fix crash on AttachmentViewer (#2365) 
Not sure how to reproduce it, but if the value is -1, it will crash for sure
 2020-11-10 15:12:21 +01:00
Benoit Marty
816301bf8d More cleanup 2020-11-10 15:09:49 +01:00
Benoit Marty
345e8a0679 i18n 2020-11-10 15:06:51 +01:00
Benoit Marty
bcd384c31c Small cleanup 2020-11-10 14:46:19 +01:00
Michael Telatynski
bbbaa60ddd
Merge branch 'develop' into fix_draft_sharesheet 2020-11-10 11:34:29 +00:00
Benoit Marty
0150d3961b
Merge pull request #2354 from Dominaezzz/suspend_functions 
Convert `AccountService` to suspend functions
 2020-11-10 10:36:44 +01:00
Benoit Marty
cedeea13e6 Fix discard change dialog displayed by mistake when avatar has been updated 2020-11-09 23:00:19 +01:00
Benoit Marty
8f78c4a0fb Fix issue of verification banner displayed after logout 2020-11-09 21:08:53 +01:00
Benoit Marty
a37af307f4 Making progress 2020-11-09 20:03:44 +01:00
Dominic Fischer
6207aab19d Remove cancellation handling 
Signed-off-by: Dominic Fischer <dominicfischer7@gmail.com>
 2020-11-09 17:20:23 +00:00
Benoit Marty
01a5ec4c41 Go deeper in the settings 2020-11-09 16:56:20 +01:00
Benoit Marty
b09d45718a Make id for recyclerView less generic, and remove unused layout 2020-11-09 16:56:20 +01:00
Benoit Marty
07c805a019 Create sanity test with all screens path 
Introduce `com.schibsted.spain:barista`
 2020-11-09 16:56:20 +01:00
Benoit Marty
ea4e9b8e5e Fix "Riot is now Element" dialog displayed by mistake, after a logout 2020-11-09 16:56:20 +01:00
Dominic Fischer
dee6f35888 Fix draft bug 
Signed-off-by: Dominic Fischer <dominicfischer7@gmail.com>
 2020-11-08 14:57:15 +00:00
Dominic Fischer
62ca9a2a84 Fix misleading identifier 
Signed-off-by: Dominic Fischer <dominicfischer7@gmail.com>
 2020-11-08 14:37:02 +00:00
random
ad64651532 Translated using Weblate (Italian) 
Currently translated at 100.0% (1933 of 1933 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/it/
 2020-11-08 10:49:57 +00:00
Auri B. P
edc47b56a4 Translated using Weblate (Catalan) 
Currently translated at 59.4% (1149 of 1933 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/ca/
 2020-11-08 10:49:56 +00:00
Slavi Pantaleev
f39b3365db Translated using Weblate (Bulgarian) 
Currently translated at 100.0% (1933 of 1933 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/bg/
 2020-11-08 10:49:55 +00:00
Dominic Fischer
0da4ff7b02 Run ktlint 2020-11-06 19:20:23 +00:00
Dominic Fischer
35768ff7e8 Convert AccountService to suspend functions 
Signed-off-by: Dominic Fischer <dominicfischer7@gmail.com>
 2020-11-06 16:49:51 +00:00
ganfra
6dfdc77ebd Use room member instead of user when it makes sense 2020-11-06 14:41:43 +01:00
Jeff Huang
2a22d71e7c Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (1933 of 1933 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/zh_Hant/
 2020-11-06 02:49:59 +00:00
Marcelo Filho
eaa7fb7100 Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 99.7% (1929 of 1933 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/pt_BR/
 2020-11-06 02:49:58 +00:00
Priit Jõerüüt
9755dd73eb Translated using Weblate (Estonian) 
Currently translated at 100.0% (1933 of 1933 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/et/
 2020-11-06 02:49:58 +00:00
Auri B. P
4c2e62031a Translated using Weblate (Catalan) 
Currently translated at 58.9% (1140 of 1933 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/ca/
 2020-11-06 02:49:58 +00:00
Benoit Marty
51a95554d7 Remove useless code. We can now inject element in the Fragment constructors 2020-11-05 18:30:00 +01:00
Benoit Marty
12d8bd1743 Cleanup after rebase - avoid computing twice the existing roomId 2020-11-05 17:34:10 +01:00
Onuray Sahin
458b4259fe Change menu action title for existing rooms. 2020-11-05 17:02:13 +01:00
Onuray Sahin
e7714da8e8 Navigate to an existing DM instead of creating a new one. 2020-11-05 17:02:13 +01:00
Benoit Marty
de39a17247 Fix issue on setting avatar on a room. 
We deleted the just added avatar because `withState {}` is asynchronous
 2020-11-05 16:09:04 +01:00
Benoit Marty
5c7a5fab94 Improve API: rename the method and return empty list instead of null 2020-11-05 15:47:28 +01:00
Benoit Marty
c9e0aff839 DRY 2020-11-05 15:42:44 +01:00
Benoit Marty
b7a1f96294 Append to file but before the extension 2020-11-05 15:40:12 +01:00
Benoit Marty
15ad351579 Some fixes from Valere about verification 2020-11-05 15:33:28 +01:00
Benoit Marty
6cb4645514 Add a key to the category, to be able to hide it 2020-11-05 15:28:13 +01:00
Benoit Marty
17fed39b27 Version++ 2020-11-04 16:00:16 +01:00
Weblate
f3b8bb066c Merge branch 'origin/develop' into Weblate. 2020-11-04 13:43:47 +00:00
LinAGKar
b879be2b02 Translated using Weblate (Swedish) 
Currently translated at 100.0% (1929 of 1929 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/sv/
 2020-11-04 13:43:37 +00:00
Hivaa
52e699e125 Translated using Weblate (Persian) 
Currently translated at 98.4% (1899 of 1929 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/fa/
 2020-11-04 13:43:36 +00:00
Benoit Marty
b15fa7c0d7 Two elements in the task switcher (#2299) 2020-11-04 14:32:54 +01:00
Benoit Marty
d1d2c5f117
Merge pull request #2327 from vector-im/feature/bma/keysbackupcrash 
Feature/bma/keysbackupcrash
 2020-11-04 00:02:48 +01:00
Benoit Marty
0db1095373
Merge pull request #2334 from vector-im/feature/bca/crypto_db_clean 
Feature/bca/crypto db clean
 2020-11-03 10:31:53 +01:00
Benoit Marty
d4963dfb31 Use the same name for the 2 db log methods 2020-11-03 09:17:07 +01:00