Commit Graph

6089 Commits

Author SHA1 Message Date
Valere 432fd67ce2 Fixes #3406 2021-05-26 14:25:21 +02:00
Valere 447bd98a78 Fixes #3386 show space description in explore header 2021-05-26 14:25:21 +02:00
Benoit Marty 2bea2de0c5
Merge pull request #3365 from vector-im/dependabot/gradle/androidx.core-core-ktx-1.5.0
Bump core-ktx from 1.3.2 to 1.5.0
2021-05-26 14:22:26 +02:00
Benoit Marty 526f43044e
Merge pull request #3367 from vector-im/dependabot/gradle/androidx.fragment-fragment-ktx-1.3.4
Bump fragment-ktx from 1.3.3 to 1.3.4
2021-05-26 14:21:18 +02:00
dkanada 4a11802b65 store cache for WidgetWebView between loads 2021-05-26 12:54:38 +02:00
Benoit Marty cd66e62454 "home server" -> "homeserver" (#3404) 2021-05-26 12:44:04 +02:00
ganfra e67cb0eae7 Merge branch 'develop' into feature/fga/call_transfer 2021-05-26 12:26:34 +02:00
ganfra bd8e46c84f Call transfer: start branching consult first action 2021-05-26 12:09:59 +02:00
SpiritCroc 3b2f09e80d Merge remote-tracking branch 'AquaWolf/feature/conversations' into sc
Change-Id: Idbbe13f56d988900ade365c3d582bd03799d245c

Conflicts:
	vector/src/main/java/im/vector/app/features/notifications/NotificationUtils.kt
2021-05-26 10:55:56 +02:00
SpiritCroc 63a608593f Automatic SchildiChat string correction
Change-Id: I42fc475df42bf0f4a8c7f9b62610c6eff3583143
2021-05-26 10:44:25 +02:00
SpiritCroc 9f11fcf87e Automatic color correction
Change-Id: Ie9ef96a3a4cfa5ef0d0618282a8727028589e9c7
2021-05-26 10:44:23 +02:00
SpiritCroc 6c06462ec9 Merge tag 'v1.1.8' into sc
Change-Id: Ied7cd01e47a76e9d8f546ae1c2d6f10b083c4480

Conflicts:
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageTextItem.kt
	vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomController.kt
	vector/src/main/java/im/vector/app/features/spaces/SpaceSummaryController.kt
2021-05-26 10:44:19 +02:00
SpiritCroc 1b6ddb5949 Automatic revert to unchanged upstream strings, pt.1
Change-Id: Ib94348dd875279692a53465e4b4d13cfdbb27e16
2021-05-26 08:48:19 +02:00
dependabot[bot] 2703097294
Bump daggerVersion from 2.35.1 to 2.36
Bumps `daggerVersion` from 2.35.1 to 2.36.

Updates `dagger` from 2.35.1 to 2.36
- [Release notes](https://github.com/google/dagger/releases)
- [Changelog](https://github.com/google/dagger/blob/master/CHANGELOG.md)
- [Commits](https://github.com/google/dagger/compare/dagger-2.35.1...dagger-2.36)

Updates `dagger-compiler` from 2.35.1 to 2.36
- [Release notes](https://github.com/google/dagger/releases)
- [Changelog](https://github.com/google/dagger/blob/master/CHANGELOG.md)
- [Commits](https://github.com/google/dagger/compare/dagger-2.35.1...dagger-2.36)

Signed-off-by: dependabot[bot] <support@github.com>
2021-05-26 06:00:27 +00:00
Benoit Marty 680837611a Version++ 2021-05-25 18:13:09 +02:00
Benoit Marty 03496c36dc Fix lint issue 2021-05-25 15:29:38 +02:00
ganfra 8eeae51cc6 Call transfer: prepare code for consult feature 2021-05-25 15:21:54 +02:00
Weblate 1cc2e8b000 Merge branch 'origin/develop' into Weblate. 2021-05-25 11:06:53 +00:00
B.O.S.S cc8182445e Translated using Weblate (Polish)
Currently translated at 85.3% (2094 of 2454 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/pl/
2021-05-25 11:06:46 +00:00
Ngô Ngọc Đức Huy 089566b5d9 Translated using Weblate (Vietnamese)
Currently translated at 21.5% (529 of 2454 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/vi/
2021-05-25 11:06:43 +00:00
Dat Ng f2c7b6508a Translated using Weblate (Vietnamese)
Currently translated at 21.5% (529 of 2454 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/vi/
2021-05-25 11:06:43 +00:00
Quang Trung 3301df44fb Translated using Weblate (Vietnamese)
Currently translated at 21.5% (529 of 2454 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/vi/
2021-05-25 11:06:43 +00:00
Viorel-Cătălin Răpițeanu 9546889236 Translated using Weblate (Romanian)
Currently translated at 6.8% (167 of 2454 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/ro/
2021-05-25 11:06:39 +00:00
waclaw66 d99ac94bf9 Translated using Weblate (Czech)
Currently translated at 100.0% (2454 of 2454 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/cs/
2021-05-25 11:06:39 +00:00
Hivaa 552d763f83 Translated using Weblate (Persian)
Currently translated at 100.0% (2454 of 2454 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/fa/
2021-05-25 11:06:38 +00:00
LinAGKar 3e1631c0e5 Translated using Weblate (Swedish)
Currently translated at 100.0% (2454 of 2454 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/sv/
2021-05-25 11:06:36 +00:00
SpiritCroc c97024ee3c rageshake: Remove useless title addition in issue title
Change-Id: I56de1ae9dbd9a569504d7ef1a5c66efd1ad414b2
2021-05-25 11:28:03 +02:00
SpiritCroc d527e2039c Rageshake: add label "can contact"
Change-Id: I76eafb3b65ff76f531e577b9693dff25f2c3f878
2021-05-25 11:25:57 +02:00
SpiritCroc 95b5efe3f4 Disable missed space beta feedback
Change-Id: Ia6813fd5d8575f7ba1b682ba79bce0138fce5f20
2021-05-25 11:15:17 +02:00
Benoit Marty b44c1a1c77
Merge pull request #3383 from vector-im/feature/fga/authenticated_jitsi
Feature/fga/authenticated jitsi
2021-05-25 10:24:54 +02:00
tanmatsu 8e45b69c7d Translated using Weblate (Romanian)
Currently translated at 6.6% (163 of 2454 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/ro/
2021-05-22 21:34:37 +00:00
Viorel-Cătălin Răpițeanu edc2e7e61e Translated using Weblate (Romanian)
Currently translated at 6.6% (163 of 2454 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/ro/
2021-05-22 21:34:37 +00:00
SpiritCroc 27cedd62d1 Limit picture upscale factor
Change-Id: I11ea154db505d352ba19d0dbba57c915e3c1d458
2021-05-22 14:55:48 +02:00
SpiritCroc 4f46f470d6 Increment version
Change-Id: I08b244059c9619a0adfe900c0aac569525cee9ad
2021-05-22 10:12:03 +02:00
tanmatsu b034870242 Translated using Weblate (Romanian)
Currently translated at 4.0% (99 of 2454 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/ro/
2021-05-21 19:15:45 +00:00
Viorel-Cătălin Răpițeanu 5ec1ab5b2d Translated using Weblate (Romanian)
Currently translated at 4.0% (99 of 2454 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/ro/
2021-05-21 19:15:43 +00:00
Viorel-Cătălin Răpițeanu fd8295eb6c Translated using Weblate (Romanian)
Currently translated at 2.7% (67 of 2454 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/ro/
2021-05-21 17:53:49 +00:00
tanmatsu 67ec1b4434 Translated using Weblate (Romanian)
Currently translated at 2.7% (67 of 2454 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/ro/
2021-05-21 17:53:49 +00:00
Viorel-Cătălin Răpițeanu 509b0f5a41 Translated using Weblate (Romanian)
Currently translated at 2.2% (56 of 2454 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/ro/
2021-05-21 17:51:22 +00:00
tanmatsu 3a5724d900 Translated using Weblate (Romanian)
Currently translated at 2.2% (56 of 2454 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/ro/
2021-05-21 17:51:22 +00:00
Viorel-Cătălin Răpițeanu 7e7d245d59 Translated using Weblate (Romanian)
Currently translated at 2.2% (55 of 2454 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/ro/
2021-05-21 17:50:59 +00:00
tanmatsu b6cbd76849 Translated using Weblate (Romanian)
Currently translated at 2.2% (55 of 2454 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/ro/
2021-05-21 17:50:59 +00:00
Viorel-Cătălin Răpițeanu d50a8a9d06 Translated using Weblate (Romanian)
Currently translated at 2.1% (52 of 2454 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/ro/
2021-05-21 17:50:04 +00:00
tanmatsu 7eb27e3633 Translated using Weblate (Romanian)
Currently translated at 2.1% (52 of 2454 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/ro/
2021-05-21 17:50:04 +00:00
tanmatsu d750c40ceb Translated using Weblate (Romanian)
Currently translated at 1.3% (32 of 2454 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/ro/
2021-05-21 17:44:29 +00:00
Benoit Marty 6706a88a21
Merge pull request #3188 from vector-im/feature/bma/login_v2
Login v2 - WIP
2021-05-21 14:55:22 +02:00
Benoit Marty 40bb58c9cb
Merge branch 'develop' into feature/bca/fix_3371 2021-05-21 14:53:21 +02:00
Benoit Marty 697b9ff535
Merge branch 'develop' into feature/bca/spaces_quick_fixes 2021-05-21 14:49:12 +02:00
Jeff Huang c06d8dccb7 Translated using Weblate (Chinese (Traditional))
Currently translated at 100.0% (2454 of 2454 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/zh_Hant/
2021-05-21 12:34:37 +00:00
Quang Trung 0df7166954 Translated using Weblate (Vietnamese)
Currently translated at 19.1% (469 of 2454 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/vi/
2021-05-21 12:34:36 +00:00
Vancha 3af3641b92 Translated using Weblate (Frisian)
Currently translated at 24.8% (609 of 2454 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/fy/
2021-05-21 12:34:35 +00:00
Valere ba96626bd0 Code review 2021-05-21 11:46:55 +02:00
Benoit Marty 048c13af50 Fix issue after rebase 2021-05-21 11:46:28 +02:00
Valere 2f3f0c294c Code review 2021-05-21 11:46:28 +02:00
Valere ae5a5ec92b Spaces | Personal spaces add DM - Web Parity #3271 2021-05-21 11:46:13 +02:00
Valere abf7e275a7 Fix / Improve 'Leave Space' UX/UI #3359 2021-05-21 11:46:13 +02:00
Valere 8d3167cb66 Code review 2021-05-21 11:42:01 +02:00
Valere cb6f414c60 Fix | Explore room list: the RoomId is displayed instead of name (#3371) 2021-05-21 11:40:09 +02:00
Benoit Marty 0424d03bcc Fix lint and tools issue 2021-05-21 11:37:16 +02:00
Valere bcf755407b code review 2021-05-21 11:37:16 +02:00
Valere 1b16d287e8 review 2021-05-21 11:34:51 +02:00
Valere 0d0b6a8810 Fix empty states for spaces 2021-05-21 11:32:34 +02:00
SpiritCroc d0579cb59b Which user expects spaces to be sorted by id? Use the display name
Change-Id: Ic843ca00bef6dcbf0eac2c4931dea7668c9edc04
2021-05-21 09:56:17 +02:00
ganfra 03f81258c4 Jitsi auth: clean after Benoits review 2021-05-20 20:16:37 +02:00
ganfra 894af10934 Jitsi auth: fix some mistakes and gives the jwt to Jitsi 2021-05-20 18:53:56 +02:00
Benoit Marty 201f4c342a Fix lint issue 2021-05-20 18:51:09 +02:00
Benoit Marty df13b32a5c
Merge pull request #3373 from vector-im/feature/bma/del_tag
Implement a workaround to render <del> and <u> in the timeline (#1817)
2021-05-20 15:34:38 +02:00
Benoit Marty a7c1dc5cd9
Merge branch 'develop' into feature/bma/login_v2 2021-05-20 15:18:18 +02:00
dependabot[bot] ef884d84dc
Bump fragment-ktx from 1.3.3 to 1.3.4
Bumps fragment-ktx from 1.3.3 to 1.3.4.

Signed-off-by: dependabot[bot] <support@github.com>
2021-05-20 13:08:13 +00:00
dependabot[bot] 9b6a2c91f4
Bump core-ktx from 1.3.2 to 1.5.0
Bumps core-ktx from 1.3.2 to 1.5.0.

Signed-off-by: dependabot[bot] <support@github.com>
2021-05-20 13:08:12 +00:00
Benoit Marty 5d7acad75c
Merge pull request #3366 from vector-im/dependabot/gradle/androidx.appcompat-appcompat-1.3.0
Bump appcompat from 1.2.0 to 1.3.0
2021-05-20 15:07:27 +02:00
Benoit Marty 4ba40b1d34 Disable LoginFlowV2 to merge it on develop 2021-05-20 13:56:41 +02:00
Benoit Marty b11e6a2b26 ktlint 2021-05-20 13:53:51 +02:00
SpiritCroc d3ca5d0db0 Invalidate the timeline when the DM state changes for a room
We need to redraw messages when this changes, since we use different
layouts for DMs and non-direct chats.

Change-Id: Icf2df3a14655f7c9b6e5f7cdb29b590f393de4fd
2021-05-20 13:22:37 +02:00
Benoit Marty 4cf38951ef Fix warning after bump appcompat from 1.2.0 to 1.3.0 2021-05-20 13:00:49 +02:00
SpiritCroc b5e3a83ff2 Ensure some additional footer space if LTR next to RTL and vice versa
Change-Id: I139fd3ab32cf959d4e1a98767d2169d7b0d27a3a
2021-05-20 10:51:42 +02:00
SpiritCroc 5eb78ae95a Force sender alignment independent of content
Change-Id: I2312659549b334c5c2533e0087906507483c3c23
2021-05-20 10:51:28 +02:00
Julian Heinzel 6961e54f15 Translated using Weblate (German)
Currently translated at 100.0% (2454 of 2454 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/de/
2021-05-20 01:34:44 +00:00
lvre 93d0fc0035 Translated using Weblate (Portuguese (Brazil))
Currently translated at 96.8% (2376 of 2454 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/pt_BR/
2021-05-20 01:34:44 +00:00
LinAGKar ad0cd98183 Translated using Weblate (Swedish)
Currently translated at 100.0% (2454 of 2454 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/sv/
2021-05-20 01:34:41 +00:00
AmeliMeow c423c270f7 Translated using Weblate (Lithuanian)
Currently translated at 4.4% (108 of 2454 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/lt/
2021-05-20 01:34:39 +00:00
Ville Ranki 8da8d44823 Translated using Weblate (Finnish)
Currently translated at 77.1% (1894 of 2454 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/fi/
2021-05-20 01:34:35 +00:00
Ricardo 3d6fbf452f Translated using Weblate (Spanish)
Currently translated at 91.0% (2234 of 2454 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/es/
2021-05-20 01:34:34 +00:00
ganfra 82c50b7c1d Jitsi auth: introduce JitsiService and JWT token creation 2021-05-19 18:19:49 +02:00
SpiritCroc 859cc32d81 Allow same-line message footer even if text RTL != locale RTL if space
Change-Id: I54683129c651697dd831ed832fe8cc45d668cb14
2021-05-19 17:54:55 +02:00
SpiritCroc 7e4a0ddb5c Fix footer alignment in RTL layouts
Change-Id: I453fe81150cd7b2ed626b6e95898c1a3dd0b7110
2021-05-19 17:01:51 +02:00
SpiritCroc 707012ee5c Fix RTL paddings
Android apparently has an issue with the layout in RTL, since it applies
the start/end padding to both sides of the bubble.
As a workaround, put the bubbleLayout always in LTR, and handle the
correct padding selection from code.

Change-Id: Icddbe4b8d99383448d68bcf97f3ea166fd4cd3e6
2021-05-19 16:43:54 +02:00
Benoit Marty 25f7f29d94 Implement a workaround to render <del> and <u> in the timeline (#1817) 2021-05-19 15:15:34 +02:00
Benoit Marty 566369cccd Split long lines 2021-05-19 12:03:47 +02:00
Benoit Marty 3d174b0a25 Cleanup and properly inject the controller 2021-05-19 11:54:19 +02:00
Benoit Marty 8114d52d7d Change related to Epoxy 4.6.0 upgrade - step 2: small API change 2021-05-19 11:43:42 +02:00
Benoit Marty 9a9edd979d Change related to Epoxy 4.6.0 upgrade - step 1.1: handle DSL restriction, other error 2021-05-19 11:05:52 +02:00
Benoit Marty a0d04c40e9 Change related to Epoxy 4.6.0 upgrade - step 1: handle DSL restriction 2021-05-19 11:00:20 +02:00
dependabot[bot] 5629d30932
Bump appcompat from 1.2.0 to 1.3.0
Bumps appcompat from 1.2.0 to 1.3.0.

Signed-off-by: dependabot[bot] <support@github.com>
2021-05-19 06:20:33 +00:00
Black616Angel 5bd3aed51c Translated using Weblate (German)
Currently translated at 99.8% (2451 of 2454 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/de/
2021-05-18 22:18:11 +00:00
Michael Sasser 4e55475429 Translated using Weblate (German)
Currently translated at 99.8% (2451 of 2454 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/de/
2021-05-18 22:18:11 +00:00
Julian Heinzel 8f4735827e Translated using Weblate (German)
Currently translated at 99.8% (2451 of 2454 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/de/
2021-05-18 22:18:11 +00:00
Benoit Marty 9d7f092016 Ignore lint false positive 2021-05-18 21:23:50 +02:00
dependabot[bot] e5cc6ceba7
Bump epoxy_version from 4.5.0 to 4.6.1
Bumps `epoxy_version` from 4.5.0 to 4.6.1.

Updates `epoxy` from 4.5.0 to 4.6.1
- [Release notes](https://github.com/airbnb/epoxy/releases)
- [Changelog](https://github.com/airbnb/epoxy/blob/master/CHANGELOG.md)
- [Commits](https://github.com/airbnb/epoxy/compare/4.5.0...4.6.1)

Updates `epoxy-glide-preloading` from 4.5.0 to 4.6.1
- [Release notes](https://github.com/airbnb/epoxy/releases)
- [Changelog](https://github.com/airbnb/epoxy/blob/master/CHANGELOG.md)
- [Commits](https://github.com/airbnb/epoxy/compare/4.5.0...4.6.1)

Updates `epoxy-processor` from 4.5.0 to 4.6.1
- [Release notes](https://github.com/airbnb/epoxy/releases)
- [Changelog](https://github.com/airbnb/epoxy/blob/master/CHANGELOG.md)
- [Commits](https://github.com/airbnb/epoxy/compare/4.5.0...4.6.1)

Updates `epoxy-paging` from 4.5.0 to 4.6.1
- [Release notes](https://github.com/airbnb/epoxy/releases)
- [Changelog](https://github.com/airbnb/epoxy/blob/master/CHANGELOG.md)
- [Commits](https://github.com/airbnb/epoxy/compare/4.5.0...4.6.1)

Signed-off-by: dependabot[bot] <support@github.com>
2021-05-18 18:18:15 +00:00
Benoit Marty 0041743bf9
Merge pull request #3348 from vector-im/feature/bca/spaces_fix_invites
Fix space invite issues
2021-05-18 13:56:01 +02:00