Commit graph

6730 commits

Author SHA1 Message Date
Hugh Nimmo-Smith
e375fa0e67 Detekt 2023-01-06 18:14:14 +00:00
Hugh Nimmo-Smith
7b3c3d0dbb Revert "Squashed commit of the following:"
This reverts commit 4d6bbbbe89.
2023-01-06 17:57:50 +00:00
Hugh Nimmo-Smith
4d6bbbbe89 Squashed commit of the following:
commit a588989d13
Merge: 56067300e0 5ee3eefe96
Author: Benoit Marty <benoitm@matrix.org>
Date:   Fri Jan 6 18:45:18 2023 +0100

    Merge pull request #7875 from vector-im/feature/bma/releaseScript3

    Release script update

commit 56067300e0
Merge: baa46634b5 330a9be787
Author: Benoit Marty <benoitm@matrix.org>
Date:   Fri Jan 6 18:44:55 2023 +0100

    Merge pull request #7905 from RiotTranslateBot/weblate-element-android-element-app

    Translations update from Weblate

commit baa46634b5
Merge: 93021a6028 0d2fb8e3d0
Author: Benoit Marty <benoitm@matrix.org>
Date:   Fri Jan 6 18:44:37 2023 +0100

    Merge pull request #7885 from vector-im/feature/bma/fixLint

    Fix lint false positive

commit 93021a6028
Merge: f856142cdc e9d1de8fba
Author: Benoit Marty <benoitm@matrix.org>
Date:   Fri Jan 6 18:43:53 2023 +0100

    Merge pull request #7724 from vector-im/feature/bma/launchWhenResumed

    Observe ViewEvents only when resumed

commit e9d1de8fba
Author: Benoit Marty <benoit@matrix.org>
Date:   Fri Jan 6 17:36:40 2023 +0100

    Fix compilation issue after rebase.

commit 330a9be787
Merge: f856142cdc 4f2550ae92
Author: Weblate <noreply@weblate.org>
Date:   Fri Jan 6 16:33:47 2023 +0000

    Merge branch 'origin/develop' into Weblate.

commit 4f2550ae92
Author: Linerly <linerly@protonmail.com>
Date:   Wed Jan 4 22:47:24 2023 +0000

    Translated using Weblate (Indonesian)

    Currently translated at 100.0% (89 of 89 strings)

    Translation: Element Android/Element Android Store
    Translate-URL: https://translate.element.io/projects/element-android/element-store/id/

commit 5734a270d8
Author: waclaw66 <waclaw66@seznam.cz>
Date:   Wed Jan 4 16:04:26 2023 +0000

    Translated using Weblate (Czech)

    Currently translated at 100.0% (89 of 89 strings)

    Translation: Element Android/Element Android Store
    Translate-URL: https://translate.element.io/projects/element-android/element-store/cs/

commit 0882e1bf81
Author: Jeff Huang <s8321414@gmail.com>
Date:   Thu Jan 5 02:10:13 2023 +0000

    Translated using Weblate (Chinese (Traditional))

    Currently translated at 100.0% (89 of 89 strings)

    Translation: Element Android/Element Android Store
    Translate-URL: https://translate.element.io/projects/element-android/element-store/zh_Hant/

commit 53db988525
Author: Christian Paul <info@jaller.de>
Date:   Thu Jan 5 16:06:48 2023 +0000

    Translated using Weblate (Esperanto)

    Currently translated at 2.2% (2 of 89 strings)

    Translation: Element Android/Element Android Store
    Translate-URL: https://translate.element.io/projects/element-android/element-store/eo/

commit ff9cf8fd2f
Author: Danial Behzadi <dani.behzi@ubuntu.com>
Date:   Wed Jan 4 17:43:34 2023 +0000

    Translated using Weblate (Persian)

    Currently translated at 100.0% (89 of 89 strings)

    Translation: Element Android/Element Android Store
    Translate-URL: https://translate.element.io/projects/element-android/element-store/fa/

commit 8a5aad1ba0
Author: Priit Jõerüüt <riot@joeruut.com>
Date:   Thu Jan 5 07:22:25 2023 +0000

    Translated using Weblate (Estonian)

    Currently translated at 100.0% (89 of 89 strings)

    Translation: Element Android/Element Android Store
    Translate-URL: https://translate.element.io/projects/element-android/element-store/et/

commit 2903a644f2
Author: Ihor Hordiichuk <igor_ck@outlook.com>
Date:   Wed Jan 4 19:24:53 2023 +0000

    Translated using Weblate (Ukrainian)

    Currently translated at 100.0% (89 of 89 strings)

    Translation: Element Android/Element Android Store
    Translate-URL: https://translate.element.io/projects/element-android/element-store/uk/

commit 96363fb789
Author: Jozef Gaal <preklady@mayday.sk>
Date:   Wed Jan 4 16:18:18 2023 +0000

    Translated using Weblate (Slovak)

    Currently translated at 100.0% (89 of 89 strings)

    Translation: Element Android/Element Android Store
    Translate-URL: https://translate.element.io/projects/element-android/element-store/sk/

commit 271b828be0
Author: Szimszon <github@oregpreshaz.eu>
Date:   Wed Jan 4 18:55:35 2023 +0000

    Translated using Weblate (Hungarian)

    Currently translated at 100.0% (89 of 89 strings)

    Translation: Element Android/Element Android Store
    Translate-URL: https://translate.element.io/projects/element-android/element-store/hu/

commit bd21f032d4
Author: Glandos <bugs-github@antipoul.fr>
Date:   Thu Jan 5 08:42:07 2023 +0000

    Translated using Weblate (French)

    Currently translated at 100.0% (89 of 89 strings)

    Translation: Element Android/Element Android Store
    Translate-URL: https://translate.element.io/projects/element-android/element-store/fr/

commit 860df01902
Author: Vri <element@vrifox.cc>
Date:   Wed Jan 4 16:20:15 2023 +0000

    Translated using Weblate (German)

    Currently translated at 100.0% (89 of 89 strings)

    Translation: Element Android/Element Android Store
    Translate-URL: https://translate.element.io/projects/element-android/element-store/de/

commit ed84212c78
Author: Besnik Bleta <besnik@programeshqip.org>
Date:   Wed Jan 4 17:01:03 2023 +0000

    Translated using Weblate (Albanian)

    Currently translated at 99.3% (2558 of 2576 strings)

    Translation: Element Android/Element Android App
    Translate-URL: https://translate.element.io/projects/element-android/element-app/sq/

commit f790921785
Author: Mateus Rodrigues Costa <mateusrodcosta@gmail.com>
Date:   Wed Jan 4 21:12:32 2023 +0000

    Translated using Weblate (Portuguese (Brazil))

    Currently translated at 100.0% (2576 of 2576 strings)

    Translation: Element Android/Element Android App
    Translate-URL: https://translate.element.io/projects/element-android/element-app/pt_BR/

commit 3098ec140d
Author: overtinkering <overtinker@yandex.com>
Date:   Thu Jan 5 18:02:33 2023 +0000

    Translated using Weblate (Spanish)

    Currently translated at 90.7% (2338 of 2576 strings)

    Translation: Element Android/Element Android App
    Translate-URL: https://translate.element.io/projects/element-android/element-app/es/

commit 725722d3f2
Author: Christian Paul <info@jaller.de>
Date:   Thu Jan 5 16:14:10 2023 +0000

    Translated using Weblate (Esperanto)

    Currently translated at 76.0% (1960 of 2576 strings)

    Translation: Element Android/Element Android App
    Translate-URL: https://translate.element.io/projects/element-android/element-app/eo/

commit ea924642ce
Author: Christian Paul <info@jaller.de>
Date:   Thu Jan 5 16:51:43 2023 +0000

    Translated using Weblate (Danish)

    Currently translated at 10.2% (264 of 2576 strings)

    Translation: Element Android/Element Android App
    Translate-URL: https://translate.element.io/projects/element-android/element-app/da/

commit f856142cdc
Merge: b7076a13dc 85cfa433d9
Author: Maxime NATUREL <46314705+mnaturel@users.noreply.github.com>
Date:   Fri Jan 6 16:07:44 2023 +0100

    Merge pull request #7886 from vector-im/feature/mna/past-polls-ui

    [Poll] Render past polls list of a room (PSG-1029)

commit b7076a13dc
Merge: 41bcdd7232 dbf3b76331
Author: Benoit Marty <benoitm@matrix.org>
Date:   Fri Jan 6 15:16:16 2023 +0100

    Merge pull request #7879 from vector-im/feature/bma/still_investigating

    Reduce number of crypto database transactions when handling the sync response

commit 7b1724f6dd
Author: Benoit Marty <benoit@matrix.org>
Date:   Fri Jan 6 15:13:01 2023 +0100

    changelog

commit 9768430d5c
Author: Benoit Marty <benoit@matrix.org>
Date:   Mon Dec 19 18:32:07 2022 +0100

    Fix test compilation issue

commit 71bd4f457a
Author: Benoit Marty <benoit@matrix.org>
Date:   Wed Dec 7 17:48:25 2022 +0100

    Ensure posted events from the ViewModel are consumed (once) by the UI
    Inspired from https://github.com/Kotlin/kotlinx.coroutines/issues/3002

commit 9c79d23444
Author: Benoit Marty <benoitm@matrix.org>
Date:   Fri Dec 16 21:02:33 2022 +0100

    Ensure event are not sent if the lifecycle state is not RESUMED

commit 0dd1abb926
Author: Benoit Marty <benoit@matrix.org>
Date:   Tue Dec 6 13:02:02 2022 +0100

    Rename method

commit 41bcdd7232
Merge: b8da53b3bb 7fc9705f3a
Author: Maxime NATUREL <46314705+mnaturel@users.noreply.github.com>
Date:   Fri Jan 6 14:18:20 2023 +0100

    Merge pull request #7867 from vector-im/feature/mna/active-polls-ui

    [Poll] Render active polls list of a room (PSG-908)

commit 85cfa433d9
Author: Maxime NATUREL <46314705+mnaturel@users.noreply.github.com>
Date:   Fri Jan 6 14:13:58 2023 +0100

    Using ordinal of enum to render tabs

commit b8da53b3bb
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Date:   Fri Jan 6 11:56:11 2023 +0000

    Bump checker from 3.27.0 to 3.29.0 (#7903)

    Bumps [checker](https://github.com/typetools/checker-framework) from 3.27.0 to 3.29.0.
    - [Release notes](https://github.com/typetools/checker-framework/releases)
    - [Changelog](https://github.com/typetools/checker-framework/blob/master/docs/CHANGELOG.md)
    - [Commits](https://github.com/typetools/checker-framework/compare/checker-framework-3.27.0...checker-framework-3.29.0)

    ---
    updated-dependencies:
    - dependency-name: org.checkerframework:checker
      dependency-type: direct:production
      update-type: version-update:semver-minor
    ...

    Signed-off-by: dependabot[bot] <support@github.com>

    Signed-off-by: dependabot[bot] <support@github.com>
    Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

commit e88e874697
Merge: 2e95d4f97c c3ad7faa2c
Author: Benoit Marty <benoitm@matrix.org>
Date:   Fri Jan 6 10:35:14 2023 +0100

    Merge pull request #7865 from vector-im/dependabot/gradle/org.owasp-dependency-check-gradle-7.4.3

    Bump dependency-check-gradle from 7.4.1 to 7.4.3

commit 2e95d4f97c
Merge: f1bd9b2cf3 87e661e3b5
Author: Florian Renaud <Florian14@users.noreply.github.com>
Date:   Fri Jan 6 09:10:00 2023 +0100

    Merge pull request #7899 from vector-im/bugfix/fre/buffering_on_last_chunk

    [Voice Broadcast] Stop listening if we reach the last received chunk and there is no last sequence number

commit 9b5fda2689
Author: Maxime NATUREL <46314705+mnaturel@users.noreply.github.com>
Date:   Thu Jan 5 15:45:35 2023 +0100

    Fix after rebase

commit a5d076a28a
Author: Maxime NATUREL <46314705+mnaturel@users.noreply.github.com>
Date:   Wed Jan 4 10:49:07 2023 +0100

    Adding total votes status for ended poll items

commit 05363dc8ca
Author: Maxime NATUREL <46314705+mnaturel@users.noreply.github.com>
Date:   Wed Jan 4 10:30:57 2023 +0100

    Adding winner option views for ended poll items

commit 1cc26449f3
Author: Maxime NATUREL <46314705+mnaturel@users.noreply.github.com>
Date:   Wed Jan 4 10:12:34 2023 +0100

    Renaming some ui fields

commit 3deae1101c
Author: Maxime NATUREL <46314705+mnaturel@users.noreply.github.com>
Date:   Tue Jan 3 17:32:41 2023 +0100

    Adding extra data for ended poll

commit cf82486efa
Author: Maxime NATUREL <46314705+mnaturel@users.noreply.github.com>
Date:   Fri Dec 30 17:38:55 2022 +0100

    Adding mocked data for ended polls

commit 740591cd38
Author: Maxime NATUREL <46314705+mnaturel@users.noreply.github.com>
Date:   Fri Dec 30 17:31:23 2022 +0100

    Updating unit tests

commit cb45056c1a
Author: Maxime NATUREL <46314705+mnaturel@users.noreply.github.com>
Date:   Fri Dec 30 17:28:57 2022 +0100

    Mutualizing list fragments and add ended polls tab

commit 0b535910d6
Author: Maxime NATUREL <46314705+mnaturel@users.noreply.github.com>
Date:   Fri Dec 30 15:50:32 2022 +0100

    Adding changelog entry

commit 7fc9705f3a
Author: Maxime NATUREL <46314705+mnaturel@users.noreply.github.com>
Date:   Thu Jan 5 16:37:06 2023 +0100

    Adding importantForAccessibility attribute to icon

commit 2dab6ed052
Author: Maxime NATUREL <46314705+mnaturel@users.noreply.github.com>
Date:   Thu Jan 5 15:27:11 2023 +0100

    Fix horizontal margin of tabs

commit ff9e78be42
Author: Maxime NATUREL <46314705+mnaturel@users.noreply.github.com>
Date:   Thu Jan 5 15:20:20 2023 +0100

    Use classical for loop instead of forEach

commit d60403545c
Author: Maxime NATUREL <46314705+mnaturel@users.noreply.github.com>
Date:   Thu Jan 5 15:09:41 2023 +0100

    Renaming of filter enum

commit 87e661e3b5
Author: Florian Renaud <florianr@element.io>
Date:   Thu Jan 5 14:36:22 2023 +0100

    Add changelog file

commit 0d2fb8e3d0
Author: Benoit Marty <benoit@matrix.org>
Date:   Wed Jan 4 10:17:35 2023 +0100

    Lint: fix KotlinNullnessAnnotation warning

commit dbf3b76331
Author: Benoit Marty <benoitm@matrix.org>
Date:   Thu Jan 5 11:54:19 2023 +0100

    Update doc.

commit 27d32188bf
Author: Benoit Marty <benoit@matrix.org>
Date:   Thu Jan 5 11:04:20 2023 +0100

    Aggregate data outside of the RealmCryptoStore.

commit 682bb8bde0
Author: Florian Renaud <florianr@element.io>
Date:   Wed Jan 4 14:06:58 2023 +0100

    VB - Stop listening if we reach the last received chunk and there is no last sequence number

commit 30940cb937
Author: Benoit Marty <benoit@matrix.org>
Date:   Thu Jan 5 09:53:12 2023 +0100

    Rename `UserCrossSigningKeys` to `UserIdentity`

commit 7e26c4b6f2
Author: Benoit Marty <benoit@matrix.org>
Date:   Thu Jan 5 09:48:25 2023 +0100

    Rename fun

commit 354554e843
Author: Maxime NATUREL <46314705+mnaturel@users.noreply.github.com>
Date:   Fri Dec 30 16:45:28 2022 +0100

    Ignore missing ContentDescription

commit e82c7afdae
Author: Maxime NATUREL <46314705+mnaturel@users.noreply.github.com>
Date:   Fri Dec 30 15:48:14 2022 +0100

    Replace usage of colorAccent

commit 6c0c5e5064
Author: Maxime NATUREL <46314705+mnaturel@users.noreply.github.com>
Date:   Fri Dec 30 15:12:12 2022 +0100

    Rename poll item layout to be more generic

commit bd9c53a96c
Author: Maxime NATUREL <46314705+mnaturel@users.noreply.github.com>
Date:   Fri Dec 30 14:57:37 2022 +0100

    Show message when list is empty

commit e0b77936c1
Author: Maxime NATUREL <46314705+mnaturel@users.noreply.github.com>
Date:   Fri Dec 30 14:27:11 2022 +0100

    Changing the date format

commit bc985aa1ef
Author: Maxime NATUREL <46314705+mnaturel@users.noreply.github.com>
Date:   Fri Dec 30 14:19:50 2022 +0100

    Adding unit tests for ViewModel

commit 71b7edc6f2
Author: Maxime NATUREL <46314705+mnaturel@users.noreply.github.com>
Date:   Fri Dec 30 12:12:57 2022 +0100

    Adding debug log

commit bf67d2529f
Author: Maxime NATUREL <46314705+mnaturel@users.noreply.github.com>
Date:   Fri Dec 30 12:08:55 2022 +0100

    Allow access of poll history only in debug variant

commit 8de86e7480
Author: Maxime NATUREL <46314705+mnaturel@users.noreply.github.com>
Date:   Fri Dec 30 11:59:48 2022 +0100

    Render mocked data get from use case

commit 77d3b7da04
Author: Maxime NATUREL <46314705+mnaturel@users.noreply.github.com>
Date:   Fri Dec 30 11:40:41 2022 +0100

    Fix missing id in Epoxy model

commit f20513eb16
Author: Maxime NATUREL <46314705+mnaturel@users.noreply.github.com>
Date:   Fri Dec 30 10:56:44 2022 +0100

    Render the active polls list on fragment

commit 7b63f891c3
Author: Maxime NATUREL <46314705+mnaturel@users.noreply.github.com>
Date:   Fri Dec 30 10:42:42 2022 +0100

    Epoxy controller to render active poll list

commit 9f97579f9d
Author: Maxime NATUREL <46314705+mnaturel@users.noreply.github.com>
Date:   Fri Dec 30 10:07:50 2022 +0100

    Epoxy model for active poll

commit 10133bd20f
Author: Maxime NATUREL <46314705+mnaturel@users.noreply.github.com>
Date:   Thu Dec 29 17:46:07 2022 +0100

    Setup tab layout when landing on the room polls screen

commit 7436c2e1f5
Author: Maxime NATUREL <46314705+mnaturel@users.noreply.github.com>
Date:   Thu Dec 29 16:41:42 2022 +0100

    Navigate to new empty screen

commit cba960fbd7
Author: Maxime NATUREL <46314705+mnaturel@users.noreply.github.com>
Date:   Thu Dec 29 16:05:52 2022 +0100

    Adding new entry "Poll history" into room profile screen

commit e903dac224
Author: Maxime NATUREL <46314705+mnaturel@users.noreply.github.com>
Date:   Thu Dec 29 15:40:59 2022 +0100

    Adding changelog entry

commit 437b93cc18
Author: Benoit Marty <benoitm@matrix.org>
Date:   Wed Jan 4 11:35:04 2023 +0100

    Add some doc

commit 06f3c11010
Author: Benoit Marty <benoit@matrix.org>
Date:   Tue Jan 3 16:43:09 2023 +0100

    Changelog

commit 02e7157206
Author: Benoit Marty <benoitm@matrix.org>
Date:   Tue Jan 3 16:16:17 2023 +0100

    Introduce CryptoCrossSigningKeys container

commit 4c4ef0d73e
Author: Benoit Marty <benoitm@matrix.org>
Date:   Tue Jan 3 15:57:39 2023 +0100

    Batch insertion of  user data after downloading keys.

commit f26178fc21
Author: Benoit Marty <benoitm@matrix.org>
Date:   Tue Jan 3 15:21:03 2023 +0100

    Avoid useless transaction

commit a386a4762c
Author: Benoit Marty <benoitm@matrix.org>
Date:   Tue Jan 3 15:18:32 2023 +0100

    Crypto store: Log realm transactions and the duration

commit c1a8bf828b
Author: Benoit Marty <benoitm@matrix.org>
Date:   Tue Jan 3 15:15:15 2023 +0100

    Batch insertion of  `shouldEncryptForInvitedMembers`

commit 6f384c799f
Author: Benoit Marty <benoitm@matrix.org>
Date:   Tue Jan 3 15:02:45 2023 +0100

    Batch insertion of  `shouldShareHistory`

commit 0e504e9014
Author: Benoit Marty <benoitm@matrix.org>
Date:   Tue Jan 3 11:55:41 2023 +0100

    Format

commit 837590104d
Author: Benoit Marty <benoitm@matrix.org>
Date:   Tue Jan 3 11:55:32 2023 +0100

    Avoid launching coroutine for nothing.

commit 56986c3a77
Author: Benoit Marty <benoit@matrix.org>
Date:   Mon Jan 2 21:15:08 2023 +0100

    Add a way to get the access token from the advances settings.

commit 5ee3eefe96
Author: Benoit Marty <benoit@matrix.org>
Date:   Mon Jan 2 16:55:25 2023 +0100

    Pull branch sooner to ensure release version is correctly guessed

commit c3ad7faa2c
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Date:   Thu Dec 29 23:02:43 2022 +0000

    Bump dependency-check-gradle from 7.4.1 to 7.4.3

    Bumps dependency-check-gradle from 7.4.1 to 7.4.3.

    ---
    updated-dependencies:
    - dependency-name: org.owasp:dependency-check-gradle
      dependency-type: direct:production
      update-type: version-update:semver-patch
    ...

    Signed-off-by: dependabot[bot] <support@github.com>

commit b3d578d6b8
Author: Benoit Marty <benoit@matrix.org>
Date:   Thu Dec 15 12:44:40 2022 +0100

    Release script: Improve creation of the release on GitHub.

commit 5e1d3e6c8d
Author: Benoit Marty <benoitm@matrix.org>
Date:   Thu Dec 15 12:09:27 2022 +0100

    Escape %
2023-01-06 17:50:38 +00:00
Benoit Marty
baa46634b5
Merge pull request #7885 from vector-im/feature/bma/fixLint
Fix lint false positive
2023-01-06 18:44:37 +01:00
Hugh Nimmo-Smith
26d71e214a Updated implementation including outbound link for account management 2023-01-06 17:43:14 +00:00
Onuray Sahin
2c24601155
Merge branch 'develop' into feature/ons/render_ended_poll 2023-01-06 17:21:08 +03:00
Benoit Marty
b7076a13dc
Merge pull request #7879 from vector-im/feature/bma/still_investigating
Reduce number of crypto database transactions when handling the sync response
2023-01-06 15:16:16 +01:00
Onuray Sahin
37f4cf11bd Merge branch 'develop' into feature/ons/render_ended_poll 2023-01-06 13:29:04 +03:00
Hugh Nimmo-Smith
bfed447b21 Merge remote-tracking branch 'upstream/develop' into hughns/msc3824-oidc-aware 2023-01-05 17:03:20 +00:00
Benoit Marty
0d2fb8e3d0 Lint: fix KotlinNullnessAnnotation warning 2023-01-05 14:07:12 +01:00
Onuray Sahin
f2359ccac2 Implement ended poll indicator. 2023-01-05 14:54:16 +03:00
Benoit Marty
dbf3b76331 Update doc. 2023-01-05 11:54:19 +01:00
Benoit Marty
27d32188bf Aggregate data outside of the RealmCryptoStore. 2023-01-05 11:22:54 +01:00
Benoit Marty
30940cb937 Rename UserCrossSigningKeys to UserIdentity 2023-01-05 09:53:12 +01:00
Benoit Marty
7e26c4b6f2 Rename fun 2023-01-05 09:48:25 +01:00
Benoit Marty
437b93cc18 Add some doc 2023-01-04 11:35:34 +01:00
valere
419673675c Added Self verification UI test 2023-01-03 19:35:15 +01:00
Benoit Marty
92d048f45a Update replied event when it's updated
Rebased and squashed.
Authors: Claire and Ganfra
2023-01-03 18:16:38 +01:00
Benoit Marty
06f3c11010 Changelog 2023-01-03 16:43:09 +01:00
Benoit Marty
02e7157206 Introduce CryptoCrossSigningKeys container 2023-01-03 16:16:17 +01:00
Benoit Marty
4c4ef0d73e Batch insertion of user data after downloading keys. 2023-01-03 15:57:39 +01:00
Benoit Marty
f26178fc21 Avoid useless transaction 2023-01-03 15:21:03 +01:00
Benoit Marty
a386a4762c Crypto store: Log realm transactions and the duration 2023-01-03 15:18:32 +01:00
Benoit Marty
c1a8bf828b Batch insertion of shouldEncryptForInvitedMembers 2023-01-03 15:15:15 +01:00
Benoit Marty
6f384c799f Batch insertion of shouldShareHistory 2023-01-03 15:02:45 +01:00
Benoit Marty
0e504e9014 Format 2023-01-03 11:55:41 +01:00
Benoit Marty
837590104d Avoid launching coroutine for nothing. 2023-01-03 11:55:32 +01:00
valere
6952d17d16 Merge branch 'develop' into feature/bca/rust_flavor 2023-01-03 09:55:08 +01:00
valere
fab0350ca1 rust key safety integration 2023-01-03 09:53:22 +01:00
valere
54e8debc38 cleaning and logs 2023-01-03 09:52:58 +01:00
SpiritCroc
dadeadcad4 Merge tag 'v1.5.18' into sc
Change-Id: I4730268dc4327fb16756e73d4dcb428a8c262ec3
2023-01-02 17:57:49 +01:00
Benoit Marty
5ee3ae5eea version++ 2023-01-02 13:39:05 +01:00
valere
a345c6c8e5 fix 7870 2022-12-31 13:21:07 +01:00
SpiritCroc
740364f733 Merge remote-tracking branch 'deepbluev7/nico/fix-at-room' into sc
Change-Id: I9587d87c60e70c2efc098b7379a6bac9f9c9be26
2022-12-31 08:24:15 +01:00
SpiritCroc
25dddf7566 Merge tag 'v1.5.16' into sc
Change-Id: I98c122b95dd3758d41f4845a42ec9ed2371e174f

Conflicts:
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/TimelineFragment.kt
	vector/src/main/java/im/vector/app/features/themes/ThemeUtils.kt
2022-12-30 17:58:06 +01:00
valere
ea2c41b818 version++ 2022-12-29 18:24:33 +01:00
valere
25f4f2175a Fix failing tests 2022-12-28 10:19:25 +01:00
valere
558317260b Add migration to clean db from SyncFilterParamsEntity 2022-12-27 15:40:49 +01:00
Onuray Sahin
486968fdc2 Render ended poll. 2022-12-26 14:41:38 +03:00
valere
76fa1bfee5 Merge branch 'develop' into feature/bca/rust_flavor 2022-12-26 09:29:03 +01:00
NIkita Fedrunov
91b4dc1f97 tests are fixed 2022-12-23 13:51:19 +01:00
NIkita Fedrunov
d20121603a sync filter params moved to matrix config 2022-12-23 13:10:27 +01:00
SpiritCroc
e054828370 Merge tag 'v1.5.14' into sc
Change-Id: Ib0162cc1f66cd563e15a24a2c090cfd18b5250c2
2022-12-21 09:57:40 +01:00
Benoit Marty
67e15a42c0 Version++ 2022-12-20 16:50:08 +01:00
Benoit Marty
576ea2df55 Prepare hotfix 1.5.14 2022-12-20 16:44:11 +01:00
SpiritCroc
f5dcf25a6d Merge tag 'v1.5.13' into sc
Change-Id: I16e8750adb88c86ad6af84f60d904fd5e16d2f13
2022-12-19 18:04:43 +01:00
Benoit Marty
ffa49870a9 Version 1.5.13 2022-12-19 16:52:32 +01:00
SpiritCroc
dd83c16e46 Disable useless thread fallback to reply fallback calculation
Don't ask me why Element did that much effort for those, instead of just
doing rich replies...

Change-Id: I90146a34b7a29896f550fcde50f821af629d7edb
2022-12-17 15:18:03 +01:00
valere
ee5dfba389 fix kotlinCrypto flavor compilation 2022-12-17 11:53:13 +01:00
SpiritCroc
aa9e0bc627 Add read receipt debugging
Change-Id: I2cd0b5feb23962bc36295380fe3e77346f0ea694
2022-12-17 11:34:39 +01:00