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.

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

Rebase against Element Android v1.6.12 #1011

Merged
merged 35 commits into from
Feb 20, 2024
Merged

Conversation

yostyle
Copy link
Contributor

@yostyle yostyle commented Feb 20, 2024

Type of change

  • Feature
  • Bugfix
  • Technical
  • Other :

Content

Motivation and context

Screenshots / GIFs

Tests

  • Step 1
  • Step 2
  • Step ...

Tested devices

  • Physical
  • Emulator
  • OS version(s):

Checklist

bmarty and others added 30 commits January 9, 2024 12:16
Bumps [io.element.android:wysiwyg](https://github.com/matrix-org/matrix-wysiwyg) from 2.24.0 to 2.25.0.
- [Changelog](https://github.com/matrix-org/matrix-rich-text-editor/blob/main/CHANGELOG.md)
- [Commits](matrix-org/matrix-rich-text-editor@2.24.0...2.25.0)

---
updated-dependencies:
- dependency-name: io.element.android:wysiwyg
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>
Point to Element security@ address and policy
Fix release script which download artifact
….android-wysiwyg-2.25.0

Bump io.element.android:wysiwyg from 2.24.0 to 2.25.0
…pted content when the content is not decrypted.
This may fix issue of Event not decrypted if the key is coming late for the last Event displayed in the Room list.
Bumps [io.element.android:wysiwyg](https://github.com/matrix-org/matrix-wysiwyg) from 2.25.0 to 2.27.0.
- [Changelog](https://github.com/matrix-org/matrix-rich-text-editor/blob/main/CHANGELOG.md)
- [Commits](matrix-org/matrix-rich-text-editor@2.25.0...2.27.0)

---
updated-dependencies:
- dependency-name: io.element.android:wysiwyg
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>
….android-wysiwyg-2.27.0

Bump io.element.android:wysiwyg from 2.25.0 to 2.27.0
[Crypto] Improve Event.getClearContent() and fix assignement issue.
…screen

Make 'sign in' flow more important in the initial screen
In particular, use the Glide cache, and ensure that if an error occurs and later the avatar can be retrieved, the cache will be replaced.
Also limit cache size to 32.
Also use UserItem as a key, instead of just the userId, so that if displayName or avatarUrl change, there will be not cache hit.
Bumps [io.element.android:wysiwyg](https://github.com/matrix-org/matrix-wysiwyg) from 2.27.0 to 2.29.0.
- [Changelog](https://github.com/matrix-org/matrix-rich-text-editor/blob/main/CHANGELOG.md)
- [Commits](matrix-org/matrix-rich-text-editor@2.27.0...2.29.0)

---
updated-dependencies:
- dependency-name: io.element.android:wysiwyg
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>
….android-wysiwyg-2.29.0

Bump io.element.android:wysiwyg from 2.27.0 to 2.29.0
@yostyle yostyle self-assigned this Feb 20, 2024
@yostyle yostyle changed the title Rebase against on element android 1.6.12 Rebase against Element Android v1.6.12 Feb 20, 2024
@tchap-danger-bot
Copy link

Warnings
⚠️

Please add a changelog. See instructions here

⚠️ You seem to have made changes to views. Please consider adding screenshots.

Generated by 🚫 dangerJS against 2ed9000

@tchap-danger-bot
Copy link

Warnings
⚠️ You seem to have made changes to views. Please consider adding screenshots.

Generated by 🚫 dangerJS against aa1701c

@yostyle yostyle force-pushed the rebase/element-android-1.6.12 branch from aa1701c to 7dfcf75 Compare February 20, 2024 13:58
@yostyle yostyle merged commit e6c0b60 into develop Feb 20, 2024
14 of 15 checks passed
@yostyle yostyle deleted the rebase/element-android-1.6.12 branch February 20, 2024 13:59
@tchap-danger-bot
Copy link

Warnings
⚠️ You seem to have made changes to views. Please consider adding screenshots.
⚠️ Please add a reviewer to your PR.

Generated by 🚫 dangerJS against 7dfcf75

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants