Commit graph

5686 commits

Author SHA1 Message Date
S1m
6c153d04da Merge remote-tracking branch 'upstream/develop' into unifiedpush 2021-07-07 00:49:54 +02:00
Benoit Marty
e9da63e3ee
Merge pull request #3635 from vector-im/feature/bma/crash_room_aliases
Fix crash in room aliases
2021-07-06 12:15:37 +02:00
Benoit Marty
ca9f5161d1 Add retry support on Room Alias screen 2021-07-06 11:12:40 +02:00
Benoit Marty
5b149c8a34 Crash when opening room addresses screen with no internet connection 2021-07-06 10:57:59 +02:00
Benoit Marty
ca45cdd5c7
Merge pull request #3585 from vector-im/feature/bma/wellknown
Improve wellknown usage
2021-07-05 21:36:16 +02:00
Benoit Marty
692adffa69
Merge pull request #3626 from vector-im/dependabot/gradle/com.google.android.material-material-1.4.0
Bump material from 1.3.0 to 1.4.0
2021-07-05 21:29:49 +02:00
Benoit Marty
07d6eaacf9 Quick cleanup after #3624 2021-07-05 21:28:37 +02:00
Benoit Marty
a335c5eb4b
Merge pull request #3624 from vector-im/dbkr/scan_button_title
Use different copy for self verification
2021-07-05 21:25:57 +02:00
David Baker
04cad290f7 Also change the emoji button subtitle
and tweak the other string more because it's not "each other" either
2021-07-05 19:49:48 +01:00
Benoit Marty
d29e04f16c Create fun String.getDomain(): String to avoid duplicated code 2021-07-05 16:49:09 +02:00
Benoit Marty
0e8018cbba ktlint and format 2021-07-05 16:24:19 +02:00
Benoit Marty
97cae9926b
Merge pull request #2848 from vector-im/neilalexander/vectorpreferences
Add subscribeToChanges/unsubscribeToChanges to VectorPreferences
2021-07-05 16:22:43 +02:00
Benoit Marty
edbf70c820
Merge pull request #3273 from vector-im/feature/bma/cleanup_redundant_fields
Cleanup redundant fields - TO BE MERGED ON JULY 1st
2021-07-05 16:16:33 +02:00
Benoit Marty
c2e649f64e Fix deprecated method 2021-07-05 16:07:44 +02:00
Benoit Marty
76f4c81d2d Hide password... Oups 2021-07-05 09:50:20 +02:00
David Baker
fe4c4832bd Use different copy for self verification
The copy all refers to 'their' device for when you're verifying
someone else. Update it to refer to your own devices in the case
where you're verifying one of your own devices.
2021-07-02 18:38:57 +01:00
Benoit Marty
2c7b947d27 Fix compilation issue
A bit weird, I did not figure out was was the original problem.
Editiing the line, for instance adding any char fixes the issue, so I decided to put all on one line.
2021-07-02 15:32:01 +02:00
Benoit Marty
f06d2b1734 Fix typo 2021-07-02 14:55:30 +02:00
Benoit Marty
1eea734a4c Fix compilation issue
A bit weird, I did not figure out was was the original problem.
Editiing the line, for instance adding any char fixes the issue, so I decided to put all on one line.
2021-07-02 12:53:00 +02:00
Weblate
64b6779cfa Merge branch 'origin/develop' into Weblate. 2021-07-02 07:52:44 +00:00
Benoit Marty
b0f7268d13
Merge pull request #3553 from vector-im/feature/fga/fix_timeline_visibility
Fix some issues with timeline cache invalidation and visibility.
2021-07-02 09:40:37 +02:00
Benoit Marty
d4009476f9 Cleanup 2021-07-02 09:39:32 +02:00
lvre
1906fbdeaa Translated using Weblate (Portuguese (Brazil))
Currently translated at 100.0% (2490 of 2490 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/pt_BR/
2021-07-02 01:04:01 +00:00
S1m
4a8fa4a3ce embedded distrib: original gateway 2021-06-30 19:53:24 +02:00
ganfra
de64df3cdb Fix crash after video call 2021-06-30 14:50:30 +02:00
Benoit Marty
7292c4e13d Code quality 2021-06-30 13:57:42 +02:00
Benoit Marty
ea6b0b6a43 Fix issue when sign-in using matrixId 2021-06-30 12:53:37 +02:00
lvre
1a0f29ff94 Translated using Weblate (Portuguese (Brazil))
Currently translated at 100.0% (2490 of 2490 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/pt_BR/
2021-06-30 10:34:47 +00:00
libexus
c350c94827 Translated using Weblate (German)
Currently translated at 99.9% (2488 of 2490 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/de/
2021-06-30 10:34:47 +00:00
Benoit Marty
24d2669255 Keep the data entered by the user for the UI
Actually import what has been done in Login V2...
2021-06-30 12:07:24 +02:00
Benoit Marty
08000dce55 Update the UI showing the homeserver API url in developer mode 2021-06-30 11:14:44 +02:00
Benoit Marty
38cb8bd33e Store homeServerUriBase independently that the base URL for client-server API
Also handle the migration for the specific matrix-client.matrix.org URL
2021-06-30 11:07:24 +02:00
Benoit Marty
0f25e2986f fun RawService.getElementWellknown() now takes a SessionParams for parameter to be able to use something else than the userId's domain 2021-06-30 09:27:11 +02:00
Benoit Marty
984b1dd6a8 RawService.getWellknown() now takes a domain instead of a matrixId as parameter 2021-06-30 09:20:08 +02:00
S1m
09b290e579 UP dialog: app name 2021-06-30 08:36:29 +02:00
Benoit Marty
7f70a03f41 Use interface field 2021-06-29 10:58:28 +02:00
Benoit Marty
edd24de4c3
Merge pull request #3547 from vector-im/feature/fga/jump_to_unread_redesign
Jump to unread: implement new design
2021-06-28 16:45:06 +02:00
Benoit Marty
9bbe002988
Merge pull request #3531 from vector-im/feature/fga/auto_accept_invite
Feature/fga/auto accept invite
2021-06-28 16:40:10 +02:00
ganfra
48fa9e1a5e Clean after benoits review 2021-06-28 11:00:29 +02:00
random
2764ecb256 Translated using Weblate (Italian)
Currently translated at 99.8% (2486 of 2490 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/it/
2021-06-27 19:34:46 +00:00
libexus
230b3f31d7 Translated using Weblate (German)
Currently translated at 99.9% (2488 of 2490 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/de/
2021-06-27 19:34:46 +00:00
Benoit Marty
cd0c9b4e08
Merge pull request #3549 from vector-im/feature/bma/cleanup_styles
Fix styles issue
2021-06-25 19:11:54 +02:00
BramvdnHeuvel
7c04391037 Translated using Weblate (Dutch)
Currently translated at 52.1% (1298 of 2490 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/nl/
2021-06-25 09:34:49 +00:00
Thibault Martin
bafd01c0f4 Translated using Weblate (French)
Currently translated at 100.0% (2490 of 2490 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/fr/
2021-06-25 09:34:45 +00:00
ganfra
cccf5de015 Jump to unread: removes unnecessary check which can cause scroll issue 2021-06-24 18:50:44 +02:00
ganfra
ab37984beb Jump to unread: avoid blink when jumping 2021-06-24 18:33:30 +02:00
ganfra
1ba97fa9be Clean after Benoits review 2021-06-24 17:40:45 +02:00
Benoit Marty
f5ecaa0339
Merge pull request #3520 from vector-im/feature/fga/timeline_virtual_room
Feature/fga/timeline virtual room
2021-06-24 14:43:00 +02:00
Benoit Marty
5eb0097fb2 Delete unused drawable to avoid conflict on develop 2021-06-24 14:40:38 +02:00
Benoit Marty
7257736691
Merge pull request #3545 from vector-im/feature/bma/password_reveal
Password reveal
2021-06-24 14:30:34 +02:00