Commit graph

14168 commits

Author SHA1 Message Date
SpiritCroc
cd45248f40 Fix modifying the wrong events in TimelineChunk
I was observing cases where builtEvents[modificationIndex] was not
having the same eventId as the udpatedEntity in handleDatabaseChangeSet.

In particular, I observed both cases that
- there was no item in the list yet with the same eventId as the updated
  one
- there was an item with the same eventId already in the list, but at a
  different position.

Whenever this happened, the timeline would render missing, duplicated,
or swapped messages in the timeline.

Instead of relying on the modificationIndex to be the same for both the
change set and builtEvents, look up the proper index by eventId.
2022-03-13 08:19:47 +01:00
Michael Kaye
acfeb7ff65
Merge pull request #5523 from vector-im/michaelk/concurrency_issue
Use different tags for unit tests and android test compilation.
2022-03-11 17:47:24 +00:00
Michael Kaye
9a532fc47f Use different tags for unit tests and android test compilation.
Otherwise we will cancel one in favour of the other.
2022-03-11 16:47:40 +00:00
Benoit Marty
c89554c3f6
Merge pull request #5443 from vector-im/task/eric/stable-hierarchy-endpoint
Changes room hierarchy endpoint to stable
2022-03-11 17:05:13 +01:00
Benoit Marty
c3ac054634
Merge pull request #5518 from vector-im/bmarty-patch-1
Add space between icon and name
2022-03-11 16:47:59 +01:00
Benoit Marty
97f30ef7c1
Merge pull request #5520 from vector-im/feature/bma/fix_test_warnings
Fix all warnings in file E2eeSanityTests.kt
2022-03-11 16:47:25 +01:00
Benoit Marty
fa104adefc Fix all warnings in file E2eeSanityTests.kt 2022-03-11 15:35:21 +01:00
Benoit Marty
02ea1c0e7c
Add space between icon and name
Also remove extra space for the text_template
2022-03-11 14:39:38 +01:00
Benoit Marty
25cfc7e05f
Merge pull request #5506 from vector-im/michaelk/build_tests_on_pr
Compile tests on PR, to ensure we don't break the build when merging. Alert if we merge and the build fails.
2022-03-11 10:15:04 +01:00
Benoit Marty
d0a24afa5a
Merge pull request #5510 from vector-im/dependabot/gradle/com.googlecode.libphonenumber-libphonenumber-8.12.45
Bump libphonenumber from 8.12.44 to 8.12.45
2022-03-11 09:47:26 +01:00
Michael Kaye
9a112bb010 Remove confetti from build failed message.
(there will be red icons if the build has failed in the body anyway)
2022-03-11 08:45:27 +00:00
Michael Kaye
400a47c39b Only run one gradlew build for all tests, do not split by project 2022-03-11 08:45:04 +00:00
dependabot[bot]
2d5638baaf
Bump libphonenumber from 8.12.44 to 8.12.45
Bumps [libphonenumber](https://github.com/google/libphonenumber) from 8.12.44 to 8.12.45.
- [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.44...v8.12.45)

---
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>
2022-03-10 23:09:19 +00:00
ericdecanini
7226864cc9 Improves code formatting in ResolveSpaceInfoTask 2022-03-10 21:41:17 +01:00
Benoit Marty
eb7eb1aac8
Merge pull request #5505 from vector-im/feature/bma/must_be_tinted
Add colors for shield vector drawable
2022-03-10 20:39:29 +01:00
Michael Kaye
c57d22a72c Additionally notify the matrix channel if these tests fail when run
after merge to develop or main.
2022-03-10 16:41:00 +00:00
Benoit Marty
26617988f2 Add colors for shield vector drawable 2022-03-10 17:15:19 +01:00
Benoit Marty
becdd1ce29 Fix test compilation after method renaming
Also rename in the comment
2022-03-10 17:01:45 +01:00
Michael Kaye
23f7f72e38 Compile tests on PR, to ensure we don't break the build when merging.
This was accidentally committed to develop and reverted there.
2022-03-10 15:58:00 +00:00
Michael Kaye
ed7c65d8d8 Revert "Compile tests on PR, to ensure we don't break the build when merging."
This reverts commit 9e5ff1785a.
2022-03-10 15:57:05 +00:00
Michael Kaye
9e5ff1785a Compile tests on PR, to ensure we don't break the build when merging. 2022-03-10 15:50:02 +00:00
Benoit Marty
66f76fbea3
Merge pull request #5450 from SpiritCroc/fix-5448
Fix missing messages when forward paging with chunks > 50 messages
2022-03-10 15:08:58 +01:00
Benoit Marty
dfc440b904
Merge pull request #5502 from vector-im/cgizard/ISSSUE-5501
Use ColorPrimary for attachmentGalleryButton tint
2022-03-10 15:02:08 +01:00
ericdecanini
a5af4783cc Renames mapToSpaceChildInfoList to mapSpaceChildren in DefaultSpaceService 2022-03-10 14:41:44 +01:00
Claire G
8f0d6a1adc use colorPrimary for tint 2022-03-10 14:30:15 +01:00
Benoit Marty
551b827753
Merge pull request #5384 from p1gp1g/bubble-space
Add padding before first own message
2022-03-10 14:09:23 +01:00
Michael Kaye
621df9d1b1
Merge pull request #5498 from vector-im/michaelk/setup-matrix-synapse
Swap to using github action to configure synapse server in CI builds
2022-03-10 12:50:50 +00:00
Benoit Marty
c339e10c07
Merge pull request #5436 from vector-im/feature/nfe/space_highlight
change selected space highlight
2022-03-10 13:28:08 +01:00
Benoit Marty
d83d5f9828
Merge pull request #5467 from vector-im/feature/bma/unused_resources_all
Remove unused resources
2022-03-10 13:03:27 +01:00
Michael Kaye
70fbcec093 Update to latest setup-matrix-synapse 2022-03-10 11:31:44 +00:00
ericdecanini
a891f59397 Replaces lateinit var with passing params 2022-03-10 12:02:25 +01:00
Benoit Marty
fbc3b15df4
Merge pull request #5492 from vector-im/gradlew-update-7.4.1
Update Gradle Wrapper from 7.4 to 7.4.1
2022-03-10 11:16:39 +01:00
Benoit Marty
ce4ad8819a
Merge pull request #5380 from vector-im/feature/bca/crypto_fix_rolling_uisi
Refactoring for safer olm and megolm session usage
2022-03-10 11:13:07 +01:00
Benoit Marty
0122d8f933 Make comment about ignoring UnusedResources more valuable 2022-03-10 10:23:18 +01:00
gradle-update-robot
89db6a065d Update Gradle Wrapper from 7.4 to 7.4.1.
Signed-off-by: gradle-update-robot <gradle-update-robot@regolo.cc>
2022-03-10 00:17:17 +00:00
Adam Brown
d3fc3791bc Merge branch 'main' into develop 2022-03-09 21:33:16 +00:00
Adam Brown
9e8067dd19
Merge pull request #5484 from vector-im/feature/aris/fix_realm_crash_1_4_4
Fix realm crash on v1.4.4
2022-03-09 18:55:12 +00:00
Michael Kaye
e9fe4630f1 Swap to using github action to configure server 2022-03-09 18:26:37 +00:00
ariskotsomitopoulos
92c1bc944d Fix realm crash on v1.4.4 2022-03-09 20:03:42 +02:00
ericdecanini
2f706d6fae Replaces children state event room id with space id 2022-03-09 18:42:35 +01:00
ericdecanini
f76f73f8ad Refactors DefaultSpaceService querySpaceChildren 2022-03-09 18:36:56 +01:00
Adam Brown
ecb49b3b27 Merge branch 'main' into develop 2022-03-09 16:13:15 +00:00
Adam Brown
60bc3b09b7 updating to version 1.4.6 in prep for next release cycle 2022-03-09 16:03:00 +00:00
Adam Brown
8c36bdb0e9 Merge branch 'release/v1.4.4' 2022-03-09 15:59:56 +00:00
ericdecanini
bbc6e8bbce Replaces caught Exception with HttpException 2022-03-09 16:41:18 +01:00
Maxime NATUREL
f12afe0ef0
Merge pull request #5411 from vector-im/feature/mna/PSF-735-sharing-options-view
#5395: Location sharing options view
2022-03-09 16:10:46 +01:00
Adam Brown
1bf718f856 appending 1.4.4 changelog 2022-03-09 14:57:13 +00:00
Benoit Marty
3f17cf595f Remove unused resources 2022-03-09 14:55:40 +01:00
Benoit Marty
7d78c8819c Ignore some other lint warnings 2022-03-09 14:40:59 +01:00
Adam Brown
57ffc56869
Merge pull request #5472 from vector-im/feature/aris/fix_5463_parcelising_reaction_crash
Fix reactions summary crash
2022-03-09 13:35:51 +00:00