Commit graph

10315 commits

Author SHA1 Message Date
David Langley
44e8974c02 direction and track need to be set for hold/unhold 2022-05-12 17:01:44 +01:00
Benoit Marty
6f3b9c78b0 Detekt: fix FunctionParameterNaming 2022-05-12 17:56:05 +02:00
Benoit Marty
c303b9afd3 Ignore more rules 2022-05-12 17:54:30 +02:00
Benoit Marty
f02bad5c79 Detekt: fix ArrayPrimitive 2022-05-12 17:54:15 +02:00
Benoit Marty
c3b5ba5639 Detekt: fix MatchingDeclarationName 2022-05-12 17:44:44 +02:00
Benoit Marty
3bc84f0d38 Detekt: fix MaxLineLength
@ouchadam your test fun names are too long!
2022-05-12 17:38:49 +02:00
Benoit Marty
21904054a5 Detekt: ignore EmptyCatchBlock 2022-05-12 17:29:10 +02:00
Benoit Marty
cdbc9db890 Detekt: fix EmptyDefaultConstructor 2022-05-12 17:25:16 +02:00
Benoit Marty
824f029e20 "TODO:" is forbidden by Detekt 2022-05-12 17:06:52 +02:00
Ahmed Radhouane Belkilani
6a523ccc38 Allow using the latest user avatar and display name for all messages in the timeline
Signed-off-by: Jorge Martín Espinosa <jorgem@element.io>
2022-05-12 15:43:20 +02:00
Suguru Hirahara
bea8b3d8d1 Translated using Weblate (Japanese)
Currently translated at 96.7% (2152 of 2224 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/ja/
2022-05-12 12:59:44 +00:00
Stefan Schmidt
284fb639bf Translated using Weblate (German)
Currently translated at 97.3% (2166 of 2224 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/de/
2022-05-12 12:59:43 +00:00
Sveinn í Felli
b95ca0ae53 Translated using Weblate (Icelandic)
Currently translated at 81.9% (1823 of 2224 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/is/
2022-05-12 12:59:43 +00:00
ariskotsomitopoulos
40de685f1a Merge branch 'develop' into feature/aris/threads_post_release_ui_improvements
# Conflicts:
#	vector/src/main/java/im/vector/app/features/home/room/detail/TimelineFragment.kt
#	vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchResultController.kt
2022-05-12 14:41:38 +03:00
Benoit Marty
4309fdba7e
Merge pull request #6021 from vector-im/feature/bma/finish_remove_flair
Remove remaining dead code about flair
2022-05-12 11:31:42 +02:00
SpiritCroc
347af40ec0 Update notice rendering depending on layout
For SC bubbles: use exact same mechanism as rendering normal text
messages if possible
-> Closes https://github.com/SchildiChat/SchildiChat-android/issues/45

For non-SC-bubbles: use upstream implementation again, so it's possible
to tell apart notices in these as well.

Change-Id: I60c614266d2ae4afdf1e87c649ff484551f961b4
2022-05-11 21:51:06 +02:00
SpiritCroc
a96d27cb81 Floating date
Closes https://github.com/SchildiChat/SchildiChat-android/issues/41

Change-Id: I0eb9c6c3800309be40a1f5bc0c4420bd4066c098
2022-05-11 21:50:58 +02:00
SpiritCroc
85a26ae8be Render image reactions (MSC3746)
Some notes:
- Doesn't re-parse reactions already in the db to add the url field - so
  may need an initial sync for those.
- Since some clients don't really follow MSC3746, as in: they don't use
  the url field, but instead only write and check the key if it is an
  mxc-url, support those as well.
- Accordingly, initial sync is likely not required for those reactions
  I've seen in the wild so far, as it's common to use the mxc url also
  as key.

Change-Id: Ib1c50315425494986fa2e794d165658220a4f342
2022-05-11 21:50:49 +02:00
SpiritCroc
88556658a3 Improve and debug ghost swipe situation
Change-Id: Ic6f2956a139516050e2b7e5ec248969326b7ec43
2022-05-11 21:50:44 +02:00
SpiritCroc
b2a6252f94 Blank room list debug / fix attempt
Change-Id: Ic0624f530cbe951f5a229d4e5335b8699f559f43
2022-05-11 21:48:48 +02:00
Benoit Marty
cd509accdb
Merge pull request #5936 from hanthor/develop
Added themed icon for Android 13
2022-05-11 17:34:38 +02:00
Benoit Marty
deb0f1ad1b
Merge pull request #6000 from vector-im/dependabot/gradle/androidx.preference-preference-ktx-1.2.0
Bump preference-ktx from 1.1.1 to 1.2.0
2022-05-11 16:17:17 +02:00
Benoit Marty
1ef5416b50 Use the correct lint rule to ignore. 2022-05-11 15:02:01 +02:00
Benoit Marty
2ec86fe9e6 Remove remaining dead code about flair
Finish the work started at #5664
2022-05-11 10:52:55 +02:00
Valere
12ab4787f1 Merge branch 'develop' into feature/bca/crypto_better_key_share 2022-05-10 19:30:52 +02:00
Benoit Marty
04cadb94cf
Merge pull request #5987 from vector-im/dependabot/gradle/org.jetbrains.kotlin-kotlin-gradle-plugin-1.6.21
Bump kotlin-gradle-plugin from 1.6.0 to 1.6.21
2022-05-10 18:23:51 +02:00
Benoit Marty
f54aa60803 Fix test compilation warning after bump kotlin-gradle-plugin from 1.6.0 to 1.6.21 2022-05-10 17:00:54 +02:00
Benoit Marty
fe8648c7f8 Fix compilation warning after bump kotlin-gradle-plugin from 1.6.0 to 1.6.21 2022-05-10 16:19:53 +02:00
Benoit Marty
5ad2567633 Fix compilation error after bump preference-ktx from 1.1.1 to 1.2.0 2022-05-10 15:00:44 +02:00
Benoit Marty
eafe65b417
Merge pull request #5831 from emotionalamoeba/develop
Updated copy and moved override in profile screen
2022-05-10 14:40:40 +02:00
Onuray Sahin
185cd316c9
Merge pull request #5911 from vector-im/feature/ons/voip_screen_sharing
Screen sharing over WebRTC
2022-05-10 13:06:33 +03:00
Adam Brown
33c1e1ea11 EMS section is temporarily hidden whilst we sync with marketing 2022-05-10 10:55:46 +01:00
Onuray Sahin
bb862cc509 Lower alpha of video button while screen sharing. 2022-05-10 11:35:38 +03:00
Johan Smits
05662d1c94 Translated using Weblate (Dutch)
Currently translated at 100.0% (2224 of 2224 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/nl/
2022-05-10 07:59:43 +00:00
Benoit Marty
e35bb772c1
Merge pull request #5941 from vector-im/feature/bma/konfetti_speed
No animation -> no chat effect
2022-05-09 17:05:53 +02:00
Onuray Sahin
3a02e8405d Disable video toggle button during screen sharing. 2022-05-09 17:26:35 +03:00
Lynn Nakanishi Lin(林中西)
5a8639b24c Translated using Weblate (Chinese (Simplified))
Currently translated at 99.3% (147 of 148 strings)

Translation: SchildiChat/SchildiChat-android
Translate-URL: https://weblate.bubu1.eu/projects/schildichat/schildichat-android/zh_Hans/
2022-05-09 12:35:42 +02:00
joshua
15a0c81440 Translated using Weblate (Swedish)
Currently translated at 100.0% (148 of 148 strings)

Translation: SchildiChat/SchildiChat-android
Translate-URL: https://weblate.bubu1.eu/projects/schildichat/schildichat-android/sv/
2022-05-09 12:35:41 +02:00
MagnetizedFreckles
2b9f3ac84c Translated using Weblate (Russian)
Currently translated at 85.8% (127 of 148 strings)

Translation: SchildiChat/SchildiChat-android
Translate-URL: https://weblate.bubu1.eu/projects/schildichat/schildichat-android/ru/
2022-05-09 12:35:41 +02:00
SpiritCroc
9cc5ab8a1d Emoji-only messages: ignore spaces for max emoji count
Change-Id: I270f0602ccb26aa744b788495b5ca2374ab6e6c5
2022-05-09 12:32:55 +02:00
SpiritCroc
797a8c6c10 Custom emojis: detect as emoji-only
Change-Id: Ia147a0362eb7d930ad6709bca0f86b51cb62612e
2022-05-09 12:32:49 +02:00
SpiritCroc
04cc69c206 Inline images: data-mx-emoticon height override
Change-Id: I3f1ab2aff5b17635600d76f4ca41fc539359b1ce
2022-05-09 12:32:42 +02:00
Onuray Sahin
9a1dbb27d4 Stop proximity sensor while sharing screen. 2022-05-09 13:25:00 +03:00
SpiritCroc
3c702b7230 Fix read marker update when rm becomes visible last
If the read marker becomes visible after all events, the global most
recent visible event won't be caught unless the user starts scrolling it
out and back in.
To fix, immediately look up the most recently displayed event once the
read marker becomes visible.

Change-Id: I909503801572d50e968610de163e56c05a946d36
2022-05-08 18:31:06 +02:00
worldspeak
c0ed25c41b Translated using Weblate (Esperanto)
Currently translated at 87.9% (1956 of 2224 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/eo/
2022-05-08 12:59:43 +00:00
LinAGKar
a04b8985c6 Translated using Weblate (Swedish)
Currently translated at 100.0% (2224 of 2224 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/sv/
2022-05-08 12:59:42 +00:00
chanthajohn keoviengkhone
89d0f7838a Translated using Weblate (Lao)
Currently translated at 100.0% (2224 of 2224 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/lo/
2022-05-06 23:00:12 +00:00
Modificator
d5560db45c Translated using Weblate (Chinese (Simplified))
Currently translated at 92.9% (2067 of 2224 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/zh_Hans/
2022-05-06 23:00:01 +00:00
lvre
5fde962cea Translated using Weblate (Portuguese (Brazil))
Currently translated at 100.0% (2224 of 2224 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/pt_BR/
2022-05-06 22:59:58 +00:00
Danial Behzadi
eb53022c77 Translated using Weblate (Persian)
Currently translated at 100.0% (2224 of 2224 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/fa/
2022-05-06 22:59:58 +00:00
Jeff Huang
eceaf9b150 Translated using Weblate (Chinese (Traditional))
Currently translated at 100.0% (2224 of 2224 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/zh_Hant/
2022-05-06 22:59:57 +00:00
Benoit Marty
d8b23d41ff Translated using Weblate (French)
Currently translated at 98.2% (2186 of 2224 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/fr/
2022-05-06 22:59:53 +00:00
Jozef Gaal
25122db3da Translated using Weblate (Slovak)
Currently translated at 100.0% (2224 of 2224 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/sk/
2022-05-06 22:59:53 +00:00
random
99c6cda2fd Translated using Weblate (Italian)
Currently translated at 100.0% (2224 of 2224 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/it/
2022-05-06 22:59:52 +00:00
Linerly
d03e3d6cc4 Translated using Weblate (Indonesian)
Currently translated at 100.0% (2224 of 2224 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/id/
2022-05-06 22:59:52 +00:00
Ihor Hordiichuk
d2454e37a8 Translated using Weblate (Ukrainian)
Currently translated at 100.0% (2224 of 2224 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/uk/
2022-05-06 22:59:51 +00:00
waclaw66
e088b503e1 Translated using Weblate (Czech)
Currently translated at 100.0% (2224 of 2224 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/cs/
2022-05-06 22:59:46 +00:00
Ildar Nigamatov
5bb725a21e Translated using Weblate (Russian)
Currently translated at 96.4% (2145 of 2224 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/ru/
2022-05-06 22:59:45 +00:00
libexus
95e7ca544b Translated using Weblate (German)
Currently translated at 96.9% (2156 of 2224 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/de/
2022-05-06 22:59:43 +00:00
Priit Jõerüüt
1e13fac375 Translated using Weblate (Estonian)
Currently translated at 100.0% (2224 of 2224 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/et/
2022-05-06 22:59:43 +00:00
Ngô Ngọc Đức Huy
35bdc0acb6 Translated using Weblate (Vietnamese)
Currently translated at 92.9% (2068 of 2224 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/vi/
2022-05-06 22:59:42 +00:00
trongtran810
6a4f413459 Translated using Weblate (Vietnamese)
Currently translated at 92.9% (2068 of 2224 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/vi/
2022-05-06 22:59:42 +00:00
hanthor
e1960e9593
Merge branch 'vector-im:develop' into develop 2022-05-06 14:57:11 -04:00
Aris Kotsomitopoulos
3c9b5d2ec0
Merge pull request #5927 from vector-im/feature/aris/threads_improve_rendering_issue_5151
Feature/aris/threads improve rendering issue 5151
2022-05-06 17:19:01 +03:00
Onuray Sahin
cf3d145cd6 Bind to screen sharing service after app killed and relaunched. 2022-05-06 13:21:33 +03:00
ericdecanini
be0be699e4 Fixes formatting errors in ExportEncryptionTest and VectorBaseActivity 2022-05-06 10:10:25 +02:00
SpiritCroc
19402f54a6 [merge] Fix fdroid variant compile / remove unused imports
Change-Id: Ib7d0c4095bb549b54d83ad3d1ef4c23bc0ebc736
2022-05-06 09:24:29 +02:00
ericdecanini
4266c330de Reverts change to when arrow alignment on some classes 2022-05-05 19:33:45 +02:00
ericdecanini
3fb03e2b2c Reformats project based on editorconfig 2022-05-05 19:10:35 +02:00
trongtran810
135d56489d Translated using Weblate (Vietnamese)
Currently translated at 92.4% (2057 of 2224 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/vi/
2022-05-05 16:57:08 +00:00
hanthor
6cd92a5d77
Merge branch 'vector-im:develop' into develop 2022-05-05 12:23:46 -04:00
SpiritCroc
bed3051812 Automatic SchildiChat string correction
Change-Id: I6db6443c31a7052293ae4df4e60c0694d1e38c26
2022-05-05 17:41:29 +02:00
SpiritCroc
4617d2d698 Merge tag 'v1.4.14' into sc
v1.4.14

Change-Id: I3667009380f1e35ce05c75c3769e62e3446212db

Conflicts:
	.editorconfig
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/actions/MegolmSessionDataImporter.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/LocalEchoEventFactory.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/DefaultTimeline.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/LoadTimelineStrategy.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/SyncTask.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/util/database/RealmMigrator.kt
	vector/src/fdroid/java/im/vector/app/push/fcm/FcmHelper.kt
	vector/src/gplay/java/im/vector/app/gplay/push/fcm/VectorFirebaseMessagingService.kt
	vector/src/gplay/java/im/vector/app/push/fcm/FcmHelper.kt
	vector/src/main/java/im/vector/app/AppStateHandler.kt
	vector/src/main/java/im/vector/app/VectorApplication.kt
	vector/src/main/java/im/vector/app/core/pushers/PushersManager.kt
	vector/src/main/java/im/vector/app/core/receiver/BackgroundSyncStarter.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/TimelineViewModel.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/MessageItemFactory.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/TimelineControllerInterceptorHelper.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/style/TimelineMessageLayout.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/style/TimelineMessageLayoutFactory.kt
	vector/src/main/java/im/vector/app/features/home/room/list/RoomListSectionBuilderSpace.kt
	vector/src/main/java/im/vector/app/features/navigation/DefaultNavigator.kt
	vector/src/main/java/im/vector/app/features/navigation/Navigator.kt
	vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberListViewModel.kt
	vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberListViewState.kt
	vector/src/main/java/im/vector/app/features/settings/VectorPreferences.kt
	vector/src/main/java/im/vector/app/features/settings/notifications/VectorSettingsNotificationPreferenceFragment.kt
	vector/src/main/java/im/vector/app/features/settings/troubleshoot/TestTokenRegistration.kt
	vector/src/main/java/im/vector/app/features/spaces/SpaceSummaryController.kt
2022-05-05 17:41:26 +02:00
SpiritCroc
2a87ebe3e8 Automatic revert to unchanged upstream strings, pt.1
Change-Id: Iceff48cf6d67ca6e84bc04e9a5d94d81cb339932
2022-05-05 14:26:49 +02:00
ClaireG
c9bd1f32b9
Update notifications rules: make a sound for each notification 2022-05-05 14:02:11 +02:00
SpiritCroc
92fe0a5a29 Rageshake: re-enable can_contact switch
Follow-ups may be useful for some kind of reports

Change-Id: Id2a42ce771f1ed355b896e5e8f8ad61e61670d8b
2022-05-05 13:28:26 +02:00
SpiritCroc
3e2fdd0784 Inline images: use isMxcUrl()
Change-Id: Ie85c5597e714b48dc5bcd3ac69abb5161b4fa640
2022-05-05 13:28:12 +02:00
Onuray Sahin
b486559469 Update video mute status after stopping screen sharing. 2022-05-05 14:15:17 +03:00
Onuray Sahin
754208e164 Don't enable video after stopping screen sharing for audio calls. 2022-05-05 14:02:19 +03:00
Benoit Marty
0b30c28fe4 Opposite if for better code clarity 2022-05-05 12:15:10 +02:00
Benoit Marty
d454e3fd20 Disable chat effect and confetti if animation are disabled on the system
It will speed up the sanity test
2022-05-05 12:02:44 +02:00
Benoit Marty
67bc7c93e6 Format file 2022-05-05 12:01:33 +02:00
Benoit Marty
66b32a74d5 Convert some fun to Context extensions 2022-05-05 11:57:54 +02:00
Onuray Sahin
ba4413e702 Fix stop sharing button state. 2022-05-05 12:57:53 +03:00
hanthor
341456901d
Merge branch 'vector-im:develop' into develop 2022-05-04 16:38:47 -04:00
ganfra
00ad9ccc2a
Merge pull request #5935 from vector-im/feature/fga/fix_weblate_lint
Feature/fga/fix weblate lint
2022-05-04 19:07:16 +02:00
Benoit Marty
330d802079
Merge pull request #5907 from vector-im/feature/bma/currentTimeMillis
Use Clock interface
2022-05-04 18:27:04 +02:00
ariskotsomitopoulos
c5fc1e579d Add badge in thread list filtering 2022-05-04 19:24:31 +03:00
ganfra
f2c35adb60 Fix TODO on strings 2022-05-04 18:19:03 +02:00
hanthor
b3b07752e2 Added themed icon for Android 13 2022-05-04 12:11:07 -04:00
Benoit Marty
a11c0b7ea1
Merge pull request #5885 from chagai95/patch-2
don't pause timer when call is held
2022-05-04 18:09:11 +02:00
ganfra
ed7343e897 Weblate: fix string with param 2022-05-04 18:06:05 +02:00
Benoit Marty
2fb5f423a5 Rename val 2022-05-04 17:52:32 +02:00
Benoit Marty
3ecde755e0 Rename val 2022-05-04 17:51:14 +02:00
Benoit Marty
2d98cbd915 Rename now to more explicit currentTimeMillis 2022-05-04 17:48:36 +02:00
Benoit Marty
09e628f227
Merge branch 'develop' into feature/bma/currentTimeMillis 2022-05-04 17:43:03 +02:00
Henry Jackson
5ebc70e4bb Returned string references to the original name 2022-05-04 16:38:12 +01:00
emotionalamoeba
7a8565db5d
Update vector/src/main/res/values/strings.xml
Co-authored-by: Benoit Marty <benoit.marty@gmail.com>
2022-05-04 16:27:13 +01:00
emotionalamoeba
9fe75eacf1
Merge branch 'vector-im:develop' into develop 2022-05-04 16:22:57 +01:00
Weblate
5cdea33418 Merge branch 'origin/develop' into Weblate. 2022-05-04 14:39:20 +00:00