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 1.6.8 #998

Merged
merged 71 commits into from
Dec 18, 2023
Merged

Rebase against element android 1.6.8 #998

merged 71 commits into from
Dec 18, 2023

Commits on Oct 2, 2023

  1. Sync Emojis

    @bmarty
    bmarty authored Oct 2, 2023
    Configuration menu
    Copy the full SHA
    1e00da6 View commit details
    Browse the repository at this point in the history

  2. Remove legacy crypto code

    @BillCarsonFr
    BillCarsonFr committed Oct 2, 2023
    Configuration menu
    Copy the full SHA
    dfbb312 View commit details
    Browse the repository at this point in the history

  3. Code quality kdocs

    @BillCarsonFr
    BillCarsonFr committed Oct 2, 2023
    Configuration menu
    Copy the full SHA
    df82eee View commit details
    Browse the repository at this point in the history

  4. code quality

    @BillCarsonFr
    BillCarsonFr committed Oct 2, 2023
    Configuration menu
    Copy the full SHA
    a6b127c View commit details
    Browse the repository at this point in the history

Commits on Oct 5, 2023

  1. version++

    ganfra committed Oct 5, 2023
    Configuration menu
    Copy the full SHA
    ecd1057 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'main' into develop

    ganfra committed Oct 5, 2023
    Configuration menu
    Copy the full SHA
    9e74afc View commit details
    Browse the repository at this point in the history

Commits on Oct 6, 2023

  1. Ensure the incoming call will not ring forever, in case the call is n… 

    …ot ended by another way (#8178)

Add a safe 2 minutes timer.
    @bmarty
    bmarty committed Oct 6, 2023
    Configuration menu
    Copy the full SHA
    52082a9 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #8660 from vector-im/feature/bma/stopInfiniteRingi… 

    …ngCall

Ensure the incoming call will not ring forever, in case the call is not ended by another way
    @bmarty
    bmarty authored Oct 6, 2023
    Configuration menu
    Copy the full SHA
    ebc81e2 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #8651 from vector-im/sync-emojis 

    Sync Emojis
    @bmarty
    bmarty authored Oct 6, 2023
    Configuration menu
    Copy the full SHA
    60940c0 View commit details
    Browse the repository at this point in the history

  4. Parse "io.element.disable_network_constraint" from .well-known file. 

    Migrate DB to 54.
    @bmarty
    bmarty committed Oct 6, 2023
    Configuration menu
    Copy the full SHA
    842aeb7 View commit details
    Browse the repository at this point in the history

Commits on Oct 9, 2023

  1. Do not apply network constraint if "io.element.disable_network_constr… 

    …aint" is set to true in .well-known file.
    @bmarty
    bmarty committed Oct 9, 2023
    Configuration menu
    Copy the full SHA
    2a5e233 View commit details
    Browse the repository at this point in the history

  2. Add a log when network constraint is disabled.

    @bmarty
    bmarty committed Oct 9, 2023
    Configuration menu
    Copy the full SHA
    f13a154 View commit details
    Browse the repository at this point in the history

Commits on Oct 10, 2023

  1. Changelog.

    @bmarty
    bmarty committed Oct 10, 2023
    Configuration menu
    Copy the full SHA
    747c81c View commit details
    Browse the repository at this point in the history

  2. Merge branch 'develop' into feature/bca/clean_up_legacy_crypto

    @BillCarsonFr
    BillCarsonFr committed Oct 10, 2023
    Configuration menu
    Copy the full SHA
    25ecd59 View commit details
    Browse the repository at this point in the history

  3. Fix Task :matrix-sdk-android:compileKotlinCryptoDebugUnitTestKotlin F… 

    …AILED

e: file:///home/runner/actions-runner/_work/element-android/element-android/matrix-sdk-android/src/test/java/org/matrix/android/sdk/internal/session/pushers/DefaultPushersServiceTest.kt:55:5 No value passed for parameter 'homeServerCapabilitiesDataSource'
    @giomfo
    giomfo committed Oct 10, 2023
    Configuration menu
    Copy the full SHA
    9732468 View commit details
    Browse the repository at this point in the history

  4. detekt fix

    @BillCarsonFr
    BillCarsonFr committed Oct 10, 2023
    Configuration menu
    Copy the full SHA
    e27916f View commit details
    Browse the repository at this point in the history

Commits on Oct 11, 2023

  1. property not in schema

    @BillCarsonFr
    BillCarsonFr committed Oct 11, 2023
    Configuration menu
    Copy the full SHA
    e8922a5 View commit details
    Browse the repository at this point in the history

  2. missing mock

    @BillCarsonFr
    BillCarsonFr committed Oct 11, 2023
    Configuration menu
    Copy the full SHA
    cd101f8 View commit details
    Browse the repository at this point in the history

  3. fix unit test

    @BillCarsonFr
    BillCarsonFr committed Oct 11, 2023
    Configuration menu
    Copy the full SHA
    5f68f98 View commit details
    Browse the repository at this point in the history

  4. dead code

    @BillCarsonFr
    BillCarsonFr committed Oct 11, 2023
    Configuration menu
    Copy the full SHA
    491f52a View commit details
    Browse the repository at this point in the history

  5. fix test compilation

    @BillCarsonFr
    BillCarsonFr committed Oct 11, 2023
    Configuration menu
    Copy the full SHA
    77a5767 View commit details
    Browse the repository at this point in the history

Commits on Oct 12, 2023

  1. fix ignored test

    @BillCarsonFr
    BillCarsonFr committed Oct 12, 2023
    Configuration menu
    Copy the full SHA
    d4c1416 View commit details
    Browse the repository at this point in the history

  2. Parse "io.element.disable_network_constraint" from login response, to… 

    … ensure that the config is retrieved.

The add pusher worker can be configured before the .well-known config is retrieved.
    @bmarty
    bmarty committed Oct 12, 2023
    Configuration menu
    Copy the full SHA
    d4c6a46 View commit details
    Browse the repository at this point in the history

Commits on Oct 13, 2023

  1. Cleanup

    @bmarty
    bmarty committed Oct 13, 2023
    Configuration menu
    Copy the full SHA
    7884b9d View commit details
    Browse the repository at this point in the history

  2. Ensure Boolean io.element.disable_network_constraint is explicitly … 

    …set in the .well-known file.
    @bmarty
    bmarty committed Oct 13, 2023
    Configuration menu
    Copy the full SHA
    64a7de5 View commit details
    Browse the repository at this point in the history

  3. disableNetworkConstraint is now nullable, so do not default the Boo… 

    …lean to false.
    @bmarty
    bmarty committed Oct 13, 2023
    Configuration menu
    Copy the full SHA
    8d95eb7 View commit details
    Browse the repository at this point in the history

  4. Update the NetworkConstraint handling in WorkManager config

    @giomfo
    giomfo committed Oct 13, 2023
    Configuration menu
    Copy the full SHA
    3aa5f34 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'feature/bma/noNetworkConstraint' of github.com:vector-i… 

    …m/element-android into feature/bma/noNetworkConstraint
    @giomfo
    giomfo committed Oct 13, 2023
    Configuration menu
    Copy the full SHA
    d26d28f View commit details
    Browse the repository at this point in the history

  6. fix Unexpected newlines

    @giomfo
    giomfo committed Oct 13, 2023
    Configuration menu
    Copy the full SHA
    57d224e View commit details
    Browse the repository at this point in the history

  7. Fix IDE warning

    @bmarty
    bmarty committed Oct 13, 2023
    Configuration menu
    Copy the full SHA
    fd07835 View commit details
    Browse the repository at this point in the history

  8. Use Matrix.org copyright.

    @bmarty
    bmarty committed Oct 13, 2023
    Configuration menu
    Copy the full SHA
    17e9bd2 View commit details
    Browse the repository at this point in the history

  9. Merge pull request #8662 from vector-im/feature/bma/noNetworkConstraint 

    Take into account well-known config to disable WorkManager network constraint
    @bmarty
    bmarty authored Oct 13, 2023
    Configuration menu
    Copy the full SHA
    8bfd5f7 View commit details
    Browse the repository at this point in the history

Commits on Nov 6, 2023

  1. Bump io.element.android:wysiwyg from 2.2.2 to 2.5.0 

    Bumps [io.element.android:wysiwyg](https://github.com/matrix-org/matrix-wysiwyg) from 2.2.2 to 2.5.0.
- [Changelog](https://github.com/matrix-org/matrix-rich-text-editor/blob/main/CHANGELOG.md)
- [Commits](matrix-org/matrix-rich-text-editor@2.2.2...2.5.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]>
    @dependabot @bmarty
    dependabot[bot] authored and bmarty committed Nov 6, 2023
    Configuration menu
    Copy the full SHA
    95070d3 View commit details
    Browse the repository at this point in the history

  2. Update to new mentions API

    @jonnyandrew @bmarty
    jonnyandrew authored and bmarty committed Nov 6, 2023
    Configuration menu
    Copy the full SHA
    6112082 View commit details
    Browse the repository at this point in the history

  3. Update to 2.6.0

    @jonnyandrew @bmarty
    jonnyandrew authored and bmarty committed Nov 6, 2023
    Configuration menu
    Copy the full SHA
    531d9f2 View commit details
    Browse the repository at this point in the history

  4. Fix compilation error

    @jonnyandrew @bmarty
    jonnyandrew authored and bmarty committed Nov 6, 2023
    Configuration menu
    Copy the full SHA
    26e2f4e View commit details
    Browse the repository at this point in the history

  5. Upgrade Wysiwyg library to 2.14.1

    @bmarty
    bmarty committed Nov 6, 2023
    Configuration menu
    Copy the full SHA
    8d8a5d3 View commit details
    Browse the repository at this point in the history

  6. Upgrade Mavericks library to 3.0.7 

    It fixes crash: java.lang.IllegalStateException: Flow invariant is violated
    @bmarty
    bmarty committed Nov 6, 2023
    Configuration menu
    Copy the full SHA
    4341cf8 View commit details
    Browse the repository at this point in the history

Commits on Nov 7, 2023

  1. Upgrade lint

    @bmarty
    bmarty committed Nov 7, 2023
    Configuration menu
    Copy the full SHA
    83084f6 View commit details
    Browse the repository at this point in the history

  2. Remove unused WebRTC dependency (#8658)

    @yostyle
    yostyle authored Nov 7, 2023
    Configuration menu
    Copy the full SHA
    b14338d View commit details
    Browse the repository at this point in the history

  3. Merge branch 'develop' into feature/bca/clean_up_legacy_crypto

    @bmarty
    bmarty authored Nov 7, 2023
    Configuration menu
    Copy the full SHA
    454ba7b View commit details
    Browse the repository at this point in the history

Commits on Nov 8, 2023

  1. Fix lint false positive

    @bmarty
    bmarty committed Nov 8, 2023
    Configuration menu
    Copy the full SHA
    2c75f41 View commit details
    Browse the repository at this point in the history

  2. Suppress lint warning. MenuBuilder is restricted.

    @bmarty
    bmarty committed Nov 8, 2023
    Configuration menu
    Copy the full SHA
    dd64107 View commit details
    Browse the repository at this point in the history

Commits on Nov 9, 2023

  1. Merge pull request #8607 from vector-im/dependabot/gradle/io.element.… 

    …android-wysiwyg-2.5.0

Bump io.element.android:wysiwyg from 2.2.2 to 2.6.0
    @bmarty
    bmarty authored Nov 9, 2023
    Configuration menu
    Copy the full SHA
    7073b16 View commit details
    Browse the repository at this point in the history

Commits on Nov 10, 2023

  1. use error instead of require

    @BillCarsonFr
    BillCarsonFr committed Nov 10, 2023
    Configuration menu
    Copy the full SHA
    4e53d84 View commit details
    Browse the repository at this point in the history

Commits on Nov 13, 2023

  1. Merge branch 'develop' into feature/bca/clean_up_legacy_crypto

    @BillCarsonFr
    BillCarsonFr committed Nov 13, 2023
    Configuration menu
    Copy the full SHA
    e4c1913 View commit details
    Browse the repository at this point in the history

  2. fix test

    @BillCarsonFr
    BillCarsonFr committed Nov 13, 2023
    Configuration menu
    Copy the full SHA
    58a44ac View commit details
    Browse the repository at this point in the history

  3. ignore paparazzi tests

    @BillCarsonFr
    BillCarsonFr committed Nov 13, 2023
    Configuration menu
    Copy the full SHA
    d045ced View commit details
    Browse the repository at this point in the history

  4. Merge pull request #8656 from vector-im/feature/bca/clean_up_legacy_c… 

    …rypto

Remove legacy crypto support.
    @bmarty
    bmarty authored Nov 13, 2023
    Configuration menu
    Copy the full SHA
    979324d View commit details
    Browse the repository at this point in the history

  5. bump crypto sdk to 0.3.16

    @BillCarsonFr
    BillCarsonFr committed Nov 13, 2023
    Configuration menu
    Copy the full SHA
    b61b2b6 View commit details
    Browse the repository at this point in the history

Commits on Nov 14, 2023

  1. fix outdated documentation

    @BillCarsonFr
    BillCarsonFr committed Nov 14, 2023
    Configuration menu
    Copy the full SHA
    f37d918 View commit details
    Browse the repository at this point in the history

  2. update change log

    @BillCarsonFr
    BillCarsonFr committed Nov 14, 2023
    Configuration menu
    Copy the full SHA
    36ce42e View commit details
    Browse the repository at this point in the history

  3. fix comment

    @BillCarsonFr
    BillCarsonFr committed Nov 14, 2023
    Configuration menu
    Copy the full SHA
    d339107 View commit details
    Browse the repository at this point in the history

  4. Update regex for email address

    @yostyle
    yostyle committed Nov 14, 2023
    Configuration menu
    Copy the full SHA
    3179dc1 View commit details
    Browse the repository at this point in the history

  5. Add changelog 

    Signed-off-by: yostyle <[email protected]>
    @yostyle
    yostyle committed Nov 14, 2023
    Configuration menu
    Copy the full SHA
    edf23bb View commit details
    Browse the repository at this point in the history

  6. Fix PR comment

    @yostyle
    yostyle committed Nov 14, 2023
    Configuration menu
    Copy the full SHA
    3d7489c View commit details
    Browse the repository at this point in the history

  7. Merge pull request #8671 from yostyle/yostyle/update_email_regex 

    Update regex for email address to be aligned on RFC 5322
    @bmarty
    bmarty authored Nov 14, 2023
    Configuration menu
    Copy the full SHA
    98e09ee View commit details
    Browse the repository at this point in the history

  8. Merge pull request #8679 from vector-im/feature/bca/bump_crypto_sdk_v… 

    …ersion

bump crypto sdk to 0.3.16
    @BillCarsonFr
    BillCarsonFr authored Nov 14, 2023
    Configuration menu
    Copy the full SHA
    1a94114 View commit details
    Browse the repository at this point in the history

Commits on Nov 15, 2023

  1. Unified Push: Ignore the potential SSL error when the custom gateway … 

    …is testing

When the Unified Push is enabled, the application checks the potential custom gateway before applying it. If an SSL error happens, the application may ignore this error and keep using this custom gateway. The actual SSL check will be done server side where this gateway is actually used.
    @giomfo
    giomfo committed Nov 15, 2023
    Configuration menu
    Copy the full SHA
    7c58af7 View commit details
    Browse the repository at this point in the history

  2. add changelog

    @giomfo
    giomfo committed Nov 15, 2023
    Configuration menu
    Copy the full SHA
    ee2fd9f View commit details
    Browse the repository at this point in the history

  3. Merge pull request #8683 from vector-im/giomfo/fix_custom_gateway_check 

    Unified Push: Ignore the potential SSL error when the custom gateway is testing
    @giomfo
    giomfo authored Nov 15, 2023
    Configuration menu
    Copy the full SHA
    fd5530a View commit details
    Browse the repository at this point in the history

Commits on Nov 17, 2023

  1. Fix issue with timeline message view reuse while rich text editor is … 

    …enabled (#8688)
    @jonnyandrew
    jonnyandrew authored Nov 17, 2023
    Configuration menu
    Copy the full SHA
    63ef40f View commit details
    Browse the repository at this point in the history

Commits on Nov 22, 2023

  1. Ensure Background sync is not stopped when there is an active call. 

    It was happening since the application is foregrounded when VectorCallActivity is displayed.
    @bmarty
    bmarty committed Nov 22, 2023
    Configuration menu
    Copy the full SHA
    84158ec View commit details
    Browse the repository at this point in the history

  2. Ensure Background sync is not stopped when there is an active call, e… 

    …ven when the app goes to background.
    @bmarty
    bmarty committed Nov 22, 2023
    Configuration menu
    Copy the full SHA
    8d85d04 View commit details
    Browse the repository at this point in the history

Commits on Nov 23, 2023

  1. Merge pull request #8674 from vector-im/feature/bma/infiniteRingCall 

    Ensure Background sync is not stopped when there is an active call.
    @bmarty
    bmarty authored Nov 23, 2023
    Configuration menu
    Copy the full SHA
    0c1f190 View commit details
    Browse the repository at this point in the history

Commits on Nov 27, 2023

  1. Remove quote from message actions menu (#8689)

    @jonnyandrew
    jonnyandrew authored Nov 27, 2023
    Configuration menu
    Copy the full SHA
    a6fafb0 View commit details
    Browse the repository at this point in the history

Commits on Nov 28, 2023

  1. Changelog for version 1.6.8

    @bmarty
    bmarty committed Nov 28, 2023
    Configuration menu
    Copy the full SHA
    6ba03f8 View commit details
    Browse the repository at this point in the history

  2. Adding fastlane file for version 1.6.8

    @bmarty
    bmarty committed Nov 28, 2023
    Configuration menu
    Copy the full SHA
    b27dc02 View commit details
    Browse the repository at this point in the history

  3. Update release script now that there is only on crypto implementation.

    @weblate @bmarty
    weblate authored and bmarty committed Nov 28, 2023
    Configuration menu
    Copy the full SHA
    f46a9d6 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'release/1.6.8' into main

    @bmarty
    bmarty committed Nov 28, 2023
    Configuration menu
    Copy the full SHA
    552b143 View commit details
    Browse the repository at this point in the history

Commits on Dec 18, 2023

  1. Merge tag 'v1.6.8' into rebase/element-android-1.6.8 

    tag
    @yostyle
    yostyle committed Dec 18, 2023
    Configuration menu
    Copy the full SHA
    cd98953 View commit details
    Browse the repository at this point in the history