Commit graph

17816 commits

Author SHA1 Message Date
SpiritCroc
49663a1154 Merge tag 'v1.4.18' into sc
Change-Id: I58667aa99a8eb99b0b1e7f0784d811061c2086a5

Conflicts:
	dependencies.gradle
	library/attachment-viewer/build.gradle
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomSummary.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/summary/RoomSummaryDataSource.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/core/pushers/PushersManager.kt
	vector/src/main/java/im/vector/app/core/utils/Emoji.kt
	vector/src/main/java/im/vector/app/features/home/HomeDetailFragment.kt
	vector/src/main/java/im/vector/app/features/home/HomeDetailViewModel.kt
	vector/src/main/java/im/vector/app/features/home/UnreadMessagesSharedViewModel.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageImageVideoItem.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageLocationItem.kt
	vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryItem.kt
	vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryItemFactory.kt
	vector/src/main/java/im/vector/app/features/media/ImageContentRenderer.kt
	vector/src/main/res/xml/vector_settings_labs.xml
2022-06-01 13:54:34 +02:00
SpiritCroc
fab9a100a1 [TMP] Automatic upstream merge preparation
Change-Id: I00f10005575cf818d47ea47798ff8af4f4891c06
2022-06-01 12:20:10 +02:00
SpiritCroc
9446afe0ef Automatic revert to unchanged upstream strings, pt.1
Change-Id: I6b50d340b0cf82f8d6f85e032b404a79a7e8c236
2022-06-01 12:20:10 +02:00
Benoit Marty
ba5828711b Merge branch 'release/1.4.18' into main 2022-05-31 17:56:43 +02:00
Benoit Marty
bd970505f1 Fastlane 2022-05-31 17:56:19 +02:00
Benoit Marty
6f7f61f33f Towncrier 2022-05-31 17:55:26 +02:00
Benoit Marty
19fa2f273d Rename folder to please the PlayStore. 2022-05-31 16:47:59 +02:00
Benoit Marty
8e5c96adf5
Merge pull request #6205 from vector-im/johannes/fatal
Use fatalError instead of NPE
2022-05-31 16:37:49 +02:00
Benoit Marty
fd5c30c8a9 Fix formatting issue. 2022-05-31 16:36:59 +02:00
Benoit Marty
5b985dc032
Merge pull request #5827 from mikonse/fix-notification-space-switch
do not switch away from home space on notification
2022-05-31 16:34:47 +02:00
Johannes Marbach
637b3bb5ba Fix tests 2022-05-31 16:16:54 +02:00
Maxime NATUREL
de185b94f3
Merge pull request #6199 from vector-im/feature/mna/6198-remove-background-location-permission
Remove background location permission
2022-05-31 15:58:57 +02:00
Benoit Marty
df23fd10bc
Remove unused import 2022-05-31 14:42:09 +02:00
Maxime NATUREL
2ca96a770d Declaring tools namespace prefix to fix strange build error 2022-05-31 14:24:09 +02:00
Benoit Marty
9cf9e10e5c
Merge pull request #6202 from vector-im/feature/bma/cleanup_string
Remove unused strings.
2022-05-31 14:19:13 +02:00
Adam Brown
b88ddbc854
Merge pull request #6201 from vector-im/feature/adm/build-health-false-positives
Build health false positives
2022-05-31 13:15:25 +01:00
Maxime NATUREL
4f3b4a71ce Ignore unused strings to be deleted 2022-05-31 13:46:14 +02:00
Johannes Marbach
4fc6cb1de3 Use fatalError instead of NPE
Signed-off-by: Johannes Marbach <johannesm@element.io>
2022-05-31 13:42:31 +02:00
Adam Brown
3f670045b3 ordering alphabetically and leaving a trailing comma 2022-05-31 11:20:14 +01:00
Benoit Marty
9d60aff8a2 Remove unused strings. 2022-05-31 12:11:16 +02:00
Adam Brown
2ce64b8f87 excluding the emoji dependencies from the unused check, their resources are used 2022-05-31 10:46:50 +01:00
Benoit Marty
3cc1951587
Merge pull request #6196 from vector-im/feature/bma/lao
Make Lao language available in the in app setting.
2022-05-31 11:42:07 +02:00
Benoit Marty
d6b68a33c9
Merge pull request #6194 from vector-im/bma/translators_note
Add note to translators.
2022-05-31 11:40:52 +02:00
Benoit Marty
aa753e4845
Merge pull request #6197 from RiotTranslateBot/weblate-element-android-element-app
Translations update from Weblate
2022-05-31 11:38:41 +02:00
Maxime NATUREL
233fe21f26 Remove runtime permission request 2022-05-31 11:04:48 +02:00
Maxime NATUREL
90cda6b2be Adding todo to delete some strings 2022-05-31 11:04:29 +02:00
Maxime NATUREL
00002105cf Remove permission declaration in Manifests 2022-05-31 11:04:14 +02:00
Maxime NATUREL
e337035aec Add changelog entry 2022-05-31 11:03:49 +02:00
Jorge Martin Espinosa
2e1a11e10e
Merge pull request #6134 from vector-im/feature/jorgem/mandatory-backup-passphrase
Add support for mandatory backup or passphrase from .well-known home server configuration
2022-05-31 11:02:02 +02:00
Johannes Marbach
7dd5b801bb
Merge pull request #6149 from vector-im/johannes/widget-system-permissions
Make widget web view request system permissions for camera and microphone (PSF-1061)
2022-05-31 10:54:45 +02:00
Adam Brown
7fdf138e5a
Merge pull request #6036 from vector-im/feature/adm/ftue-deeplinks
FTUE - Homeserver sign in/up deeplinks
2022-05-31 09:30:17 +01:00
Weblate
7f59efb876 Merge branch 'origin/develop' into Weblate. 2022-05-31 08:04:30 +00:00
Mr.Narsus
2e7c7c94fb Translated using Weblate (Arabic)
Currently translated at 44.0% (981 of 2225 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/ar/
2022-05-31 08:04:18 +00:00
Jorge Martín
130ed63b03 Add support for mandatory backup or passphrase from .well-known configuration 2022-05-31 10:00:46 +02:00
Benoit Marty
9ed62ac9f7 Changelog 2022-05-31 09:58:13 +02:00
Johannes Marbach
4ebb26d3d3 Merge branch 'develop' into johannes/widget-system-permissions 2022-05-31 09:53:31 +02:00
Benoit Marty
c6c96677e2 Make Lao language available in the in app setting. 2022-05-31 09:52:11 +02:00
Johannes Marbach
373991915e Add missing file 2022-05-31 08:10:13 +02:00
Benoit Marty
8cddd9f575
Add note to translators. 2022-05-30 21:20:15 +02:00
Benoit Marty
483b1ab503
Merge pull request #6132 from jtbx/patch-1
Fixed grammar in 2 English strings
2022-05-30 21:18:08 +02:00
Benoit Marty
5de6771547
Merge pull request #6166 from networkException/autoplay-animated-images
[Feature] Add the option to autoplay animated images
2022-05-30 20:42:19 +02:00
Johannes Marbach
70bb2b7fee Combine event listener interfaces 2022-05-30 20:28:09 +02:00
Benoit Marty
bd2cd3ad96
Merge pull request #6183 from SpiritCroc/persist-image-notification
Fix some notifications never getting dismissed
2022-05-30 20:24:11 +02:00
Benoit Marty
16554bf351
Merge pull request #6189 from vector-im/dependabot/gradle/androidx.activity-activity-1.4.0
Bump activity from 1.2.4 to 1.4.0
2022-05-30 20:23:17 +02:00
Johannes Marbach
5b64946dfb Remove empty default implementation 2022-05-30 20:18:56 +02:00
Onuray Sahin
4ccd242cbf
Merge pull request #6170 from vector-im/feature/ons/live_location_bottom_sheet
Live Location Sharing - User List Bottom Sheet [PSF-890]
2022-05-30 21:07:25 +03:00
networkException
fedc637dee
Changelog: Add .feature entry for pull request #6166
Signed-off-by: networkException <git@nwex.de>
2022-05-30 20:05:26 +02:00
networkException
b138ac8601
MessageImageVideoItem: Hide play button for autoplaying animated images
This patch updates the logic checking whether to show the
playContentView to not show it when an animated image message would
autoplay its animation.

Signed-off-by: networkException <git@nwex.de>
2022-05-30 20:05:26 +02:00
networkException
9d0fe46723
ImageContentRenderer: Enable image animation if enabled in preferences
This patch removes dontAnimate() in the createGlideRequest() builder
conditionally depending on the user's animated image autoplay
preferences.

Resolves #1160, #5094

Signed-off-by: networkException <git@nwex.de>
2022-05-30 20:05:26 +02:00
networkException
9b60ee70c5
MessageInformationData: Add messageType field
This patch adds the messageType field to MessageInformationData,
containing a nullable string representation of the message event's type.

Signed-off-by: networkException <git@nwex.de>
2022-05-30 20:05:26 +02:00