Commit graph

1073 commits

Author SHA1 Message Date
Eric Decanini
5ac0555c21
Merge pull request #5826 from vector-im/bugfix/eric/missing-suggested-tag
Adds Suggested Tag in Explore Space
2022-04-27 14:15:05 +02:00
Valere
23f32aae84 Merge branch 'develop' into feature/bca/crypto_better_key_share 2022-04-27 12:54:41 +02:00
ariskotsomitopoulos
51b42929bd Merge branch 'develop' into feature/aris/prevent_decryption_fom_suspend_functions
# Conflicts:
#	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/TimelineEventDecryptor.kt
#	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/handler/room/RoomSyncHandler.kt
2022-04-27 12:26:16 +03:00
ariskotsomitopoulos
780f1ffc8c Merge branch 'develop' into feature/aris/fix_account_deactivation_issue
# Conflicts:
#	vector/src/main/java/im/vector/app/features/settings/account/deactivation/DeactivateAccountViewModel.kt
2022-04-27 12:15:36 +03:00
manuroe
f5973fa840
Merge pull request #5836 from vector-im/feature/manu/pr-2-reviews
Update the PR process doc with 2 reviewers and a new reviewer team
2022-04-27 08:47:11 +02:00
Benoit Marty
521fd1fcd7
Merge pull request #5847 from vector-im/bugfix/eric/missing-call-icons
Fixes Missing Call Icons when threads are enabled
2022-04-26 22:30:07 +02:00
ericdecanini
e4cd31d5ab Adds changelog file 2022-04-26 21:13:36 +02:00
Valere
012dfeb715 Change log for SDK apis 2022-04-26 17:31:01 +02:00
Valere
81b114fc82 Add change log + quick quality fix 2022-04-26 17:30:20 +02:00
Benoit Marty
d694ea16a8
Merge pull request #5816 from vector-im/feature/bma/sdk_doc_update
Implement a more scoped API to the `Session` interface
2022-04-26 17:00:29 +02:00
Benoit Marty
8ff7acaec5
Merge pull request #5832 from vector-im/feature/manu/elementx_gh_workflow
Add a GH workflow to push ElementX issues to the global board
2022-04-26 16:18:57 +02:00
Benoit Marty
6ee0b62272
Merge branch 'develop' into feature/bma/sdk_doc_update 2022-04-26 16:15:07 +02:00
ariskotsomitopoulos
ba99d5c028 Merge branch 'develop' into feature/aris/fix_account_deactivation_issue
# Conflicts:
#	vector/src/main/java/im/vector/app/features/settings/account/deactivation/DeactivateAccountViewModel.kt
2022-04-26 12:49:21 +03:00
Maxime NATUREL
343322ef21
Merge pull request #5814 from vector-im/fix/mna/live-location-beacon-format
[Live location sharing] - Removing BeaconInfo structure
2022-04-26 09:57:46 +02:00
manuroe
1b387c8242 Update the PR process doc with 2 reviewers and a new reviewer team. 2022-04-25 18:20:16 +02:00
manuroe
d2f6f0fa92 Add a GH workflow to push ElementX issues to the global board
https://github.com/orgs/vector-im/projects/43
2022-04-25 11:11:09 +02:00
Benoit Marty
4af883f5d2 changelog 2022-04-25 09:49:51 +02:00
Benoit Marty
b36955f6e2
Merge pull request #5812 from vector-im/feature/bma/dokka_3
Feature/bma/dokka 3
2022-04-25 09:43:17 +02:00
Henry Jackson
e4b8530356 Updated copy and moved override in profile screen
- Used display name instead of nick to match other strings in the app.
- Reordered member profile to show DM above changing nick colour.

Fixes #5825

Signed-off-by: Henry Jackson <manicwaspcore@protonmail.com>
2022-04-24 19:33:11 +01:00
Michael Loipführer
6b9b688072 do not switch away from home space on notification
If the preference "Show all Rooms in Home" is selected element should
not switch away from the home space when clicking a notification for a
room in some other space.
With this change one stays in the home space when the said preference is
active.
fixes #5180

Signed-off-by: Michael Loipführer <milo@sft.lol>
2022-04-23 01:03:25 +02:00
ericdecanini
ab924745de Adds changelog file 2022-04-22 21:53:55 +02:00
TarasSmakula
2839d1467f
Feature/5575 custom auth params for sign up (#5577)
Add a fun `RegistrationWizard.registrationCustom()` to be able to use any parameters during the registration.
Move terms converter into `api` package.
2022-04-21 20:02:27 +00:00
Maxime NATUREL
eb844753a5 Adding changelog entry 2022-04-21 16:47:38 +02:00
Onuray Sahin
56b3e8aaa4 Merge branch 'develop' into feature/ons/voip_screen_sharing_permission
* develop: (107 commits)
  Fixes long line and comment lint errors
  Fixes lint errors
  Adds changelog file
  Formats entire project
  Adds changelog file
  Makes MediaType internal
  Bump libphonenumber from 8.12.46 to 8.12.47
  updating release version in preparation for next cycle
  generating changelog
  Replaces writeAsync with awaitTransaction
  Replaces doWithRealm with writeAsync
  Translated using Weblate (Polish)
  Translated using Weblate (Slovak)
  Crash: open private room by link. Use RoomId instead of the alias.
  Translated using Weblate (Arabic)
  Makes MediaFileUtils function internal
  Removes runCatching from TemporaryFileCreator
  using unix end of line character instead of windows as *nix OSes are more common dev environments
  remove spaces feedback from left panel (#5686)
  Translated using Weblate (French)
  ...

# Conflicts:
#	vector/src/main/java/im/vector/app/features/call/VectorCallViewModel.kt
2022-04-21 15:16:04 +03:00
Eric Decanini
c21ec983e8
Merge pull request #5805 from vector-im/task/eric/format-project
Formats project with new code style
2022-04-21 12:43:28 +02:00
Benoit Marty
8874f236e4 Changelog 2022-04-21 12:30:34 +02:00
Eric Decanini
aebdee1070
Merge pull request #5652 from vector-im/bugfix/eric/sending-images-crashes
Potentially fixes intermittent crashing from sending gallery images
2022-04-21 11:54:59 +02:00
ericdecanini
ed11ca99af Adds changelog file 2022-04-21 11:53:24 +02:00
Onuray Sahin
55740a1f6b Changelog added. 2022-04-21 12:31:34 +03:00
Benoit Marty
7f3e72b9cb
Merge pull request #5772 from vector-im/feature/bma/ignore_users
Delete Events from ignored users and trigger a clear cache request dialog when unignoring user(s)
2022-04-21 11:03:09 +02:00
ericdecanini
b2e18a8591 Adds changelog file 2022-04-21 10:42:18 +02:00
Benoit Marty
7947d128fe
Merge pull request #5774 from vector-im/feature/bma/ignored_users_in_memberlist
Add a picto for ignored users in the room member list screen
2022-04-21 10:00:19 +02:00
Benoit Marty
f4f9c85bf7
Merge pull request #5773 from vector-im/feature/bma/ignore_user_settings
Move "Ignored users" setting section into "Security & Privacy"
2022-04-21 09:59:32 +02:00
Adam Brown
e736bc73f4 adding changelog entry 2022-04-19 12:41:13 +01:00
ariskotsomitopoulos
b96adadf1b Merge branch 'develop' into feature/aris/fix_account_deactivation_issue
# Conflicts:
#	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/InitializeCrossSigningTask.kt
#	vector/src/main/java/im/vector/app/features/settings/account/deactivation/DeactivateAccountViewModel.kt
2022-04-19 11:06:43 +03:00
Aris Kotsomitopoulos
abe07c73a4
Merge pull request #5775 from vector-im/feature/aris/threads_after_release_experience
Enhance user experience when home servers do not support threads.
2022-04-19 10:59:41 +03:00
fedrunov
48680c3e2d
remove spaces feedback from left panel (#5686) 2022-04-19 09:27:17 +02:00
Benoit Marty
948566c625
Merge pull request #5685 from vector-im/feature/nfe/space_member_spinner_text
add text to spinner when click on space member (dm)
2022-04-15 15:14:40 +02:00
Benoit Marty
09abab6ce3 Add a picto for ignored users in the room member list screen (#5764) 2022-04-15 14:17:35 +02:00
Benoit Marty
749976a9cd changelog 2022-04-15 13:31:49 +02:00
Benoit Marty
cf31381b60 changelog 2022-04-15 13:30:02 +02:00
ariskotsomitopoulos
d24ba65b5b Enhance user experience when home servers do not support threads. 2022-04-15 14:18:38 +03:00
Eric Decanini
3b454b9ad0
Merge pull request #5727 from vector-im/task/eric/current-code-style-config
Adds editorconfig for current code style
2022-04-15 12:07:58 +02:00
Adam Brown
e58677a104
Merge pull request #5763 from vector-im/feature/adm/server-selection-errors
FTUE - Server selection errors
2022-04-14 17:22:58 +01:00
Benoit Marty
6a6f59a3be
Merge pull request #5757 from ofalvai/bugfix/uploads-order-e2e
Fix sorting of uploads in encrypted rooms
2022-04-14 18:11:49 +02:00
Eric Decanini
ace8ae6a37
Merge pull request #5766 from vector-im/bugfix/eric/joining-space-landing
Changes destination when joining space to explore space rooms
2022-04-14 17:58:31 +02:00
Adam Brown
dc5902e8f5
Merge pull request #5737 from vector-im/feature/adm/ftue-captcha
FTUE - Registration Captcha and T&Cs screens
2022-04-14 16:42:25 +01:00
Benoit Marty
97f2206f2a
Merge pull request #5767 from vector-im/feature/bma/unignore_user
Unignore user must perform an initial sync
2022-04-14 17:31:32 +02:00
Benoit Marty
a171a29bf1
Merge pull request #5762 from vector-im/feature/bma/dokka_2
Make some data class immutable
2022-04-14 17:17:55 +02:00
Benoit Marty
c58b8acdcc
Merge pull request #5765 from chagai95/fix-setting-transfer-title
Fix setting transfer title
2022-04-14 17:11:09 +02:00
Benoit Marty
7b7c509796 Changelog 2022-04-14 16:47:04 +02:00
Onuray Sahin
aa55b1f6b3
Merge pull request #5758 from vector-im/feature/ons/live_location_stop_sharing
Live Location Sharing - Update beacon info state event when sharing is ended
2022-04-14 17:12:50 +03:00
ericdecanini
5b8909b5d2 Adds changelog file 2022-04-14 15:37:06 +02:00
chagai95
f6c0050e90
Create 5765.bugfix 2022-04-14 15:11:02 +02:00
Adam Brown
11ef4a7fec adding changelog entry 2022-04-14 13:34:54 +01:00
Benoit Marty
557808ef24 Changelog 2022-04-14 12:29:07 +02:00
Onuray Sahin
023a00d160 Changelog added. 2022-04-13 20:13:22 +03:00
Eric Decanini
9b7e94ebab
Fixes myroomnick changing Display Name (#5618) 2022-04-13 18:35:33 +02:00
Olivér Falvai
3f735e4346 Add changelog info
Signed-off-by: Olivér Falvai <ofalvai@gmail.com>
2022-04-13 17:40:41 +02:00
Adam Brown
f23d7f60b2 adding changelog entry 2022-04-13 14:50:11 +01:00
Benoit Marty
2761b35b6f
Merge pull request #5731 from t3chguy/t3chguy/fix-room-type-misuse
Don't wrongly show non-space invites in the space panel
2022-04-13 15:01:45 +02:00
Benoit Marty
5075775c56
Merge pull request #5744 from vector-im/feature/bma/dokka
Set up dokka to generate SDK documentation and cleanup the API
2022-04-13 14:49:10 +02:00
Adam Brown
0bf84341af
Merge pull request #5747 from vector-im/feature/adm/concurrent-new-session-crash
Fixing crash when navigating the app whilst room keys are being processed
2022-04-13 10:43:10 +01:00
Adam Brown
594b442a21 copying the list of new session listeners to avoid concurrent modification
- copying the list avoids the need to synchronise the add/removing/iterations
2022-04-12 17:36:05 +01:00
Benoit Marty
a0eb4c144e Add changelog files 2022-04-12 16:14:48 +02:00
Maxime NATUREL
2a201b3c46 Adding changelog entry 2022-04-12 15:51:02 +02:00
NIkita Fedrunov
8ae130c0d0 changelog fixed 2022-04-12 14:43:52 +02:00
NIkita Fedrunov
1526c73dae added changelog 2022-04-12 14:39:13 +02:00
aringenbach
047a45d77f
Add a setting to be able to always appear offline (#5583)
Add a setting to be able to always appear offline
Move presence enabling to a app-only preference
2022-04-12 12:08:56 +02:00
ericdecanini
9c696b8778 Adds changelog file 2022-04-12 12:02:30 +02:00
David Langley
454a65602b
Merge pull request #5639 from vector-im/feature/dla/uisi_match_web_implementation
Align Autorageshake with web implementation
2022-04-12 10:36:43 +01:00
David Langley
363afd0089 Update naming to InitialSyncProgressing for clarity. 2022-04-12 09:35:35 +01:00
Benoit Marty
836a12d047
Merge pull request #5719 from vector-im/feature/bma/improved_logs
Do not cancel the current sync request when the app goes to background
2022-04-12 09:23:24 +02:00
ganfra
f7e8c01121
Merge pull request #5554 from SpiritCroc/endless-loading
Fix endless loading timeline due to conflicting chunks
2022-04-11 18:52:24 +02:00
Adam Brown
c68045360e
Merge pull request #5736 from vector-im/feature/adm/confetti-z-order
Fixing onboarding confetti Z order
2022-04-11 16:12:54 +01:00
Michael Telatynski
7a721a4d1d Actually changelog this time 2022-04-11 14:56:35 +01:00
Adam Brown
05e0a4c715
Merge pull request #5734 from vector-im/feature/adm/posthog-dev-credentials
Updating posthog dev environment credentials
2022-04-11 13:26:17 +01:00
Adam Brown
a9df474067 fixing confetti rendering behind the onscreen text by changing z order 2022-04-11 13:20:31 +01:00
Onuray Sahin
5f635de0ac
Merge pull request #5711 from vector-im/feature/ons/live_location_aggregation
Live Location Sharing - Attach location data to beacon info state event
2022-04-11 15:01:59 +03:00
Adam Brown
4d65c42967 updating the posthog dev environment credentials 2022-04-11 11:57:00 +01:00
ganfra
53c7cec55d
Merge pull request #5475 from SpiritCroc/readmarkerline
Fix some cases where the read marker line would not show up when it should
2022-04-11 11:12:13 +02:00
ClaireG
f8a3f7ffac
Fix room name of DM in room creation item 2022-04-08 17:14:41 +02:00
Benoit Marty
03d6aa8cd3 Do not cancel current sync request when going to background #5621
Incremental sync can be long and it requires the user to wait for the treatment to end, else all is restarted from the beginning each time the user moves the app to foreground.
2022-04-08 16:01:04 +02:00
Adam Brown
db50225538 adding changelog entry 2022-04-08 13:16:29 +01:00
ariskotsomitopoulos
6b47db92dc Add changelog 2022-04-07 16:23:21 +03:00
fedrunov
eab3e5aefa
don't leave DMs when leaving all rooms in space (#5720) 2022-04-07 15:16:12 +02:00
Eric Decanini
45104f8cec
Merge pull request #5586 from vector-im/feature/eric/audio-files-player
Audio files in the timeline now appear with the audio player
2022-04-07 10:25:58 +01:00
ganfra
72bd398ae0
Merge pull request #5481 from SpiritCroc/readmarkerupdate
Fix updating unread marker if not to latest chunk
2022-04-07 10:23:58 +02:00
Onuray Sahin
44c6d88c44 Changelog added. 2022-04-06 19:24:20 +03:00
ganfra
94099f4908
Merge pull request #5659 from SpiritCroc/permalink-failure
Fix endless loading timeline if opened at non-existing event
2022-04-06 17:57:48 +02:00
Benoit Marty
f9677d6c8c
Merge pull request #5709 from vector-im/feature/bma/untranslatable_string
The string `ftue_auth_carousel_workplace_body` was declared not translatable
2022-04-06 17:35:12 +02:00
Benoit Marty
c276d6ae74
Merge pull request #5707 from vector-im/feature/aris/threads_prune_deleted_events
Prune the content of deleted events completely
2022-04-06 15:53:21 +02:00
Benoit Marty
c17599604b The string ftue_auth_carousel_workplace_body was declared not translatable by mistake 2022-04-06 15:50:03 +02:00
Benoit Marty
9c1cdf6488
Merge pull request #5703 from vector-im/feature/bma/avoid_error_log
Feature/bma/avoid error log
2022-04-06 15:08:20 +02:00
ariskotsomitopoulos
1b9fd3bdd4 Add changelog 2022-04-06 16:04:48 +03:00
Onuray Sahin
2a42eb8c87
Merge pull request #5697 from vector-im/feature/ons/live_location_pulse
Live Location Sharing - Send location data
2022-04-06 15:35:02 +03:00
Benoit Marty
85a00106c8 Add changelog about the logs 2022-04-06 12:46:26 +02:00
Benoit Marty
26e80ba70b KeysBackup: Better handling of 404 to avoid error log 2022-04-06 12:38:52 +02:00
Benoit Marty
c849cc5c5d
Merge pull request #5079 from vector-im/feature/bma/konfetti2
WIP and low priority: upgrade konfetti to 2.0.2
2022-04-06 10:00:09 +02:00
Benoit Marty
930ce0629b Changelog 2022-04-06 09:59:26 +02:00
Benoit Marty
1ef2b1d05a Towncrier 2022-04-05 22:30:59 +02:00
Benoit Marty
0f14652932
Merge pull request #5692 from vector-im/feature/aris/threads_beta_infrom_users_on_reply
Threads Beta opt-in mechanism
2022-04-05 20:40:16 +02:00
Benoit Marty
fac317d122
Merge pull request #5647 from vector-im/feature/aris/threads_beta_feedback
Feature/aris/threads beta feedback
2022-04-05 17:25:29 +02:00
Maxime NATUREL
bebe819c54
Merge pull request #5671 from vector-im/feature/mna/PSF-673-live-loc-share-duration
#5667: [Location Sharing] - Set duration of live sharing
2022-04-05 16:13:26 +02:00
Aris Kotsomitopoulos
d484ba07cd
Merge pull request #5594 from vector-im/feature/aris/thread_root_permalink_navigation
Improve permalink on thread root message
2022-04-05 16:39:46 +03:00
Onuray Sahin
f00fc1e5ab Changelog added. 2022-04-05 12:55:50 +03:00
fedrunov
0664afdf9a
Update Spaces menu ordering and capitalisation (#5539) 2022-04-05 09:27:39 +02:00
Aris Kotsomitopoulos
8c9d2410b1
Merge pull request #5688 from vector-im/feature/aris/threads_main_timeline_messages_layout
Improved thread rendering in the main timeline
2022-04-04 23:22:51 +03:00
ariskotsomitopoulos
9e48b02b73 Add changelog 2022-04-04 19:56:47 +03:00
Onuray Sahin
ff34ed9eb2
Merge pull request #5660 from vector-im/feature/ons/live_location_banner_visibility
Show a banner in timeline while location sharing service is running
2022-04-04 12:55:50 +03:00
Onuray Sahin
48d40d8ba2
Merge pull request #5651 from vector-im/feature/ons/live_location_beacon_info
Live Location Sharing - Beacon Info
2022-04-04 12:55:22 +03:00
Adam Brown
3aac59a5ae
Merge pull request #5080 from vector-im/feature/adm/encrypted-last-message
Updating encrypted room list message previews on key updates
2022-04-01 17:48:05 +01:00
Florian Renaud
4d37aa232f Replace "open settings" button by "disable" action in RageShake dialog if there is no session 2022-04-01 15:46:29 +02:00
ariskotsomitopoulos
be77363c34 Improved thread rendering in the main timeline 2022-04-01 12:53:28 +03:00
Adam Brown
4e215facaf adding changelog entry 2022-03-31 17:50:21 +01:00
Adam Brown
32b54e1e9c using continuation copy for combined sign up SSO buttons 2022-03-31 17:50:20 +01:00
Adam Brown
1d0a87be14 adding changelog entry 2022-03-31 17:23:05 +01:00
Aris Kotsomitopoulos
b9934d7239
Merge pull request #5666 from vector-im/feature/aris/threads_thread_list_loader
Add loader to thread list
2022-03-31 16:24:12 +03:00
Maxime NATUREL
d448c62cad Adding changelog entry 2022-03-31 14:43:32 +02:00
Maxime NATUREL
d05d697831
Merge pull request #5661 from vector-im/feature/mna/5581-live-location-feature-flag
#5581: live location sharing feature flag
2022-03-31 14:11:07 +02:00
Onuray Sahin
20cdf2bef1 Changelog added. 2022-03-31 13:47:18 +03:00
Benoit Marty
9a2cc1a4c5
Merge pull request #5664 from vector-im/feature/bma/dep_upgrade
Upgrade Jitsi and ktlint
2022-03-31 11:32:14 +02:00
Benoit Marty
0fe3cc3acc
Merge pull request #5663 from cketti/fix_openOutputStream
Use truncate mode to replace the contents of existing files

`ContentResolver.openOutputStream(Uri)` does not truncate existing files. If the amount of data written is smaller than the file size, you end up with new data at the beginning of the file followed by old data at the end of the file.
2022-03-31 09:56:32 +02:00
fedrunov
856a110aee
Merge pull request #5531 from vector-im/feature/nfe/create_space_copy
"Add space" copy is replaced with "create space" in left sliding panel
2022-03-31 09:16:20 +02:00
ariskotsomitopoulos
0d59a31788 Add changelog 2022-03-30 12:32:08 +03:00
Maxime Naturel
e92a05abe7 Adding changelog entry 2022-03-30 10:47:44 +02:00
Adam Brown
9d3d574d28
FTUE - Finalising personalisation journey (#5519)
* enabling the personalisation flow and promoting the strings for translation

* delegating the fake vector features to the static defaults, the fake exists for allowing overrides when needed

* incorporating the personalisation screens into the UI test signup

* adding changelog entry

* removing unused import

* putting the personalisation UI test flow behind the feature flag so that we can keep it disabled

* disabling the personalisation flow, we'll batch enable with other parts of the FTUE flow

* enabling the personalisation feature for registration unit tests which expect it to be enabled
2022-03-30 09:09:46 +01:00
Benoit Marty
f4f5beff15 Add changelogs 2022-03-30 09:54:02 +02:00
cketti
b9b5cab772 Use truncate mode to replace the contents of existing files
`ContentResolver.openOutputStream(Uri)` does not truncate existing files. If the amount of data written is smaller than the file size, you end up with new data at the beginning of the file followed by old data at the end of the file.
2022-03-29 18:57:22 +02:00
Eric Decanini
9c333c96c4
Merge pull request #5548 from vector-im/bugfix/eric/call-button-disappearing
Fixes voice call button disappearing in DM rooms with more than 2 members
2022-03-29 16:10:06 +02:00
SpiritCroc
365c03e763 Load timeline without initial eventId if not found 2022-03-29 12:56:54 +02:00
Adam Brown
1b2e3502cb
Merge pull request #5628 from vector-im/feature/adm/direct-login-tests
Direct login tests
2022-03-29 11:44:11 +01:00
David Langley
3ae4303ecd Fix changelog wording 2022-03-28 17:28:33 +01:00
David Langley
b4885629af Keep live event/pagination listeners. 2022-03-28 17:23:05 +01:00
Onuray Sahin
6952552e5e Changelog added. 2022-03-28 16:29:24 +03:00
ariskotsomitopoulos
b996e0eac0 Add changelog 2022-03-28 14:09:45 +03:00
Onuray Sahin
08476a91e4
Merge pull request #5595 from vector-im/feature/ons/live_location_service
Live Location Sharing - Foreground Service
2022-03-28 12:50:35 +03:00
Onuray Sahin
9b271e4ffd Trigger github actions. 2022-03-28 12:11:22 +03:00
David Langley
4fe8650387 Add changelog 2022-03-28 10:07:29 +01:00
ClaireG
a9b87de7a3
[Subscribing] Blank display name 2022-03-28 10:34:22 +02:00
Adam Brown
776cf24516 adding changelog entry 2022-03-25 11:15:05 +00:00
ericdecanini
c8a56d63e9 Merge remote-tracking branch 'origin/develop' into feature/eric/audio-files-player
# Conflicts:
#	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/MessageItemFactory.kt
2022-03-24 21:26:39 +01:00
ericdecanini
82cde166db Merge remote-tracking branch 'origin/develop' into feature/eric/audio-files-player
# Conflicts:
#	vector/src/main/java/im/vector/app/features/home/room/detail/composer/VoiceMessageHelper.kt
#	vector/src/main/java/im/vector/app/features/home/room/detail/composer/voice/VoiceMessageViews.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/item/MessageVoiceItem.kt
2022-03-24 20:32:28 +01:00
ericdecanini
edfe81cc2b Merge remote-tracking branch 'origin/develop' into bugfix/eric/voting-ended-poll
# Conflicts:
#	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/MessageItemFactory.kt
2022-03-24 14:40:28 +01:00
Adam Brown
af90adadf3 adding changelog entry 2022-03-23 17:29:06 +00:00
ganfra
8d4830975d Merge tag '1.4.6' into develop
v1.4.6
2022-03-23 16:24:02 +01:00
Onuray Sahin
f18a107df8 Merge branch 'develop' into feature/ons/live_location_service
* develop: (152 commits)
  Remove exhaustive.
  fixing the onboarding sanity test failing - adds tapping the new take me home button within the sanity test
  Fix lint issues on weblate sync
  fixing view model tests not collecting flow results - the switch from runBlockingTest to runTest means we need to provide a separate scope from the test in order to asynchronously collect the flow results
  Do not suggest collapse if there is only one section
  Translated using Weblate (Spanish)
  Translated using Weblate (Spanish)
  runBlocking -> runTest https://github.com/Kotlin/kotlinx.coroutines/blob/master/kotlinx-coroutines-test/MIGRATION.md
  runBlockingTest -> runTest https://github.com/Kotlin/kotlinx.coroutines/blob/master/kotlinx-coroutines-test/MIGRATION.md
  Small cleanup
  The `.exhaustive` trick is not needed anymore in Kotlin 1.6.0 https://kotlinlang.org/docs/whatsnew16.html#stable-exhaustive-when-statements-for-enum-sealed-and-boolean-subjects
  Also upgrade the coroutine lib
  Fix compilation warning (exhaustive when)
  Fix compilation warning (exhaustive when)
  Format file (no other change)
  Fix compilation warning (exhaustive when)
  Bump moshi from 1.12.0 to 1.13.0
  Bump kotlin-gradle-plugin from 1.5.31 to 1.6.0
  Code review fixes.
  fixing presence icon anchoring to the middle of the room icon - creates a secondary verification shield and aligns to the start of the room title when presence is present
  ...

# Conflicts:
#	vector/src/main/java/im/vector/app/features/location/LocationSharingFragment.kt
#	vector/src/main/java/im/vector/app/features/location/LocationSharingViewModel.kt
#	vector/src/main/res/values/strings.xml
2022-03-23 16:25:01 +03:00
Onuray Sahin
96a2bc9ce4 Changelog added. 2022-03-23 15:47:40 +03:00
Onuray Sahin
c478503c13 Merge branch 'develop' into feature/ons/voice_message_scrubbing
* develop: (429 commits)
  fixing the onboarding sanity test failing - adds tapping the new take me home button within the sanity test
  Fix lint issues on weblate sync
  fixing view model tests not collecting flow results - the switch from runBlockingTest to runTest means we need to provide a separate scope from the test in order to asynchronously collect the flow results
  Do not suggest collapse if there is only one section
  Translated using Weblate (Spanish)
  Translated using Weblate (Spanish)
  runBlocking -> runTest https://github.com/Kotlin/kotlinx.coroutines/blob/master/kotlinx-coroutines-test/MIGRATION.md
  runBlockingTest -> runTest https://github.com/Kotlin/kotlinx.coroutines/blob/master/kotlinx-coroutines-test/MIGRATION.md
  Small cleanup
  The `.exhaustive` trick is not needed anymore in Kotlin 1.6.0 https://kotlinlang.org/docs/whatsnew16.html#stable-exhaustive-when-statements-for-enum-sealed-and-boolean-subjects
  Also upgrade the coroutine lib
  Fix compilation warning (exhaustive when)
  Fix compilation warning (exhaustive when)
  Format file (no other change)
  Fix compilation warning (exhaustive when)
  Bump moshi from 1.12.0 to 1.13.0
  Bump kotlin-gradle-plugin from 1.5.31 to 1.6.0
  fixing presence icon anchoring to the middle of the room icon - creates a secondary verification shield and aligns to the start of the room title when presence is present
  PR remarks
  Increase the thread summaries limit
  ...

# Conflicts:
#	vector/src/main/java/im/vector/app/features/home/room/detail/composer/voice/VoiceMessageRecorderView.kt
#	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageVoiceItem.kt
2022-03-23 13:32:36 +03:00
ClaireG
6787980185
Do not suggest collapse if there is only one section 2022-03-22 17:31:21 +01:00
ganfra
073475854e
Merge pull request #5564 from SpiritCroc/timeline-chunk-double-linking
Fix another case of read markers not updating: Ensure proper double linking of TimelineChunks
2022-03-22 15:46:48 +01:00
Adam Brown
1e6e8b546d fixing presence icon anchoring to the middle of the room icon
- creates a secondary verification shield and aligns to the start of the room title when presence is present
2022-03-22 13:43:43 +00:00
ericdecanini
7449d15d2f Merge remote-tracking branch 'origin/develop' into bugfix/eric/voting-ended-poll
# Conflicts:
#	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/MessageItemFactory.kt
2022-03-22 14:15:29 +01:00
ericdecanini
06468a4365 Adds changelog file 2022-03-21 20:04:08 +01:00
ganfra
794131d274
Merge pull request #5551 from SpiritCroc/local-echo
Fix local echos not being shown when re-opening rooms
2022-03-21 19:24:07 +01:00
Benoit Marty
835497682f
Merge pull request #5572 from p1gp1g/play-sticker
Show stickers on click
2022-03-21 15:51:36 +01:00
Benoit Marty
579e6164d6
Merge pull request #5550 from vector-im/feature/adm/presence-theme-patch
Presence indicator theme attribute
2022-03-21 15:45:36 +01:00
ariskotsomitopoulos
0479049476 Permalink to a root thread message will navigate user within the thread timeline 2022-03-21 15:16:57 +02:00
ariskotsomitopoulos
a959a15636 Add changelog 2022-03-21 13:18:20 +02:00
Adam Brown
ea9c9ae490
Merge pull request #5408 from vector-im/feature/adm/onboarding-tests
FTUE - Onboarding registration steps unit tests
2022-03-18 15:57:38 +00:00
Maxime Naturel
32f18d5af3 Adding changelog entry 2022-03-18 14:10:47 +01:00
Maxime NATUREL
3547c5acba
Merge pull request #5565 from vector-im/feature/mna/PSF-664-5536-permissions
Live Location Sharing - Background permission
2022-03-18 12:06:30 +01:00
Valere
189683a8a1
Merge pull request #5552 from SpiritCroc/timeline-decryptor-crash
Fix crash when closing room during timeline decryption
2022-03-18 11:34:27 +01:00
sim
e5c04d9cc8 Show stickers on click
Play animated stickers

Signed-off-by: sim <git@sgougeon.fr>
2022-03-18 01:03:34 +01:00
Eric Decanini
9c8f29e853 Merge branch 'develop' into bugfix/eric/voting-ended-poll 2022-03-17 12:07:45 +01:00
Arnaud Ringenbach
4bcf31e0c2 Add a presence sync enabling build config 2022-03-17 11:43:07 +01:00
SpiritCroc
91259bef40 Ensure proper double linking of TimelineChunks
We need both directions so getOffsetIndex() produces correct results in
all cases.
2022-03-17 11:34:20 +01:00
Adam Brown
4154f036db fixing crash when tapping verification item
- caused by the setArguments being called on the TimelineFragment not the bottomsheet we've just created
2022-03-16 16:19:39 +00:00
Aris Kotsomitopoulos
d1a77d2eca
Merge pull request #5378 from vector-im/feature/aris/threads_analytics
Feature/aris/threads analytics
2022-03-16 15:51:24 +01:00
ClaireG
d1bca78083
[Notification mode] Wrong mode is displayed when the mention only is selected on the web client 2022-03-16 14:51:10 +01:00
SpiritCroc
682f4c35d2 Fix endless loading timeline due to conflicting chunks 2022-03-16 14:24:31 +01:00
ariskotsomitopoulos
eee1ec1423 Merge branch 'develop' into feature/aris/threads_analytics 2022-03-16 13:19:08 +01:00
ariskotsomitopoulos
60db2e424e Merge branch 'develop' into feature/aris/threads_analytics 2022-03-16 13:01:09 +01:00
SpiritCroc
a994f859e1 Fix crash when closing room during timeline decryption 2022-03-16 10:19:01 +01:00
SpiritCroc
856f25f684 Fix local echos not being shown when re-opening rooms 2022-03-15 19:34:04 +01:00
ericdecanini
5d496d5f3d Adds changelog file 2022-03-15 19:16:04 +01:00
Adam Brown
c257488ca8
Merge pull request #5513 from chagai95/add-presence-indicator-online
add  presence indicator online
2022-03-15 17:58:02 +00:00
Adam Brown
fc5c0579bb adding changelog entry 2022-03-15 17:49:44 +00:00
Adam Brown
17d363cf9a
Merge pull request #5389 from vector-im/feature/adm/personalisation-complete
FTUE - Personalisation complete
2022-03-15 17:33:29 +00:00
Maxime Naturel
ae6040e01e Adding changelog entry 2022-03-15 17:45:19 +01:00
Maxime NATUREL
9ef235f3d7
Merge pull request #5479 from vector-im/feature/mna/PSF-735-pinned-location
#5417: Pinned location sharing
2022-03-15 17:40:21 +01:00
aringenbach
a7639f4424
Merge pull request #5544 from vector-im/aringenbach/5521_permalink_base_url_mention
Fix mentions using matrix.to rather than client defined permalink base url
2022-03-15 17:28:16 +01:00
Maxime Naturel
9864e51927 Adding changelog entry 2022-03-15 17:09:31 +01:00
chagai95
f8ca2fecd5
Update changelog.d/5513.misc
Co-authored-by: Adam Brown <adampsbrown@googlemail.com>
2022-03-15 17:08:31 +01:00
Onuray Sahin
db0cfd4704
Merge pull request #5455 from vector-im/feature/ons/fix_poll_start_notifications
Show notification for poll start events but not for responses
2022-03-15 18:34:03 +03:00
Onuray Sahin
7fa43f0d1b Merge branch 'develop' into feature/ons/fix_poll_start_notifications
* develop: (163 commits)
  Fix lint error.
  Removes changelog file
  Fix PR comment
  Adds changelog file
  Refactors MessageBubbleView
  Updating changelog copy
  making use of the fake overrides for testing
  extracting the personalization complete emitting to a dedicated function
  making use of binding api instead of manual findviewbyid
  using consistent method naming for setting the capabilities override
  taking the personalization feature flag into account when calculating if personalization is supported - also removes a legacy loading workaround for the account creation step, we're navigating to a new screen AccountCreated so we have to stop the loading
  adding changelog entry
  using correct label for the avatar capability debug override
  forwarding to the profile picture flow when display name changing isn't supported but pictures are when personalising the profile
  formatting
  dynamically switching the onboarding flow based on the capabilities of the homeserver - when avatars can't be changed we complete the personlisation flow
  hiding the toolbar back button and handling system back as take the user home if the display name personalisation is not supported
  adding test around account creation via dummy
  dynamically changing the account created layout based on if the homeserver supports personalisation
  adding entry points for injecting and overriding the homeserver capabilities
  ...
2022-03-15 17:49:53 +03:00
ericdecanini
9806f1bf8f Merge remote-tracking branch 'origin/develop' into bugfix/eric/voting-ended-poll
# 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/timeline/factory/MessageItemFactory.kt
#	vector/src/main/java/im/vector/app/features/poll/create/CreatePollViewState.kt
2022-03-15 15:48:17 +01:00
Aris Kotsomitopoulos
e0b93c2d2c
Merge pull request #5298 from vector-im/feature/aris/thread_live_thread_list
Live Threads
2022-03-15 15:14:26 +01:00
Arnaud Ringenbach
c80df6943b Add changelog 2022-03-15 14:32:08 +01:00
ariskotsomitopoulos
07eabf110d Merge branch 'feature/aris/thread_live_thread_list' into feature/aris/threads_analytics
# Conflicts:
#	vector/src/main/java/im/vector/app/features/analytics/plan/Interaction.kt
2022-03-15 14:23:48 +01:00
ariskotsomitopoulos
8a862d006e Merge branch 'develop' into feature/aris/thread_live_thread_list
# Conflicts:
#	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/format/DisplayableEventFormatter.kt
2022-03-15 14:21:04 +01:00
Onuray Sahin
b4df6e1ae8 Merge branch 'develop' into feature/ons/poll_tests
* develop:
  Fix lint error.
  Fix lint error.
  Avoid stable prefix
  Support both unstable and stable prefixes.
2022-03-15 16:16:17 +03:00
Adam Brown
9c114f371e adding changelog entry 2022-03-15 13:07:22 +00:00
Onuray Sahin
1a76914828
Merge pull request #5345 from vector-im/feature/ons/fix_unstable_prefixes
Support both unstable and stable prefixes
2022-03-15 15:16:16 +03:00
Onuray Sahin
dd3178c36e Merge branch 'develop' into feature/ons/poll_tests
* develop: (150 commits)
  Removes changelog file
  Fix PR comment
  Adds changelog file
  Refactors MessageBubbleView
  Updating changelog copy
  making use of the fake overrides for testing
  extracting the personalization complete emitting to a dedicated function
  making use of binding api instead of manual findviewbyid
  using consistent method naming for setting the capabilities override
  taking the personalization feature flag into account when calculating if personalization is supported - also removes a legacy loading workaround for the account creation step, we're navigating to a new screen AccountCreated so we have to stop the loading
  adding changelog entry
  using correct label for the avatar capability debug override
  forwarding to the profile picture flow when display name changing isn't supported but pictures are when personalising the profile
  formatting
  dynamically switching the onboarding flow based on the capabilities of the homeserver - when avatars can't be changed we complete the personlisation flow
  hiding the toolbar back button and handling system back as take the user home if the display name personalisation is not supported
  adding test around account creation via dummy
  dynamically changing the account created layout based on if the homeserver supports personalisation
  adding entry points for injecting and overriding the homeserver capabilities
  extracting method for the handling of the profile picture selection
  ...
2022-03-15 14:39:51 +03:00
ClaireG
5de7873755
Merge pull request #5532 from vector-im/cgizard/ISSSUE-5514
Read receipt in wrong order
2022-03-14 17:39:30 +01:00
Adam Brown
82e1afdb72
Merge pull request #5375 from vector-im/feature/adm/display-personalisation-based-on-capabilities
FTUE - Capability based personalisation flow
2022-03-14 13:34:21 +00:00
Adam Brown
c06d3ff809 Updating changelog copy
Co-authored-by: Benoit Marty <benoitm@matrix.org>
2022-03-14 11:54:42 +00:00
Adam Brown
7e79d7ed0e adding changelog entry 2022-03-14 11:54:42 +00:00
ariskotsomitopoulos
d215f03798 Merge branch 'develop' into feature/aris/thread_live_thread_list 2022-03-14 12:02:04 +01:00