Commit Graph

1101 Commits

Author SHA1 Message Date
Onuray Sahin 04679ea21d Merge branch 'develop' into feature/ons/live_location_bottom_sheet
* develop: (114 commits)
  Docs: Fix various formatting and spelling issues in notifications.md
  Fixing non necessary breaking line
  continuing to the originally supplied url when a rtl override character is detected
  splitting url detection condition into separate branches
  Cleaner code
  Create extension `String?.toActiveSpaceOrOrphanRooms()` to reduce noise.
  Add changelog
  Fix test compilation
  Add some Kdoc
  Add some Kdoc
  Create SpaceFilter.OrphanRooms to improve the API. Not 100% of the side effect. There is probably some (fixed?) bugs here.
  Rename ActiveSpaceFilter to SpaceFilter
  Remove `ActiveSpaceFilter.None` Prefer nullability for API coherency of `RoomSummaryQueryParams`
  Add some Kdoc
  Remove duplicated lines of code (the same code is done a few lines later)
  Remove `RoomCategoryFilter.ALL` Prefer nullability for API coherency of `RoomSummaryQueryParams`
  `displayName` default value is now `QueryStringValue.NoCondition`. It was working fine since in the DB we always have a name using `RoomDisplayNameFallbackProvider`, which in our current implementation always return a non empty String.
  Small rework for nicer code
  Remove duplicated code lines
  Remove `roomId` from `RoomSummaryQueryParams.Builder()`. Create a new API in RoomService to observe a room summary from a roomId.
  ...

# Conflicts:
#	vector/src/main/java/im/vector/app/features/location/live/map/LocationLiveMapViewFragment.kt
2022-05-30 16:27:11 +03:00
Benoit Marty ab651cbe50
Merge pull request #6164 from vector-im/bug/adm/link-checking
Ask the user to confirm urls which contain unicode direction overrides
2022-05-30 14:07:23 +02:00
SpiritCroc 292020e95d Fix some notifications never getting dismissed
Persisting notification info fails for non-null Uris:

E NotificationEventPersistence: ## Failed to save cached notification info
E NotificationEventPersistence: java.io.NotSerializableException: android.net.Uri$HierarchicalUri
E NotificationEventPersistence: 	at java.io.ObjectOutputStream.writeObject0(ObjectOutputStream.java:1240)
E NotificationEventPersistence: 	at java.io.ObjectOutputStream.defaultWriteFields(ObjectOutputStream.java:1604)
E NotificationEventPersistence: 	at java.io.ObjectOutputStream.writeSerialData(ObjectOutputStream.java:1565)
E NotificationEventPersistence: 	at java.io.ObjectOutputStream.writeOrdinaryObject(ObjectOutputStream.java:1488)
E NotificationEventPersistence: 	at java.io.ObjectOutputStream.writeObject0(ObjectOutputStream.java:1234)
E NotificationEventPersistence: 	at java.io.ObjectOutputStream.writeObject(ObjectOutputStream.java:354)
E NotificationEventPersistence: 	at java.util.ArrayList.writeObject(ArrayList.java:762)
E NotificationEventPersistence: 	at java.lang.reflect.Method.invoke(Native Method)
E NotificationEventPersistence: 	at java.io.ObjectStreamClass.invokeWriteObject(ObjectStreamClass.java:1036)
E NotificationEventPersistence: 	at java.io.ObjectOutputStream.writeSerialData(ObjectOutputStream.java:1552)
E NotificationEventPersistence: 	at java.io.ObjectOutputStream.writeOrdinaryObject(ObjectOutputStream.java:1488)
E NotificationEventPersistence: 	at java.io.ObjectOutputStream.writeObject0(ObjectOutputStream.java:1234)
E NotificationEventPersistence: 	at java.io.ObjectOutputStream.writeObject(ObjectOutputStream.java:354)
E NotificationEventPersistence: 	at org.matrix.android.sdk.internal.session.securestorage.SecretStoringUtils.saveSecureObjectM(SecretStoringUtils.kt:283)
E NotificationEventPersistence: 	at org.matrix.android.sdk.internal.session.securestorage.SecretStoringUtils.securelyStoreObject(SecretStoringUtils.kt:150)
E NotificationEventPersistence: 	at org.matrix.android.sdk.internal.session.securestorage.DefaultSecureStorageService.securelyStoreObject(DefaultSecureStorageService.kt:27)
E NotificationEventPersistence: 	at im.vector.app.features.notifications.NotificationEventPersistence.persistEvents(NotificationEventPersistence.kt:58)
E NotificationEventPersistence: 	at im.vector.app.features.notifications.NotificationDrawerManager$persistEvents$1.invoke(NotificationDrawerManager.kt:183)
E NotificationEventPersistence: 	at im.vector.app.features.notifications.NotificationDrawerManager$persistEvents$1.invoke(NotificationDrawerManager.kt:182)
E NotificationEventPersistence: 	at im.vector.app.features.notifications.NotificationState.queuedEvents(NotificationState.kt:55)
E NotificationEventPersistence: 	at im.vector.app.features.notifications.NotificationDrawerManager.persistEvents(NotificationDrawerManager.kt:182)
E NotificationEventPersistence: 	at im.vector.app.features.notifications.NotificationDrawerManager.refreshNotificationDrawerBg(NotificationDrawerManager.kt:177)

Accordingly, if a notification for an image is shown, and the
notification state is loaded from storage later, none of the previously
shown notifications will get dismissed once read.

Likely addresses https://github.com/vector-im/element-android/issues/4862.

Change-Id: I2d6be497e8b92e770b680e16e42b3610add57323
2022-05-30 13:06:09 +02:00
Maxime NATUREL eeaf9fd616
Merge pull request #6129 from vector-im/feature/mna/PSF-1019-user-pins
[Location sharing] - Show user live location pins in map view (PSF-1019)
2022-05-30 12:32:09 +02:00
Benoit Marty d7a1ae3a00 Add changelog 2022-05-30 11:38:03 +02:00
Eric Decanini eeb7d60e59
Merge pull request #5860 from vector-im/feature/eric/replace-search-room-subheader
Replaces subtitle in Search Rooms with room context rather than last event
2022-05-30 11:13:10 +02:00
Eric Decanini b8c0c61a4c
Merge pull request #6073 from vector-im/feature/eric/improve-back-navigation
Adds up navigation in spaces
2022-05-30 10:38:28 +02:00
Onuray Sahin 8bc7d3e073 Changelog added. 2022-05-27 17:55:51 +03:00
Adam Brown 913c6b0f14 warning the user when urls contain directional overrides and allowing them to confirm the url 2022-05-26 12:32:22 +01:00
Adam Brown 0675b7c16c
Merge pull request #5995 from vector-im/feature/adm/ftue-sign-in
FTUE - Sign in
2022-05-25 17:30:03 +01:00
Valere 136d2e330a added change log 2022-05-25 16:52:56 +02:00
Valere 52eb48d808
Merge pull request #6077 from vector-im/feature/aris/crypto_replay_attack
Feature/aris/crypto replay attack
2022-05-25 16:20:26 +02:00
Maxime NATUREL c8fb034c57
Merge pull request #6128 from vector-im/feature/mna/PSF-999-auto-refresh-db
[Location sharing] - Update DB entity when a live is timed out (PSF-999)
2022-05-25 14:59:54 +02:00
Adam Brown 73c93958c2 adding changelog entry 2022-05-25 13:34:08 +01:00
Maxime NATUREL cf90ff9fd2 Adding changelog entry 2022-05-25 14:03:37 +02:00
Johannes Marbach f5a621a6d5
Merge pull request #6140 from vector-im/johannes/widget-screen-rotation
Prevent widget web view from reloading on screen / orientation change (PSF-1034)
2022-05-25 13:42:24 +02:00
Johannes Marbach 946902719b Add changelog entry 2022-05-25 12:53:47 +02:00
Adam Brown b76899a6e0 adding changelog entry 2022-05-25 10:22:27 +01:00
Adam Brown ae9922a731
Merge pull request #6136 from vector-im/feature/adm/foss-avoid-gms-location-provider
Excluding the gms play-service-location from maplibre for fdroid builds
2022-05-25 08:59:18 +01:00
Michael Kaye 20422a5451 towncrier 2022-05-24 16:40:03 +01:00
Johannes Marbach 7913a42664 Add changelog file 2022-05-24 16:36:26 +02:00
Adam Brown bec72264cd excluding the gms play-service-location optional transistive dependency for the fdroid variant
- fixes fdroid being unable to compile the project due to a non foss dependency
2022-05-24 10:10:03 +01:00
Jeremy 3b1a7f93cb
Create 6132.misc 2022-05-24 14:40:13 +12:00
Adam Brown a59b8bf50c
Merge pull request #6065 from vector-im/feature/adm/matrix-org-ordering
FTUE - Only override sign up steps for `matrix.org`
2022-05-23 21:24:48 +01:00
Maxime NATUREL 695c234139 Adding changelog entry 2022-05-23 17:34:51 +02:00
Maxime NATUREL 9a38d59f9a
Merge pull request #6092 from vector-im/feature/mna/PSF-888-navigation
[Location sharing] - Navigation to Map view from live location message (PSF-888)
2022-05-23 13:54:04 +02:00
Benoit Marty fd252dbaff
Merge pull request #5856 from ofalvai/bugfix/ofa/read-recept-text-scale
Use fixed text size in read receipt counter
2022-05-23 13:41:03 +02:00
Adam Brown 98999c754f
Merge pull request #5868 from vector-im/feature/adm/ftue-email-verification
[FTUE] - Email input and verification
2022-05-23 11:14:46 +01:00
Benoit Marty 71e14ea43b
Merge pull request #6110 from vector-im/defect/jorgem/PSE-613-fix-multi-invites-to-room
Fix sending multiple invites to a room reaching only one or two people
2022-05-23 09:39:47 +02:00
Jorge Martín 96e3544a47 Fix sending multiple invites to a room reaching only one or two people 2022-05-23 08:14:32 +02:00
Benoit Marty 0307e572c0 Add note about API renaming 2022-05-20 21:14:42 +02:00
Benoit Marty 268c41a0ee Changelog 2022-05-20 21:14:42 +02:00
Onuray Sahin 109b381e2e
Merge pull request #6103 from vector-im/feature/ons/fix_live_location_flickering
Glide - Use current drawable while loading new static map image
2022-05-20 18:36:12 +03:00
ariskotsomitopoulos e323caa233 Merge branch 'develop' into feature/aris/crypto_replay_attack
# Conflicts:
#	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/MXOlmDevice.kt
2022-05-20 15:46:15 +03:00
ariskotsomitopoulos c958d3a383 Merge branch 'develop' into feature/aris/crypto_replay_attack 2022-05-20 15:43:08 +03:00
Adam Brown 735adf0c96 adding changelog entry 2022-05-20 12:11:44 +01:00
Onuray Sahin 468cc30019 Changelog added. 2022-05-20 12:22:24 +03:00
Benoit Marty b547a49ab3
Merge pull request #6089 from vector-im/feature/bma/real_fail
Ensure calling 'fail()' is not caught by the Exception handler
2022-05-20 10:33:02 +02:00
ClaireG b379ef46ec
Revert: Use member name instead of room name in DM creation item (#6049) 2022-05-19 14:14:58 +00:00
Onuray Sahin da764d7c9a
Merge pull request #6074 from vector-im/feature/ons/poll_refactoring
Poll refactoring with unit tests (PSF-1020)
2022-05-19 14:53:45 +03:00
Onuray Sahin 1605ae1607 Merge branch 'develop' into feature/ons/poll_refactoring
* develop: (251 commits)
  Space explore rooms screen alignment with design in figma (#5834)
  leaving space aligned with ios (#5942)
  Fix usage of System.currentTimeMillis(). This a bit mocky but anyway it's better to use SystemClock.elapsedRealtime() for this case.
  Update TimelinePreviousLastForwardTest.kt
  Changelog.d
  Rename 'getDomain' to 'getServerName'.
  Well-known lookups should not include the port of a server.
  Ah it was used in Gplay variant. Anyway I think we can still remove this now.
  Fix parsing of location data in non encrypted room
  Additionally increment for TimelinePreviousLastForwardTest
  Notify other devices of acceptance of verification request
  Instead of using a magic number, explicitly test for the events we expect.
  Adding comments on some strings and removing non necessary plural
  Remove ShortcutBadger lib and usage (it was dead code)
  Version++
  Fastlane file
  Towncrier
  Add `.login` to get the username of the PR merger.
  Rename folder for the PlayStore
  Remove empty translations
  ...

# Conflicts:
#	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/SessionModule.kt
2022-05-19 13:39:43 +03:00
Onuray Sahin 2e2dffd9c9 Merge branch 'develop' into live_location_labs_flag
* develop:
  Space explore rooms screen alignment with design in figma (#5834)
  leaving space aligned with ios (#5942)
  Fix usage of System.currentTimeMillis(). This a bit mocky but anyway it's better to use SystemClock.elapsedRealtime() for this case.
2022-05-19 12:52:05 +03:00
fedrunov a30912f688
Space explore rooms screen alignment with design in figma (#5834) 2022-05-19 11:49:20 +02:00
fedrunov 18842b5e3d
leaving space aligned with ios (#5942) 2022-05-19 11:49:08 +02:00
Onuray Sahin 5b43257f35 Changelog added. 2022-05-19 12:44:51 +03:00
Michael Kaye 5260e729ac
Merge pull request #6095 from vector-im/michaelk/correct_well_known_behaviour
Well known lookups should be to port 443 only.
2022-05-18 16:50:43 +01:00
Michael Kaye 9c99d12c44 Changelog.d 2022-05-18 15:32:06 +01:00
Benoit Marty 7ae3f6ea40
Merge pull request #6083 from vector-im/feature/bma/remove_badge
Remove ShortcutBadger lib and usage (it was dead code)
2022-05-18 16:19:37 +02:00
Maxime NATUREL 738ce18a2f
Merge pull request #5989 from vector-im/feature/mna/PSF-884-location-view
[Location sharing] - Message for live sharing in timeline (PSF-884)
2022-05-18 15:39:51 +02:00
Maxime NATUREL b2765e4b63 Adding changelog entry 2022-05-18 14:44:44 +02:00
Benoit Marty 328d834851 changelog 2022-05-18 13:09:58 +02:00
Jorge Martín 123ad87eda Notify other devices of acceptance of verification request 2022-05-18 12:31:32 +02:00
Michael Kaye f7303789a0
Merge pull request #6025 from vector-im/michaelk/skip_tests_failing_on_ci
Improve test handling in CI
2022-05-18 09:51:17 +01:00
Benoit Marty adb537006a Remove ShortcutBadger lib and usage (it was dead code) 2022-05-18 09:06:04 +02:00
Benoit Marty e14b9a445e Towncrier 2022-05-17 21:13:08 +02:00
ariskotsomitopoulos abbc57429a Add changelog 2022-05-17 17:16:27 +03:00
Onuray Sahin edd35872f3 Fix ending poll power level condition. 2022-05-17 15:44:39 +03:00
Benoit Marty 46e8737426
Merge pull request #6039 from vector-im/feature/dla/fix-sip-on-unhold
Direction and track need to be set for hold/unhold
2022-05-17 14:33:02 +02:00
ericdecanini 520c3e474c Adds changelog file 2022-05-17 12:02:29 +02:00
ariskotsomitopoulos 324856d700 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
2022-05-17 11:55:07 +03:00
Michael Kaye 012b20fca6 changelog.d 2022-05-16 15:59:41 +01:00
Benoit Marty afd2804ed3
Merge branch 'develop' into feature/mna/PSF-884-location-view 2022-05-16 14:42:38 +02:00
Adam Brown a893f5acdb applying the manual reordering of the sign up stages only when matrix.org is selected
- lifts the logic up to the view model
2022-05-16 12:33:54 +01:00
Benoit Marty 5387c9101e Changelog 2022-05-16 12:23:10 +02:00
Benoit Marty 15366f8d2a
Merge pull request #5973 from vector-im/michaelk/document_public_baseurl_requirement
Document need for public_baseurl to be correctly set.
2022-05-16 11:27:31 +02:00
Benoit Marty 90035de5f2
Merge pull request #6047 from chagai95/add-presence-indicator-busy-and-away
add presence indicator busy and away
2022-05-16 11:26:11 +02:00
Benoit Marty 9234c60155
Merge pull request #6038 from vector-im/feature/bma/detekt
Detekt
2022-05-13 23:40:53 +02:00
chagai95 491b3c351b
Create 6047.feature 2022-05-13 14:00:32 +02:00
Benoit Marty d17a273cb4 Changelog 2022-05-12 22:56:09 +02:00
Valere 22e0506814 Prevent 4S / megolm backup desync + sign with MSK 2022-05-12 18:45:35 +02:00
David Langley 44e8974c02 direction and track need to be set for hold/unhold 2022-05-12 17:01:44 +01: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
ericdecanini 52c404ac9c Merge remote-tracking branch 'origin/develop' into feature/eric/replace-search-room-subheader 2022-05-12 14:36:04 +02: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 cd509accdb
Merge pull request #5936 from hanthor/develop
Added themed icon for Android 13
2022-05-11 17:34:38 +02:00
Valere 304cb07858
Merge pull request #5559 from vector-im/feature/bca/crypto_better_key_share
Update/Revise SDK to implement reference flowchart for key sharing/forwarding + use backup
2022-05-11 12:05:58 +02:00
Travis Ralston 019ec6c1c8
Merge pull request #5997 from vector-im/travis/spec/v1.3-edit/nothreads
Remove spec v1.3 check for threads
2022-05-10 14:47:48 -06:00
Travis Ralston f1de116eff add changelog 2022-05-10 13:18:12 -06:00
Valere 12ab4787f1 Merge branch 'develop' into feature/bca/crypto_better_key_share 2022-05-10 19:30:52 +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
Adam Brown ece48baa9d
Merge pull request #5965 from vector-im/feature/adm/matrix-id-certificate
Handling SSL/TLS errors during WellKnown lookup
2022-05-10 12:17:48 +01: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
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
Maxime NATUREL 889e09a891 Adding changelog entry 2022-05-09 15:15:33 +02:00
Michael Kaye 21fc4e31b4 Towncrier 2022-05-09 11:54:59 +01:00
hanthor e1960e9593
Merge branch 'vector-im:develop' into develop 2022-05-06 14:57:11 -04:00
Adam Brown e97cdb03fa updating the well known lookup to take into account certificate errors when triggered via the sign in with matrix id flow 2022-05-06 16:38:40 +01: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
ariskotsomitopoulos 87c42898ee Add changelog 2022-05-06 12:16:10 +03:00
ericdecanini 1cb14d6be7 Adds changelog file 2022-05-05 19:16:53 +02:00
hanthor 6cd92a5d77
Merge branch 'vector-im:develop' into develop 2022-05-05 12:23:46 -04:00
ClaireG c9bd1f32b9
Update notifications rules: make a sound for each notification 2022-05-05 14:02:11 +02:00
Benoit Marty ced4146350 Changelog 2022-05-05 12:06:55 +02:00
hanthor 341456901d
Merge branch 'vector-im:develop' into develop 2022-05-04 16:38:47 -04:00
hanthor 766e8a8076 Added file to changelog.d 2022-05-04 13:56:15 -04: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
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
Benoit Marty 09e628f227
Merge branch 'develop' into feature/bma/currentTimeMillis 2022-05-04 17:43:03 +02:00
emotionalamoeba 9fe75eacf1
Merge branch 'vector-im:develop' into develop 2022-05-04 16:22:57 +01:00
Benoit Marty 9c558f1f15
Merge pull request #5928 from vector-im/bugfix/adm/login-in-other
Fixing sign in via Other needing registration to be enabled
2022-05-04 14:09:40 +02:00