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

Rebase against Element Android v1.6.22 #1109

Draft
wants to merge 37 commits into
base: develop
Choose a base branch
from
Draft

Rebase against Element Android v1.6.22 #1109

wants to merge 37 commits into from

Commits on Jul 25, 2024

  1. Merge branch 'release/1.6.20' into develop

    @ganfra
    ganfra committed Jul 25, 2024
    Configuration menu
    Copy the full SHA
    7bdadaa View commit details
    Browse the repository at this point in the history

  2. version++

    @ganfra
    ganfra committed Jul 25, 2024
    Configuration menu
    Copy the full SHA
    04c3ba9 View commit details
    Browse the repository at this point in the history

Commits on Aug 12, 2024

  1. Fix wrong PR number in changelog.

    @bmarty
    bmarty authored Aug 12, 2024
    Configuration menu
    Copy the full SHA
    9c53a09 View commit details
    Browse the repository at this point in the history

Commits on Aug 13, 2024

  1. Fix Weblate conflict.

    @bmarty
    bmarty committed Aug 13, 2024
    Configuration menu
    Copy the full SHA
    e1ccad5 View commit details
    Browse the repository at this point in the history

Commits on Aug 26, 2024

  1. Remove login with QR code feature.

    @bmarty
    bmarty committed Aug 26, 2024
    Configuration menu
    Copy the full SHA
    fb10bd5 View commit details
    Browse the repository at this point in the history

  2. Changelog.

    @bmarty
    bmarty committed Aug 26, 2024
    Configuration menu
    Copy the full SHA
    3ab588f View commit details
    Browse the repository at this point in the history

  3. Fix layout issue.

    @bmarty
    bmarty committed Aug 26, 2024
    Configuration menu
    Copy the full SHA
    0baf670 View commit details
    Browse the repository at this point in the history

  4. More cleanup

    @bmarty
    bmarty committed Aug 26, 2024
    Configuration menu
    Copy the full SHA
    91d9668 View commit details
    Browse the repository at this point in the history

Commits on Aug 27, 2024

  1. Merge pull request #8890 from element-hq/feature/bma/removeLegacyQrCo… 

    …deLogin

Remove legacy qr code login
    @bmarty
    bmarty authored Aug 27, 2024
    Configuration menu
    Copy the full SHA
    76616b1 View commit details
    Browse the repository at this point in the history

Commits on Sep 10, 2024

  1. Add unit test on ScanEncryptorUtils.

    @bmarty
    bmarty committed Sep 10, 2024
    Configuration menu
    Copy the full SHA
    797a4f9 View commit details
    Browse the repository at this point in the history

  2. Add test when a server public key is provided.

    @bmarty
    bmarty committed Sep 10, 2024
    Configuration menu
    Copy the full SHA
    9585262 View commit details
    Browse the repository at this point in the history

Commits on Sep 11, 2024

  1. Merge pull request #8900 from element-hq/feature/bma/testScanEncrypto… 

    …rUtils

Add unit test on ScanEncryptorUtils.
    @bmarty
    bmarty authored Sep 11, 2024
    Configuration menu
    Copy the full SHA
    6a8e978 View commit details
    Browse the repository at this point in the history

  2. Remove dependency on libolm - WIP

    @bmarty
    bmarty committed Sep 11, 2024
    Configuration menu
    Copy the full SHA
    5908cd5 View commit details
    Browse the repository at this point in the history

  3. Better cleanup of the Crypto database.

    @bmarty
    bmarty committed Sep 11, 2024
    Configuration menu
    Copy the full SHA
    15c86f3 View commit details
    Browse the repository at this point in the history

  4. Remove old unused algorithm m.secret_storage.v1.curve25519-aes-sha2 

    https://github.com/uhoreg/matrix-doc/blob/symmetric_ssss/proposals/2472-symmetric-ssss.md
"The m.secret_storage.v1.curve25519-aes-sha2 method proposed in MSC1946 is removed."
    @bmarty
    bmarty committed Sep 11, 2024
    Configuration menu
    Copy the full SHA
    637a227 View commit details
    Browse the repository at this point in the history

  5. Remove todo and cleanup

    @bmarty
    bmarty committed Sep 11, 2024
    Configuration menu
    Copy the full SHA
    fc68f1c View commit details
    Browse the repository at this point in the history

  6. Encrypt data for the content scanner using PkEncryption from the Rust… 

    … SDK.
    @bmarty
    bmarty committed Sep 11, 2024
    Configuration menu
    Copy the full SHA
    355621b View commit details
    Browse the repository at this point in the history

  7. New SDK: fix API break.

    @bmarty
    bmarty committed Sep 11, 2024
    Configuration menu
    Copy the full SHA
    8056285 View commit details
    Browse the repository at this point in the history

Commits on Sep 12, 2024

  1. ScanEncryptorUtils.getDownloadBodyAndEncryptIfNeeded can throw, ensur… 

    …e it will not crash the application.
    @bmarty
    bmarty committed Sep 12, 2024
    Configuration menu
    Copy the full SHA
    14a52d4 View commit details
    Browse the repository at this point in the history

  2. Use local val and more compact code.

    @bmarty
    bmarty committed Sep 12, 2024
    Configuration menu
    Copy the full SHA
    9dcb7c8 View commit details
    Browse the repository at this point in the history

  3. Fix quality issues.

    @bmarty
    bmarty committed Sep 12, 2024
    Configuration menu
    Copy the full SHA
    51c20b4 View commit details
    Browse the repository at this point in the history

Commits on Sep 16, 2024

  1. Fix wrong sha256 conversion and add unit test.

    @bmarty
    bmarty committed Sep 16, 2024
    Configuration menu
    Copy the full SHA
    f726d16 View commit details
    Browse the repository at this point in the history

  2. Update strings.xml 

    "See and managed addresses" typo fixed.
    @Erquint
    Erquint authored Sep 16, 2024
    Configuration menu
    Copy the full SHA
    2ed0b4f View commit details
    Browse the repository at this point in the history

Commits on Sep 18, 2024

  1. Use Jitsi SDK 10.2.0

    @bmarty
    bmarty committed Sep 18, 2024
    Configuration menu
    Copy the full SHA
    4aab1ad View commit details
    Browse the repository at this point in the history

  2. Fix typo in script name.

    @bmarty
    bmarty committed Sep 18, 2024
    Configuration menu
    Copy the full SHA
    da94bb8 View commit details
    Browse the repository at this point in the history

Commits on Sep 19, 2024

  1. Merge pull request #8911 from element-hq/feature/bma/jitsi-10.2.0 

    Upgrade Jitsi to 10.2.0
    @bmarty
    bmarty authored Sep 19, 2024
    Configuration menu
    Copy the full SHA
    04a49e9 View commit details
    Browse the repository at this point in the history

Commits on Sep 20, 2024

  1. Bump org.matrix.rustcomponents:crypto-android from 0.4.1 to 0.4.3 

    Bumps [org.matrix.rustcomponents:crypto-android](https://github.com/matrix-org/matrix-rust-components-kotlin) from 0.4.1 to 0.4.3.
- [Release notes](https://github.com/matrix-org/matrix-rust-components-kotlin/releases)
- [Commits](matrix-org/matrix-rust-components-kotlin@crypto-v0.4.1...crypto-v0.4.3)

---
updated-dependencies:
- dependency-name: org.matrix.rustcomponents:crypto-android
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
    @dependabot @bmarty
    dependabot[bot] authored and bmarty committed Sep 20, 2024
    Configuration menu
    Copy the full SHA
    9efb692 View commit details
    Browse the repository at this point in the history

  2. Fix copyright issue.

    @bmarty
    bmarty committed Sep 20, 2024
    Configuration menu
    Copy the full SHA
    f7195a8 View commit details
    Browse the repository at this point in the history

Commits on Sep 23, 2024

  1. use pkEncryption, to properly close it.

    @bmarty
    bmarty committed Sep 23, 2024
    Configuration menu
    Copy the full SHA
    e89bec4 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #8905 from Erquint/patch-1 

    Update strings.xml to fix the "see and managed addresses[…]" typo.
    @bmarty
    bmarty authored Sep 23, 2024
    Configuration menu
    Copy the full SHA
    1ac5090 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #8901 from element-hq/feature/bma/removeLibolm 

    Remove dependency on libolm
    @bmarty
    bmarty authored Sep 23, 2024
    Configuration menu
    Copy the full SHA
    ac01523 View commit details
    Browse the repository at this point in the history

  4. Changelog for version 1.6.22

    @bmarty
    bmarty committed Sep 23, 2024
    Configuration menu
    Copy the full SHA
    af2cefe View commit details
    Browse the repository at this point in the history

  5. Adding fastlane file for version 1.6.22

    @bmarty
    bmarty committed Sep 23, 2024
    Configuration menu
    Copy the full SHA
    cfedc00 View commit details
    Browse the repository at this point in the history

  6. Merge branch 'release/1.6.22' into main

    @bmarty
    bmarty committed Sep 23, 2024
    Configuration menu
    Copy the full SHA
    9a4602b View commit details
    Browse the repository at this point in the history

Commits on Sep 26, 2024

  1. Merge element-hq/element-android v1.6.22 into element-rebase

    @yostyle
    yostyle committed Sep 26, 2024
    Configuration menu
    Copy the full SHA
    c8ab88b View commit details
    Browse the repository at this point in the history

  2. Fix conflicts

    @yostyle
    yostyle committed Sep 26, 2024
    Configuration menu
    Copy the full SHA
    1b813f5 View commit details
    Browse the repository at this point in the history

Commits on Sep 27, 2024

  1. Fix Element FS

    @yostyle
    yostyle committed Sep 27, 2024
    Configuration menu
    Copy the full SHA
    fc3943b View commit details
    Browse the repository at this point in the history