12497bd90f
Merge remote-tracking branch 'upstream/feature/bma/toDevice_timeout_0' into sc
...
Change-Id: I6234f07715d1c5eab4732a046e93c4bda48159ad
2021-12-27 19:38:08 +01:00
46c7c7421e
Merge branch 'develop' into feature/ons/static_location
...
* develop: (87 commits)
Update versions to 1.3.13
Release: prepare CHANGES
adding changelog entry
removing android version bypass for using text futures - the emoji span changes affect all android versions
Update versions to 1.3.12
Release: prepare CHANGES
removing trailing space
extracting the emoji processing to an interface so that we can override the behaviour in the unit test
adding comment to explain SpannableStringBuilder usage
adding changelog entry
using the safe emoji processor to avoid the timeline failing when processing the content and the emoji library hasn't initialised yet
Update changelog.d/4743.bugfix
Small UI fix in room member profile hearder (#4700 )
Add changelog
adding changelog entry
adding missing binding options emote content - fixes android 12+ crash when certain emojis are used within the emote content
Fix crash ImmutableModelException
Update Gradle Wrapper from 7.3.1 to 7.3.2.
Call banner: center text vertically
adding changelog entry
...
2021-12-27 14:27:19 +03:00
863b201793
Bump libphonenumber from 8.12.39 to 8.12.40
...
Bumps [libphonenumber](https://github.com/google/libphonenumber ) from 8.12.39 to 8.12.40.
- [Release notes](https://github.com/google/libphonenumber/releases )
- [Changelog](https://github.com/google/libphonenumber/blob/master/making-metadata-changes.md )
- [Commits](https://github.com/google/libphonenumber/compare/v8.12.39...v8.12.40 )
---
updated-dependencies:
- dependency-name: com.googlecode.libphonenumber:libphonenumber
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
2021-12-23 23:07:37 +00:00
acdd4e24b9
Merge tag 'v1.3.12' into sc
...
Change-Id: I66c0120371c3f52295f033ec21702c08381b5b10
Conflicts:
build.gradle
vector/build.gradle
vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/MessageActionsViewModel.kt
vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/TimelineEventVisibilityHelper.kt
vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageTextItem.kt
vector/src/main/java/im/vector/app/features/home/room/detail/timeline/url/PreviewUrlView.kt
vector/src/main/java/im/vector/app/features/home/room/list/RoomListFragment.kt
vector/src/main/java/im/vector/app/features/home/room/list/actions/RoomListQuickActionsEpoxyController.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/RoomProfileActivity.kt
vector/src/main/java/im/vector/app/features/settings/VectorPreferences.kt
vector/src/main/java/im/vector/app/features/settings/VectorSettingsBaseFragment.kt
vector/src/main/java/im/vector/app/features/spaces/SpaceSummaryController.kt
vector/src/main/res/drawable/highlighted_message_background.xml
vector/src/main/res/layout/composer_layout_constraint_set_compact.xml
vector/src/main/res/layout/composer_layout_constraint_set_expanded.xml
vector/src/main/res/layout/fragment_home_detail.xml
vector/src/main/res/layout/fragment_login_server_selection.xml
vector/src/main/res/layout/fragment_room_detail.xml
vector/src/main/res/layout/item_bottom_sheet_message_preview.xml
vector/src/main/res/layout/item_expandable_textview.xml
vector/src/main/res/layout/item_login_header.xml
vector/src/main/res/layout/item_radio.xml
vector/src/main/res/layout/item_room.xml
vector/src/main/res/layout/item_timeline_event_base.xml
vector/src/main/res/layout/item_timeline_event_call_tile_stub.xml
vector/src/main/res/layout/item_timeline_event_code_block_stub.xml
vector/src/main/res/layout/item_timeline_event_media_message_stub.xml
vector/src/main/res/layout/item_timeline_event_poll_stub.xml
vector/src/main/res/layout/item_timeline_event_redacted_stub.xml
vector/src/main/res/layout/item_timeline_event_voice_stub.xml
vector/src/main/res/layout/view_stub_room_profile_header.xml
vector/src/main/res/layout/view_url_preview.xml
vector/src/main/res/xml/vector_settings_labs.xml
vector/src/main/res/xml/vector_settings_root.xml
2021-12-23 14:36:13 +01:00
7714445d24
moving the updateAvatar work to the io dispatcher
...
- fixes some devices/OS's from attempting to run okhttp on the main thread
2021-12-21 09:33:25 +00:00
18b38fe21e
making the file upload file creation all happen on the IO dispatcher
2021-12-21 09:33:25 +00:00
55c0f1fcb3
Update versions to 1.3.13
2021-12-20 15:35:09 +01:00
c6a118fc1f
Update versions to 1.3.12
2021-12-17 19:05:17 +01:00
3bd2b77af3
Fix package name
2021-12-17 15:55:26 +01:00
706c5b2b32
Add tagged events model
2021-12-17 15:54:20 +01:00
f9b69fff9e
Add tagged event entry in room account data types
2021-12-17 15:39:25 +01:00
6495bd9e5e
Send location event.
2021-12-17 15:09:02 +03:00
e7bb030d52
full markdown should work in replies, was hardcoded to simple irrespective of prefrence.
2021-12-16 14:10:49 +00:00
bc6ca2449e
Add advanced parser annotation
2021-12-16 13:13:40 +00:00
a3a8a5b0b5
Extract reply formatting
2021-12-16 12:47:06 +00:00
270c70d301
Avoid creating new otk if there are pending to_devices to process
2021-12-15 13:31:19 +01:00
13dc2d5b76
Fix documentation.
2021-12-15 10:03:14 +00:00
bef238f851
Add simple parser for use with just quotes/replies
2021-12-14 20:40:44 +00:00
96062b7daa
Enable on replies and quotes even if preference is disabled to fix newline issues.
2021-12-14 17:10:54 +00:00
20b5742227
Merge branch 'develop' of github.com:vector-im/element-android into feature/dla/fix_reply_and_quote_newlines
2021-12-14 13:46:45 +00:00
fa65cc59fe
Version++
2021-12-14 14:46:08 +01:00
fa060051ed
Merge pull request #3970 from vector-im/feature/ons/fallback_keys
...
Fallback keys implementation
2021-12-13 23:36:20 +01:00
f028f9836b
Merge branch 'develop' into feature/ons/poll_timeline
...
* develop: (49 commits)
Update changelog.d/4592.bugfix
Remove jcenter from here, let's see what the CI will say
Common struct for each maven repo
Rename the file to group them
Add changelog file
Revert PR 4592 for devtools
Enhance include groups implementation by decoupling them to a separate file
Cleanup
Legals: improve API to get homeserver terms
Legals: update setting icon
Auto-review
Add a help section in the settings.
Changelog
Color for links
Use same height than the loading item to avoid dynamic resizing
Legals: only display external URLs.
Legals: Move the 2 copyrights items to the new legal screen
Add some space between the 2 TextViews, and improve the layout
Legals: Move the 3 element links to the new legal screen
Rename some classes
...
# Conflicts:
# vector/src/main/res/layout/item_timeline_event_option_buttons_stub.xml
# vector/src/main/res/layout/item_timeline_event_poll_stub.xml
2021-12-13 17:44:21 +03:00
76960f8b67
Update matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/OneTimeKeysUploader.kt
...
Co-authored-by: poljar <poljar@termina.org.uk>
2021-12-10 16:12:14 +01:00
38a8e8b003
Update matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/OneTimeKeysUploader.kt
...
Co-authored-by: poljar <poljar@termina.org.uk>
2021-12-10 16:11:58 +01:00
9b2a3cf445
Code review fixes.
2021-12-10 17:57:57 +03:00
bf7907a119
Legals: improve API to get homeserver terms
2021-12-10 15:35:46 +01:00
411fd31d4c
Legals: Trick to get the homeserver policy
2021-12-10 15:34:25 +01:00
be9e592aa5
Do not allow to vote the same option twice.
2021-12-09 16:08:59 +03:00
b2e599ea2b
Merge branch 'develop' into feature/ons/poll_timeline
...
* develop: (21 commits)
Remove automation for new Delight board
Remove automation for old Delight board
Bump gradle from 7.0.3 to 7.0.4
Bump realm-gradle-plugin from 10.8.1 to 10.9.0
Bump libphonenumber from 8.12.38 to 8.12.39
Bump mavericks from 2.4.0 to 2.5.0
removing no longer possible branches
adding a consistent padding to allow message types to avoid touching the side gutter
Upgrade OLM to v3.2.7 and get it from our maven repository.
removing manual send status spacing - it's no longer needed as the send status is always present (but invisible)
removing manual end alignment for voice messages as send status gutter is now always present
forcing the send spacing to always be taking into account - ensures all message lengths are consistent
capping the preview image url based on the height - stops large screens eg tablets from attempting to fill the screen
matching iOS max line rules for the preview description
using themed colours for the close button
limiting title to avoid overlapping with close icon
flattening preview url view layout with custom view to reduce view hierarchy
adding changelog entry
updating url preview to match new designs
removing now longer needed Mode argument
...
# Conflicts:
# vector/src/main/res/layout/item_timeline_event_base.xml
2021-12-09 15:38:15 +03:00
04a7590804
Code review fixes.
2021-12-09 15:09:12 +03:00
1280687640
Merge branch 'develop' into feature/fga/timeline_chunks_rework
2021-12-09 12:36:59 +01:00
bf287d1827
Timeline: clean up
2021-12-09 12:35:23 +01:00
1e2e9e1070
Timeline: change a bit when postPagination is triggered
2021-12-09 12:26:40 +01:00
f675dcdefd
Bump realm-gradle-plugin from 10.8.1 to 10.9.0
...
Bumps [realm-gradle-plugin](https://github.com/realm/realm-java ) from 10.8.1 to 10.9.0.
- [Release notes](https://github.com/realm/realm-java/releases )
- [Changelog](https://github.com/realm/realm-java/blob/master/CHANGELOG.md )
- [Commits](https://github.com/realm/realm-java/compare/v10.8.1...v10.9.0 )
---
updated-dependencies:
- dependency-name: io.realm:realm-gradle-plugin
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
2021-12-08 23:06:34 +00:00
a026137381
code review
2021-12-08 15:47:06 +01:00
01b8b7d57a
Code review
2021-12-08 14:17:08 +01:00
b53433e61b
Timeline: some clean up
2021-12-08 11:07:07 +01:00
bf1be4f20d
Merge branch 'develop' into feature/fga/timeline_chunks_rework
2021-12-08 10:38:42 +01:00
d2969766ca
Bump libphonenumber from 8.12.38 to 8.12.39
...
Bumps [libphonenumber](https://github.com/google/libphonenumber ) from 8.12.38 to 8.12.39.
- [Release notes](https://github.com/google/libphonenumber/releases )
- [Changelog](https://github.com/google/libphonenumber/blob/master/making-metadata-changes.md )
- [Commits](https://github.com/google/libphonenumber/compare/v8.12.38...v8.12.39 )
---
updated-dependencies:
- dependency-name: com.googlecode.libphonenumber:libphonenumber
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
2021-12-08 00:42:33 +00:00
29a4fd1e41
Timeline: make 3 integration tests passing (also add some suspend method on the timeline)
2021-12-07 21:13:41 +01:00
5d35f02abb
Support using unpublished fallback key instead of generating
...
And forgetFallback after 5mn
2021-12-07 19:56:14 +01:00
f843dddc3a
Cleaning
2021-12-07 19:05:36 +01:00
10671a53a4
Quick refactor to use same mechanism as updateOneTimeKeyCount
2021-12-07 19:05:36 +01:00
c603135398
Code review fixes.
2021-12-07 19:05:36 +01:00
4ac90f10c1
Fallback keys implementation.
...
Author: Onuray - Benoit squashes the 4 commit to cancel the addition on binaries
2021-12-07 19:05:36 +01:00
953fadeed4
Merge branch 'develop' into feature/ons/poll_timeline
...
* develop: (319 commits)
Bump dagger from 2.40.4 to 2.40.5
More debouncing
Changelog
I need the view here
clicks() already has debouncing with conflate(), so throttleFirst is not necessary
Use debouncedClicks where applicable
Use `observeViewEvents` facility
private
use != rather that is
Fix waring for state is not dialing or connected
state can also be connected
Add script to compress video and convert to gif file
removing boolean notification version usage
adding changelog entry
removing unused imports and increasing enum allowance
porting the notifications setting version to the vector features
Add warning if unexpected state.
setting login version via typed build config field instead of resources
separating the SSO redirection from the login activities - adds a dedicated routing activity to proxy the uri to the login selected by the feature flags
Removing trailing space
...
# Conflicts:
# vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailAction.kt
# vector/src/main/java/im/vector/app/features/home/room/detail/timeline/format/DisplayableEventFormatter.kt
# vector/src/main/res/layout/item_timeline_event_option_buttons_stub.xml
# vector/src/main/res/xml/vector_settings_labs.xml
2021-12-07 18:50:52 +03:00
892d70812f
Upgrade OLM to v3.2.7 and get it from our maven repository.
2021-12-07 14:50:25 +01:00
75b544a110
Support push notification for poll creation event.
2021-12-07 12:53:35 +03:00
f1d8b9e974
Merge pull request #4637 from vector-im/feature/dla/outgoing_pstn_call_fails
...
Feature/dla/outgoing pstn call fails
2021-12-06 21:37:11 +01:00
747030b578
use != rather that is
2021-12-06 14:37:36 +00:00
03be698a7e
Fix waring for state is not dialing or connected
2021-12-06 13:46:56 +00:00
a6d6fd7b3b
state can also be connected
2021-12-06 13:05:37 +00:00
4b63a9f939
Merge tag 'v1.3.9' into sc
...
Change-Id: I26834af19e0b02887f288b6441ced6d993cb8861
Conflicts:
vector/src/fdroid/java/im/vector/app/di/FlavorModule.kt
vector/src/gplay/java/im/vector/app/push/fcm/EmbeddedDistrib.kt
vector/src/main/java/im/vector/app/VectorApplication.kt
vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
vector/src/main/java/im/vector/app/features/home/room/detail/composer/MessageComposerViewEvents.kt
vector/src/main/java/im/vector/app/features/home/room/detail/composer/MessageComposerViewModel.kt
vector/src/main/java/im/vector/app/features/home/room/detail/composer/MessageComposerViewState.kt
vector/src/main/java/im/vector/app/features/home/room/detail/composer/VoiceMessageRecorderView.kt
vector/src/main/res/drawable/ic_shield_custom.xml
vector/src/main/res/drawable/ic_shield_trusted.xml
2021-12-05 13:46:55 +01:00
49eee0dc38
Merge branch 'develop' into feature/fga/timeline_chunks_rework
2021-12-03 18:39:18 +01:00
3217277bc4
Timeline: check for create event to hide loader
2021-12-03 18:39:04 +01:00
e60d053f84
Merge pull request #4568 from vector-im/feature/fga/fix_sdk_integration_tests
...
Feature/fga/fix sdk integration tests
2021-12-03 17:11:33 +01:00
767ead019a
Add warning if unexpected state.
2021-12-03 15:13:06 +00:00
23ad4e5a27
Remove legacy implementation classes.
2021-12-03 16:19:19 +03:00
cd7345aa6b
Removing trailing space
2021-12-03 13:54:05 +01:00
8ca60eadbb
Merge branch 'develop' into feature/fga/timeline_chunks_rework
2021-12-03 12:55:57 +01:00
667bf1a848
Tests: fix internal TestMatrix
2021-12-03 12:55:32 +01:00
de7180ef7e
And remove braces
2021-12-03 11:30:28 +00:00
0cf50e88e9
Keep guard pattern
2021-12-03 11:28:49 +00:00
bf8b485e2c
lint
2021-12-03 11:24:40 +00:00
014da84ba6
Timeline: try to optimise a bit the loading
2021-12-03 12:14:35 +01:00
c62028df68
Implement poll actions bottom sheet.
2021-12-03 11:41:21 +03:00
2a3a55894f
Aggregate votes and poll end event.
2021-12-03 11:23:47 +03:00
a3b11b223a
Allow removing poll event.
2021-12-03 11:21:52 +03:00
7c269309c2
Allow sending vote and ending poll.
2021-12-03 11:21:21 +03:00
ebc131f492
Implement new poll content.
2021-12-03 11:18:16 +03:00
76eddef840
Timeline: avoid notifying when decryption error is same as previous
2021-12-02 20:42:54 +01:00
03961fe933
Timeline: update when loading states changed
2021-12-02 20:42:29 +01:00
f3b3c880d0
select answer should be used for outgoing calls.
2021-12-02 18:35:51 +00:00
5eda8a84d0
Small cleanup
2021-12-02 13:57:32 +01:00
b6218d086d
Rename const for clarity
2021-12-02 13:55:26 +01:00
78c3bff81f
Add name to call argument and actually fix a mistake :/
2021-12-02 13:54:32 +01:00
b7f6254c98
Clarify the time units. We should always used milliseconds to avoid mistake...
2021-12-02 13:50:59 +01:00
f22badd13e
Format
2021-12-02 13:47:02 +01:00
fc4ed80273
Workaround to fetch all the pending toDevice events from a Synapse homeserver - SyncWorker
2021-12-02 10:56:43 +01:00
59db27ba97
Workaround to fetch all the pending toDevice events from a Synapse homeserver
2021-12-02 00:23:41 +01:00
6b7f9cb688
Bump robolectric from 4.7.2 to 4.7.3
...
Bumps [robolectric](https://github.com/robolectric/robolectric ) from 4.7.2 to 4.7.3.
- [Release notes](https://github.com/robolectric/robolectric/releases )
- [Commits](https://github.com/robolectric/robolectric/compare/robolectric-4.7.2...robolectric-4.7.3 )
---
updated-dependencies:
- dependency-name: org.robolectric:robolectric
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
2021-12-01 23:07:55 +00:00
f80069604c
Version++
2021-12-01 17:03:00 +01:00
f0ecfbbab2
Tests: TestMatrix should only be used internally by sdk tests
2021-11-30 17:22:50 +01:00
3d31ba963d
Merge branch 'develop' into feature/fga/timeline_chunks_rework
2021-11-30 16:58:55 +01:00
51f46d199f
Tests: clean after review
2021-11-30 14:15:18 +01:00
cdb5376a19
Adding support for voice drafts
...
- introduces a new Voice draft and sender mode type
- initializes the voice recorder with a previously recorded file (the draft)
- renames RecordingUiStates to map to their actual UI states
2021-11-30 10:22:25 +00:00
30fe564a2c
Throw clear error when MatrixWorkerFactory is not set up on worker configuration
2021-11-29 19:26:55 +01:00
c8abe21ec0
Apply presence to all DMs with a user
...
Change-Id: I7193cb5975a6a2e20055f5f99f8fa116b8dc1470
2021-11-27 15:33:21 +01:00
cfaa7268a8
Tests: clean up a bit
2021-11-26 18:17:28 +01:00
ccdeeeab4c
Tests: fix timeline tests + some small others
2021-11-26 18:16:27 +01:00
8a8fa066f9
Bump libphonenumber from 8.12.37 to 8.12.38
...
Bumps [libphonenumber](https://github.com/google/libphonenumber ) from 8.12.37 to 8.12.38.
- [Release notes](https://github.com/google/libphonenumber/releases )
- [Changelog](https://github.com/google/libphonenumber/blob/master/making-metadata-changes.md )
- [Commits](https://github.com/google/libphonenumber/compare/v8.12.37...v8.12.38 )
---
updated-dependencies:
- dependency-name: com.googlecode.libphonenumber:libphonenumber
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
2021-11-25 23:06:20 +00:00
1d9da6c7d3
Tests: do some clean-up and fix bunch of them
2021-11-25 12:46:16 +01:00
32441eb81b
Merge pull request #4553 from vector-im/feature/adm/stricter-voice-file-deletion
...
Unable to upload .ogg to rooms
2021-11-24 13:55:31 +01:00
31bd4fd2d0
avoiding inferred voice type check via waveform in favour of using the attachment type
2021-11-24 11:38:28 +00:00
5ee379e10d
including a new voice message attachment type
...
- allows for us to explictly delete voice message after uploading rather than inferring that audio message with the .ogg extension are voice messages which could have caused us to delete users files
2021-11-24 10:21:12 +00:00
bd423db98a
Merge pull request #4548 from vector-im/feature/adm/sealed-class-cleanup
...
Voice related sealed class cleanup
2021-11-24 11:10:10 +01:00
70d25653c8
removing unused base property from the sealed classes and switching to interfaces
2021-11-23 18:21:42 +00:00
d1102f7be4
fixing wrong cased data class names
2021-11-23 18:19:33 +00:00
bdf9402685
only deleting voice files if they were successfully uploading
...
- fixes flaky networks losing the voice file and being unable to retry
2021-11-23 17:45:10 +00:00
c72dd5eec6
Merge pull request #4507 from vector-im/feature/bca/crypto_better_logs
...
Improve crypto log to debug UISI
2021-11-23 15:35:28 +01:00
31eeb0674b
cleaning
2021-11-23 13:38:45 +01:00
77454c8ae9
code review
2021-11-23 11:58:01 +01:00
61faf71751
Merge pull request #4543 from vector-im/dependabot/gradle/com.squareup.okhttp3-okhttp-bom-4.9.3
...
Bump okhttp-bom from 4.9.2 to 4.9.3
2021-11-23 10:05:21 +01:00
6a7bc5cef8
Bump okhttp-bom from 4.9.2 to 4.9.3
...
Bumps [okhttp-bom](https://github.com/square/okhttp ) from 4.9.2 to 4.9.3.
- [Release notes](https://github.com/square/okhttp/releases )
- [Changelog](https://github.com/square/okhttp/blob/master/CHANGELOG.md )
- [Commits](https://github.com/square/okhttp/compare/parent-4.9.2...parent-4.9.3 )
---
updated-dependencies:
- dependency-name: com.squareup.okhttp3:okhttp-bom
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
2021-11-22 23:10:17 +00:00
d4db706c06
Bump robolectric from 4.7.1 to 4.7.2
...
Bumps [robolectric](https://github.com/robolectric/robolectric ) from 4.7.1 to 4.7.2.
- [Release notes](https://github.com/robolectric/robolectric/releases )
- [Commits](https://github.com/robolectric/robolectric/compare/robolectric-4.7.1...robolectric-4.7.2 )
---
updated-dependencies:
- dependency-name: org.robolectric:robolectric
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
2021-11-22 23:09:42 +00:00
2b3de840f1
Force markdown parse on replies and update quote to use markdown parser.
2021-11-22 17:02:12 +00:00
69720ffdd3
Android tests: introduce TestBackgroundDetectionObserver so sync is not cancelled while testing + fix small warnings
2021-11-19 17:18:39 +01:00
67975e0c83
Matrix: introduce MatrixWorkerFactory to remove internal usage of Matrix.getInstance
2021-11-19 17:15:39 +01:00
6efe9b82f4
Bump robolectric from 4.7 to 4.7.1
...
Bumps [robolectric](https://github.com/robolectric/robolectric ) from 4.7 to 4.7.1.
- [Release notes](https://github.com/robolectric/robolectric/releases )
- [Commits](https://github.com/robolectric/robolectric/compare/robolectric-4.7...robolectric-4.7.1 )
---
updated-dependencies:
- dependency-name: org.robolectric:robolectric
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
2021-11-18 23:07:04 +00:00
feda53bfb7
Improve crypto log to debug UISI
2021-11-18 15:39:13 +01:00
e562d7684a
Timeline: re-add usage of TimelineSettings
2021-11-18 11:03:13 +01:00
e98dd2e663
Merge pull request #4396 from vector-im/feature/aris/thread_aware
...
Feature/aris/thread aware
2021-11-18 10:16:56 +01:00
c03c6867f7
Merge branch 'merge-v1.3.8' into sc
...
Change-Id: If000613462f3cd3b73c8de24f456dccc16fcde38
Conflicts:
vector/src/main/java/im/vector/app/features/home/UnreadMessagesSharedViewModel.kt
vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
2021-11-17 20:26:27 +01:00
d9a5991559
Merge tag 'v1.3.8' into HEAD
...
Change-Id: If3e3927755638ee38d8817f8504f09b0df14f309
Conflicts:
dependencies.gradle
vector/src/fdroid/AndroidManifest.xml
vector/src/gplay/AndroidManifest.xml
vector/src/gplay/java/im/vector/app/gplay/push/fcm/VectorFirebaseMessagingService.kt
vector/src/main/AndroidManifest.xml
vector/src/main/java/im/vector/app/features/home/HomeActivity.kt
vector/src/main/java/im/vector/app/features/home/UnreadMessagesSharedViewModel.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/composer/ComposerEditText.kt
vector/src/main/java/im/vector/app/features/home/room/list/RoomListFragment.kt
2021-11-17 20:17:45 +01:00
c5f48fa4d2
Merge tag 'v1.3.7' into sc
...
Change-Id: Id73c834c10e11ccd46d7d2adc8328eb95d051941
Conflicts:
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/database/model/RoomSummaryEntity.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/VideoCompressor.kt
vector/build.gradle
vector/src/fdroid/AndroidManifest.xml
vector/src/gplay/java/im/vector/app/gplay/features/settings/troubleshoot/TestFirebaseToken.kt
vector/src/gplay/java/im/vector/app/push/fcm/FcmHelper.kt
vector/src/main/java/im/vector/app/VectorApplication.kt
vector/src/main/java/im/vector/app/core/pushers/VectorMessagingReceiver.kt
vector/src/main/java/im/vector/app/core/receiver/OnApplicationUpgradeOrRebootReceiver.kt
vector/src/main/java/im/vector/app/features/home/HomeActivity.kt
vector/src/main/java/im/vector/app/features/notifications/NotificationDrawerManager.kt
vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileActivity.kt
vector/src/main/java/im/vector/app/features/settings/VectorSettingsBaseFragment.kt
2021-11-17 19:01:22 +01:00
8015ffee42
PR remrarks
2021-11-17 19:56:06 +02:00
a8f6efd5e8
Version++
2021-11-17 16:07:07 +01:00
9972dbc278
Use RealmConfiguration instead of Monarchy
2021-11-17 16:54:03 +02:00
a5518e90ae
Merge pull request #4485 from vector-im/feature/bma/small_cleanup
...
Small cleanup after content scanner code has been merged
2021-11-17 15:08:07 +01:00
d463500998
Remove unused import
2021-11-17 14:48:10 +02:00
88656ce80b
Use GetEventTask instead of session from the ThreadAwarenessHandler
2021-11-17 14:14:21 +02:00
c0af8214a6
Improve and use MatrixUrls
2021-11-17 11:27:59 +01:00
0fd29d763c
Markdown and sploiler in roomlist + spoiler in notifications ( #4483 )
...
Render markdown in room list and make notifications spoiler aware, per MSC3124
Reorder when case to put the most common on top
Co-authored-by: Onuray Sahin <onurays@element.io>
Co-authored-by: Wasabi\preston <1337paf92@gmail.com>
2021-11-17 10:21:48 +00:00
adea1db87a
Remove useless `?`
2021-11-17 11:19:59 +01:00
855b672f48
Add content scanner service ( #4392 )
...
* Add content scanner APIs
* Move to content scanner matrix SDK to FOSS
* Update file service
* Refactoring
* Replace matrix callbacks by coroutines
* Fix lint errors
* Add changelog
Co-authored-by: yostyle <yoanp@element.io>
2021-11-17 11:18:20 +01:00
10a460bf0c
Sign out crash - Realm configuration mismatch ( #4480 )
...
Dispatching session events to a specified session instance instead of always querying the session manager
- fixes the close session flow causing the session to be recreated
2021-11-17 10:39:46 +01:00
3d27e21683
Merge branch 'develop' into feature/fga/timeline_chunks_rework
2021-11-16 18:34:38 +01:00
8c0b2a6704
Timeline: fix double link issue when server is messed up...
2021-11-16 18:14:11 +01:00
be3aafeef2
Merge pull request #4433 from vector-im/feature/bma/android12
...
Android12
2021-11-16 13:27:33 +01:00
35e2a1083b
Merge pull request #4360 from vector-im/feature/ons/poll
...
Poll Feature - Create
2021-11-15 14:05:40 +01:00
df60b0c2b7
Merge pull request #4430 from vector-im/feature/adm/feature-notification-images
...
Notification images
2021-11-15 12:46:51 +01:00
fb8b720a3b
Add comment to run on Android 12
2021-11-15 12:25:42 +01:00
0a9845af30
@OnLifecycleEvent is deprecated, use DefaultLifecycleObserver instead
2021-11-15 12:24:48 +01:00
9429b039de
androidx.lifecycle:lifecycle-common-java8 -> androidx.lifecycle:lifecycle-common
...
https://developer.android.com/jetpack/androidx/releases/lifecycle#2.4.0
2021-11-15 12:24:48 +01:00
a1630b5546
androidx.lifecycle:lifecycle-extensions is deprecated
...
See https://developer.android.com/jetpack/androidx/releases/lifecycle#declaring_dependencies
2021-11-15 12:24:48 +01:00
3b469921a6
Bump robolectric from 4.6.1 to 4.7
...
Bumps [robolectric](https://github.com/robolectric/robolectric ) from 4.6.1 to 4.7.
- [Release notes](https://github.com/robolectric/robolectric/releases )
- [Commits](https://github.com/robolectric/robolectric/compare/robolectric-4.6.1...robolectric-4.7 )
---
updated-dependencies:
- dependency-name: org.robolectric:robolectric
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
2021-11-15 10:03:30 +00:00
afe05eddc2
Merge pull request #4456 from vector-im/dependabot/gradle/com.googlecode.libphonenumber-libphonenumber-8.12.37
...
Bump libphonenumber from 8.12.36 to 8.12.37
2021-11-15 11:02:07 +01:00
ad48223273
Bump libphonenumber from 8.12.36 to 8.12.37
...
Bumps [libphonenumber](https://github.com/google/libphonenumber ) from 8.12.36 to 8.12.37.
- [Release notes](https://github.com/google/libphonenumber/releases )
- [Changelog](https://github.com/google/libphonenumber/blob/master/making-metadata-changes.md )
- [Commits](https://github.com/google/libphonenumber/compare/v8.12.36...v8.12.37 )
---
updated-dependencies:
- dependency-name: com.googlecode.libphonenumber:libphonenumber
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
2021-11-11 23:08:34 +00:00
89db5a6ecd
Lint fixes.
2021-11-11 11:52:01 +03:00
6ddf3f6e5a
Fix lint errors
2021-11-10 22:31:23 +01:00
7a78bc6866
Replace matrix callbacks by coroutines
2021-11-10 21:57:45 +01:00
98ae9d0e8a
Refactoring
2021-11-10 21:57:44 +01:00
016f3faeea
Update file service
2021-11-10 21:57:44 +01:00
0ad66446e7
Move to content scanner matrix SDK to FOSS
2021-11-10 21:57:44 +01:00
80a42d0a55
Add content scanner APIs
2021-11-10 21:57:44 +01:00
52df50a686
Timeline: continue trying to make Read marker/receipts working
2021-11-10 19:17:34 +01:00
b304ef82fc
add comments
2021-11-10 17:41:06 +01:00
5b76d4b682
Fix fallback otk support
2021-11-10 16:55:34 +01:00
c3a6e3bd9b
Rework counting of unread chats
...
Avoid counting chats twice that are actually unread and additionally
manually marked as unread.
Also fix some corner cases.
Change-Id: I0bc8a3bcdb8b658618b627648eec34305e66082b
2021-11-09 12:34:54 +01:00
SpiritCroc
Onuray Sahin
dependabot[bot]
Adam Brown
ganfra
Florian Renaud
David Langley
Valere
Benoit Marty
Benoit Marty
ariskotsomitopoulos
yostyle