Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

BER-395: Sync origin with upstream v0.27.13 #8

Merged
merged 96 commits into from
Sep 3, 2024
Merged

BER-395: Sync origin with upstream v0.27.13 #8

merged 96 commits into from
Sep 3, 2024

Conversation

denasescu
Copy link

Context

Why do we want/need it?

  • To keep origin up to date.

Relevant issues

Changes

What does it do?
In summary, what changes are made to the code?

  • Merged upstream (MatrixSDK v0.27.13)
  • Matrix adds accessToken to loading media, logic that we added some time ago. In this case I replaced our changes with Matrix changes (basically removing Modified by Nedap comments) because it's doing the same thing.
  • I added the tag nedap/0.1.4 to this branch to be able to test it in berichten-ios, but I will remove it and add it to ons_master once the branch is approved and merged.

Known problems

  • What problems do still arise or are anticipated?
  • Which part of the solution do you need help with?

Extra attention

  • What do I need to pay extra attention to as a reviewer?

Check-list

  • Acceptance criteria described in the issue are satisfied, or the bug(s) is/are fixed.
  • Documentation present (relevant information is properly documented).
  • Written tests for test suite (optional).
  • CHANGELOG updated.

Tested on devices

  • Minimum supported iOS version.
  • Maximum supported iOS version.
  • Lowest resolution supported.
  • Highest resolution supported.
  • Device with a notch.
  • Device without a notch.

Is this issue considered as Done?

  • It meets our DoD.

Velin92 and others added 30 commits January 9, 2024 12:32
@Velin92
Merge branch 'master' into develop
dc6adea
@Velin92
Prepare for new sprint
97f335b
@stefanceriu
version++
8da77d3
@stefanceriu
Merge pull request matrix-org#1844 from matrix-org/release/0.27.6/rel…
fffa162 
…ease

Release 0.27.6
@stefanceriu
finish version++
184b907
@stefanceriu
Merge branch 'release/0.27.6/master'
9e6a0da
@stefanceriu
Merge branch 'master' into develop
73b8b72
@stefanceriu
Prepare for new sprint
8639971
@BillCarsonFr
Add own device creation ts in crypto API
3a89ecf
@BillCarsonFr
deviceCreationTs should be readonly
e74124e
@BillCarsonFr
Merge pull request matrix-org#1848 from matrix-org/valere/expose_own_…
2b04dfd 
…device_creation_ts

Add own device creation ts in crypto API
@pixlwave
version++
e3bba83
@pixlwave
Merge pull request matrix-org#1850 from matrix-org/release/0.27.7/rel…
dc517e5 
…ease

Release 0.27.7
@pixlwave
finish version++
d79b661
@pixlwave
Merge branch 'release/0.27.7/master'
26764b1
@pixlwave
Merge branch 'master' into develop
a2486a8
@pixlwave
Prepare for new sprint
8ca9961
@NicolasBuquet
Sorting room list alphabetically case-insensitive. (matrix-org#1851)
30d49a6 
* Sort Room list alphabetically but caseInsensitive

Signed-off-by: Nicolas Buquet <nbuquet@buquet-net.com>

* Sort Room list alphabetically but caseInsensitive

Signed-off-by: Nicolas Buquet <nbuquet@buquet-net.com>

* Sort Room list alphabetically but caseInsensitive

Signed-off-by: Nicolas Buquet <nbuquet@buquet-net.com>

---------

Signed-off-by: Nicolas Buquet <nbuquet@buquet-net.com>
Co-authored-by: Nicolas Buquet <nbuquet@buquet-net.com>
@BillCarsonFr
Bump rust crypto sdk version 0.4.1
15fe3fb
@BillCarsonFr
update minimum ios platform 13.0
5402d6b
@BillCarsonFr
Update min deployment target to 13.0
8c7f224
@BillCarsonFr
Update osx min platform
be3ba92
@BillCarsonFr
update podfile lock
4fd8ff1
@BillCarsonFr
Fix test compilation
2e45e07
@BillCarsonFr
Add changelog
5b4382d
@BillCarsonFr
Merge pull request matrix-org#1853 from matrix-org/valere/bump_crypto…
0c3ab70 
…_sdk_version_0.4.1

Bump rust crypto sdk version 0.4.1
@BillCarsonFr
Invalidate crypto store cache when entering foreground
eb25429
@BillCarsonFr
Bump crypto sdk to 0.4.2
468247e
@BillCarsonFr
Fix warnings
eb3f5b4
@stefanceriu
Bump the Crypto version in the podspec as well
758e1af
Velin92 and others added 23 commits July 3, 2024 13:25
@Velin92
added the access token to the media loader request
4d22f5e
@Velin92
implementation based on the server version
1c1760f
@Velin92
access token fix
1083552 
and using the stable endpoint prefix
@Velin92
documentation
66f05d0
@Velin92
code improvement
389fdfa
@Velin92
Merge pull request matrix-org#1871 from matrix-org/mauroromito/conten…
1c4b3f5 
…t_auth_APIs
@Velin92
version++
6c4bb3d
@Velin92
Merge pull request matrix-org#1873 from matrix-org/release/0.27.12/re…
5537167 
…lease
@Velin92
finish version++
4f9bdfc
@Velin92
Merge branch 'release/0.27.12/master'
f2b4e6e
@Velin92
Merge branch 'master' into develop
4391d16
@Velin92
Prepare for new sprint
4a3d8f9
@richvdh
Add UTC timestamps to console logs
35e4b67
@richvdh
Create 7472.change
87b3688
@joshsimmons
Bring in line with foundation DCO (matrix-org#1875)
8c3fcc3 
* bring in line with foundation DCO

* add changelog entry

---------

Co-authored-by: Josh Simmons <git@josh.tel>
@stefanceriu
Update format to include the time, Z cannot be applied to NSLog times…
e83989f 
…tamps and doesn't do anything by itself
@stefanceriu
Merge pull request matrix-org#1874 from matrix-org/richvdh-patch-1
3fbf0d6 
Add UTC timestamps to console logs
@pixlwave
Use the codecov token. (matrix-org#1877)
e1d601a 
* Use the codecov token.

* Use codecov v4?
@pixlwave
version++
5fa780e
@pixlwave
Merge pull request matrix-org#1878 from matrix-org/release/0.27.13/re…
1ffda4a 
…lease

Release 0.27.13
@pixlwave
finish version++
1f3fa5a
@denasescu
Merge remote-tracking branch 'upstream/master' into feature/395_sync_…
0a3ebd5 
…origin_with_upstream_v0_27_13

# Conflicts:
#	CHANGES.md
#	MatrixSDK.podspec
#	MatrixSDK/MXSession.m
#	MatrixSDK/MatrixSDKVersion.m
#	MatrixSDK/Utils/Media/MXMediaLoader.h
#	MatrixSDK/Utils/Media/MXMediaLoader.m
#	MatrixSDK/Utils/Media/MXMediaManager.h
#	MatrixSDK/Utils/Media/MXMediaManager.m
#	Podfile.lock
@denasescu
BER-395: update changelog
d762f48
martias
martias reviewed Sep 2, 2024
View reviewed changes
Copy link
Collaborator

@martias martias left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It seemed to work in the app, but please double check that there is some Nedap code removed

MatrixSDK/Utils/Media/MXMediaLoader.m Show resolved Hide resolved
MatrixSDK/Utils/Media/MXMediaLoader.m Show resolved Hide resolved
MatrixSDK/Utils/Media/MXMediaLoader.m Show resolved Hide resolved
@denasescu
Copy link
Author

denasescu commented Sep 3, 2024 •
edited
Loading

It seemed to work in the app, but please double check that there is some Nedap code removed

@martias Thanks for the review! I was also surprised to see matrix now adding accessToken to the request, feature we implemented some time ago. So, I've removed our code and kept the matrix implementation since it is doing the same thing 😄

martias
martias approved these changes Sep 3, 2024
View reviewed changes
Copy link
Collaborator

@martias martias left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for the reply to my comments!, lets go green @denasescu

@denasescu denasescu merged commit d873f60 into ons_master Sep 3, 2024
@denasescu denasescu deleted the feature/395_sync_origin_with_upstream_v0_27_13 branch September 3, 2024 09:33
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@martias martias martias approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
10 participants
@denasescu @martias @Velin92 @stefanceriu @BillCarsonFr @pixlwave @NicolasBuquet @giomfo @richvdh @joshsimmons