Benoit Marty
4ba84ddc82
Merge pull request #8064 from vector-im/dependabot/gradle/org.jetbrains.kotlin-kotlin-reflect-1.8.10
...
Bump org.jetbrains.kotlin:kotlin-reflect from 1.8.0 to 1.8.10
2023-02-07 14:30:50 +01:00
valere
a70e3c2533
Merge branch 'develop' into feature/bca/rust_flavor
2023-02-07 11:36:11 +01:00
valere
82a7f29497
disabled temporary analytics opt-in
2023-02-03 09:47:47 +01:00
dependabot[bot]
a8be83917a
Bump org.jetbrains.kotlin:kotlin-reflect from 1.8.0 to 1.8.10
...
Bumps [org.jetbrains.kotlin:kotlin-reflect](https://github.com/JetBrains/kotlin ) from 1.8.0 to 1.8.10.
- [Release notes](https://github.com/JetBrains/kotlin/releases )
- [Changelog](https://github.com/JetBrains/kotlin/blob/v1.8.10/ChangeLog.md )
- [Commits](https://github.com/JetBrains/kotlin/compare/v1.8.0...v1.8.10 )
---
updated-dependencies:
- dependency-name: org.jetbrains.kotlin:kotlin-reflect
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
2023-02-02 23:03:38 +00:00
Florian Renaud
9383319b37
Fix import
2023-02-01 23:26:49 +01:00
Florian Renaud
9a31aa3b91
Move clock to core-utils module
2023-01-31 16:45:48 +01:00
SpiritCroc
d8bd92c413
Merge tag 'v1.5.22' into sc
...
Change-Id: I3e8db4d0d0d6afa0f47c9daa0f809410938674e0
Conflicts:
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/LoadTimelineStrategy.kt
vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/CheckIfCanReplyEventUseCase.kt
vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/MessageItemFactory.kt
vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryItemFactory.kt
2023-01-26 19:49:36 +01:00
valere
8b50fa3828
Merge branch 'develop' into feature/bca/rust_flavor
2023-01-25 15:17:17 +01:00
Benoit Marty
cb093e0496
version++
2023-01-25 14:06:48 +01:00
valere
6b3d1f185d
fix app locked on splash
2023-01-25 14:01:04 +01:00
SpiritCroc
d4cb55eeaa
Merge tag 'v1.5.20' into sc
...
Change-Id: I438392b41ebe84dccfae1639ae90102c3d45c680
Conflicts:
dependencies.gradle
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/RealmCryptoStore.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/TimelineChunk.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/handler/room/RoomSyncHandler.kt
vector/src/main/java/im/vector/app/core/resources/StringProvider.kt
vector/src/main/res/xml/vector_settings_advanced_settings.xml
2023-01-13 14:50:46 +01:00
valere
c0397875f0
Merge branch 'develop' into feature/bca/rust_flavor
2023-01-12 14:51:03 +01:00
Benoit Marty
242596744a
Use Fragment 1.6.0 alpha to fix issue with test
...
https://issuetracker.google.com/issues/128612536
2023-01-11 12:13:45 +01:00
Benoit Marty
d686d7aab2
Project property value can only be strings.
...
Fix
> Failed to notify project evaluation listener.
> Could not create task ':element-android:matrix-sdk-android:compileDebugAndroidTestKotlin'.
> Could not create task of type 'KotlinCompile'.
> class java.util.LinkedHashMap cannot be cast to class java.lang.String (java.util.LinkedHashMap and java.lang.String are in module java.base of loader 'bootstrap')
2023-01-11 12:13:00 +01:00
dependabot[bot]
2614911631
Bump kotlin-reflect from 1.7.22 to 1.8.0
...
Bumps [kotlin-reflect](https://github.com/JetBrains/kotlin ) from 1.7.22 to 1.8.0.
- [Release notes](https://github.com/JetBrains/kotlin/releases )
- [Changelog](https://github.com/JetBrains/kotlin/blob/master/ChangeLog.md )
- [Commits](https://github.com/JetBrains/kotlin/compare/v1.7.22...v1.8.0 )
---
updated-dependencies:
- dependency-name: org.jetbrains.kotlin:kotlin-reflect
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
2023-01-11 12:13:00 +01:00
Benoit Marty
b4e6656c42
version++
2023-01-10 16:24:24 +01:00
valere
3bae04c04a
Merge branch 'develop' into feature/bca/rust_flavor
2023-01-09 23:46:14 +01:00
valere
a217ec220f
Handling incoming verification
...
Fix SAS state signaling problem, more tests, back navigation
2023-01-09 09:19:04 +01:00
Maxime NATUREL
12ccf13171
Use Firebase BOM
2023-01-04 16:02:04 +01:00
dependabot[bot]
c8595df658
Bump firebase-messaging from 23.1.0 to 23.1.1
...
Bumps firebase-messaging from 23.1.0 to 23.1.1.
---
updated-dependencies:
- dependency-name: com.google.firebase:firebase-messaging
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
2023-01-04 16:02:04 +01:00
valere
8606ac92e1
Fix verify with passphrase test
2023-01-04 09:51:51 +01:00
valere
419673675c
Added Self verification UI test
2023-01-03 19:35:15 +01:00
valere
8eda089edc
fix rebase
2023-01-03 10:00:02 +01:00
valere
6952d17d16
Merge branch 'develop' into feature/bca/rust_flavor
2023-01-03 09:55:08 +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
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
53b1bec5db
try fix lint
2022-12-29 10:51:57 +01:00
valere
6f5d8d6ece
FIx UI Tests
2022-12-28 18:09:28 +01:00
valere
76fa1bfee5
Merge branch 'develop' into feature/bca/rust_flavor
2022-12-26 09:29:03 +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
4f7bbd6ada
Merge hotfix 1.5.13
2022-12-19 16:58:09 +01:00
Benoit Marty
ed01f32393
Add `largeHeap=true` in the manifest since we are seeing more crashes (OOM) when handling sync response.
2022-12-19 16:54:15 +01:00
Benoit Marty
ffa49870a9
Version 1.5.13
2022-12-19 16:52:32 +01:00
valere
7c888f6334
tmp workaround for big account OOM
2022-12-16 14:03:28 +01:00
valere
3146f5209b
Merge branch 'develop' into feature/bca/rust_flavor
2022-12-16 09:33:37 +01:00
SpiritCroc
05fc840b3b
[merge] Fix gplay build
...
Change-Id: I1fe6ca3a1b2e4355377da9e508b56c4e44eb7c26
2022-12-15 11:45:48 +01:00
SpiritCroc
330f0cf5cc
Merge tag 'v1.5.12' into sc
...
Change-Id: I4c53d64845ee05ff395e5df436a0739c87798737
Conflicts:
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryUpdater.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/accountdata/AccountDataAPI.kt
vector-app/build.gradle
vector-app/src/gplay/java/im/vector/app/nightly/FirebaseNightlyProxy.kt
vector-config/src/main/res/values/config-settings.xml
vector/src/main/java/im/vector/app/features/home/room/detail/TimelineFragment.kt
vector/src/main/java/im/vector/app/features/home/room/detail/composer/MessageComposerFragment.kt
vector/src/main/java/im/vector/app/features/home/room/detail/timeline/format/DisplayableEventFormatter.kt
vector/src/main/java/im/vector/app/features/home/room/detail/timeline/format/NoticeEventFormatter.kt
vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryItemFactory.kt
vector/src/main/java/im/vector/app/features/notifications/NotificationUtils.kt
2022-12-15 11:01:52 +01:00
Benoit Marty
8c49609aa6
version++
2022-12-15 10:20:26 +01:00
Yoan Pintas
c74ea2dd16
Merge pull request #7719 from vector-im/feature/fre/voice_broadcast_last_message
...
Voice Broadcast - Update last message in the room list
2022-12-14 17:39:42 +01:00
valere
8555b045e7
Fix CI missing key in map
2022-12-14 13:54:48 +01:00
valere
71d56108c2
Fix ui test compilation
2022-12-14 10:43:03 +01:00
valere
f1e8f846b9
fix test compilation
2022-12-13 17:20:47 +01:00
valere
14cee226c5
Merge branch 'develop' into feature/bca/rust_flavor
2022-12-08 13:37:43 +01:00
jonnyandrew
de18f37849
[Rich text editor] Add error tracking for rich text editor ( #7695 )
2022-12-08 11:43:19 +00:00
ganfra
ceec2018a7
Merge pull request #7686 from vector-im/dependabot/gradle/com.facebook.soloader-soloader-0.10.5
...
Bump soloader from 0.10.4 to 0.10.5
2022-12-07 20:24:13 +01:00
Florian Renaud
69beef4648
Show voice broadcast events in the room list
...
fix factory
2022-12-07 18:11:51 +01:00
SpiritCroc
87100a8536
Merge remote-tracking branch 'upstream/develop' into sc
...
Change-Id: Ifed09540802774e7b1d3f2ab787a7f42f1030b28
Conflicts:
vector/src/main/java/im/vector/app/features/home/HomeActivityViewModel.kt
vector/src/main/java/im/vector/app/features/settings/notifications/VectorSettingsNotificationPreferenceFragment.kt
2022-12-07 14:56:07 +01:00
SpiritCroc
001e22bbad
Merge tag 'v1.5.11' into sc
...
Change-Id: Ia736ee03b924e8ec8f641420eac11f5fc68b69f4
2022-12-07 14:36:35 +01:00
Benoit Marty
6c84668611
Hotfix 1.5.11
2022-12-07 13:58:02 +01:00
Benoit Marty
988afa4ebe
Fix FDroid build
2022-12-06 18:21:07 +01:00
valere
6965c0c5ab
move app_name to xml res
2022-12-06 18:11:31 +01:00
Benoit Marty
0d12dbbe7e
Disable the Nightly popup, user registration (with `updateIfNewReleaseAvailable()`) to get upgrade does not work.
...
Add a nightly build section in the preferences to manually try to upgrade.
2022-12-06 12:51:46 +01:00
Benoit Marty
a65e13970d
`appdistribution` is only for nightly builds, not necessary for gplay (prod) builds.
2022-12-06 12:22:50 +01:00
Maxime NATUREL
a2f8fed63c
Merge pull request #7675 from vector-im/fix/mna/unified-push-selection
...
ANR when asking to select the notification method
2022-12-05 16:58:09 +01:00
dependabot[bot]
b4792c8a59
Bump leakcanary-android from 2.9.1 to 2.10 ( #7570 )
2022-12-05 10:20:02 +01:00
Maxime NATUREL
4dbca7858c
Adding new use cases to handle the Unified push registration
2022-12-05 09:41:23 +01:00
valere
ea37029631
Merge branch 'develop' into feature/bca/rust_flavor
2022-12-04 11:13:46 +01:00
valere
a20fd453d9
fix CI exodus/gplay
2022-12-04 10:34:41 +01:00
SpiritCroc
5aa3a4a764
Re-generate icons
...
Change-Id: I25836945ef12e1ebd2059983988e4ed44cd3d8d4
2022-12-03 15:44:11 +01:00
SpiritCroc
2f238efde0
Merge remote-tracking branch 'NathanC/themable-icons' into merge-v1.5.10
...
Change-Id: I4abbebfb8f4a322f4a5942a148b6c16a879a4044
2022-12-03 15:38:45 +01:00
Onuray Sahin
34d29dc9d7
Merge pull request #7694 from vector-im/feature/ons/unverified_sessions_alert
...
Remind unverified sessions with a banner once a week (PSG-892)
2022-12-03 14:23:10 +03:00
valere
03379a6636
Merge branch 'develop' into feature/bca/rust_flavor
2022-12-03 11:15:46 +01:00
Nathan
f32e491c72
Adds in themable icon, with beta variant
2022-12-02 23:57:57 -08:00
SpiritCroc
65be0039a5
Merge tag 'v1.5.10' into merge-v1.5.10
...
TODO: re-implement our composer constraint changes
Conflicts:
matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/summary/RoomSummaryConstants.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/ReadQueries.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/read/DefaultReadService.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/read/SetReadMarkersTask.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryUpdater.kt
vector/src/main/AndroidManifest.xml
vector/src/main/java/im/vector/app/core/session/ConfigureAndStartSessionUseCase.kt
vector/src/main/java/im/vector/app/features/home/room/detail/TimelineFragment.kt
vector/src/main/java/im/vector/app/features/home/room/detail/TimelineViewModel.kt
vector/src/main/java/im/vector/app/features/home/room/detail/composer/MessageComposerAction.kt
vector/src/main/java/im/vector/app/features/home/room/detail/composer/MessageComposerFragment.kt
vector/src/main/java/im/vector/app/features/home/room/detail/composer/PlainTextComposerLayout.kt
vector/src/main/java/im/vector/app/features/home/room/detail/composer/RichTextComposerLayout.kt
vector/src/main/java/im/vector/app/features/home/room/detail/composer/voice/VoiceMessageViews.kt
vector/src/main/java/im/vector/app/features/home/room/detail/timeline/TimelineEventController.kt
vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/CheckIfCanReplyEventUseCase.kt
vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/MessageItemFactory.kt
vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/ReadReceiptsItemFactory.kt
vector/src/main/java/im/vector/app/features/home/room/detail/timeline/format/NoticeEventFormatter.kt
vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/MessageInformationDataFactory.kt
vector/src/main/java/im/vector/app/features/html/EventHtmlRenderer.kt
vector/src/main/java/im/vector/app/features/rageshake/BugReporter.kt
vector/src/main/res/drawable/ic_voice_mic_recording.xml
vector/src/main/res/layout/composer_layout.xml
vector/src/main/res/layout/composer_layout_constraint_set_compact.xml
vector/src/main/res/layout/composer_layout_constraint_set_expanded.xml
vector/src/main/res/layout/composer_rich_text_layout_constraint_set_compact.xml
vector/src/main/res/layout/composer_rich_text_layout_constraint_set_expanded.xml
vector/src/main/res/layout/composer_rich_text_layout_constraint_set_fullscreen.xml
vector/src/main/res/layout/fragment_timeline.xml
vector/src/main/res/layout/view_voice_message_recorder.xml
vector/src/main/res/xml/vector_settings_preferences.xml
vector/src/test/java/im/vector/app/core/session/ConfigureAndStartSessionUseCaseTest.kt
Change-Id: I55e95d86b4bb019544d75dcb653afe05194cd224
2022-12-02 22:03:17 +01:00
valere
ae9711b7d1
Basic sentry e2e reporting for rust + decrypt trust
2022-12-02 18:24:23 +01:00
Onuray Sahin
4050975a19
Implement new logic for new login banner.
2022-12-02 18:15:10 +03:00
valere
cb4720f6d5
CI update for ER
2022-12-02 12:40:48 +01:00
valere
e6444fe9c0
enable analytics by default on nightly
2022-12-02 12:39:13 +01:00
dependabot[bot]
b70370b217
Bump soloader from 0.10.4 to 0.10.5
...
Bumps [soloader](https://github.com/facebook/soloader ) from 0.10.4 to 0.10.5.
- [Release notes](https://github.com/facebook/soloader/releases )
- [Commits](https://github.com/facebook/soloader/commits )
---
updated-dependencies:
- dependency-name: com.facebook.soloader:soloader
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
2022-12-01 23:02:57 +00:00
Florian Renaud
c20500ab7a
Merge pull request #7590 from vector-im/dependabot/gradle/com.adevinta.android-barista-4.3.0
...
Bump barista from 4.2.0 to 4.3.0
2022-12-01 14:34:53 +01:00
valere
a9b970832e
Merge branch 'develop' into feature/bca/rust_flavor
2022-11-30 11:05:32 +01:00
Benoit Marty
52477aa9d5
version++
2022-11-30 11:03:58 +01:00
dependabot[bot]
b58050f496
Bump kotlin-reflect from 1.7.21 to 1.7.22 ( #7665 )
...
Bumps [kotlin-reflect](https://github.com/JetBrains/kotlin ) from 1.7.21 to 1.7.22.
- [Release notes](https://github.com/JetBrains/kotlin/releases )
- [Changelog](https://github.com/JetBrains/kotlin/blob/master/ChangeLog.md )
- [Commits](https://github.com/JetBrains/kotlin/compare/v1.7.21...v1.7.22 )
---
updated-dependencies:
- dependency-name: org.jetbrains.kotlin:kotlin-reflect
dependency-type: direct:production
update-type: version-update:semver-patch
...
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>
2022-11-30 09:13:47 +00:00
SpiritCroc
39aff9f2cd
Increment version
...
Change-Id: I456b2fbb19de339bfeac941b42da1aaabab411f8
2022-11-29 09:27:11 +01:00
Benoit Marty
9ca7415f5a
Remove usage of Buildkite.
...
Build number is just removed.
Related script will need to be updated separately.
2022-11-24 14:49:55 +01:00
SpiritCroc
20081e8806
Log exit reason
...
Change-Id: I1c2e43781f41a739fdd90a74f982ae83704863b7
2022-11-19 15:43:28 +01:00
SpiritCroc
3eeca39c4b
Merge tag 'v1.5.8' into sc
...
Release 1.5.8
Change-Id: I763148cfe6bb2155682637ce4c339951441b87ce
Conflicts:
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/SyncResponseHandler.kt
vector/src/main/java/im/vector/app/features/home/room/detail/TimelineFragment.kt
vector/src/main/java/im/vector/app/features/home/room/detail/composer/MessageComposerFragment.kt
vector/src/main/java/im/vector/app/features/home/room/detail/composer/MessageComposerViewModel.kt
vector/src/main/java/im/vector/app/features/home/room/detail/timeline/TimelineEventController.kt
vector/src/main/java/im/vector/app/features/html/PillsPostProcessor.kt
vector/src/main/java/im/vector/app/features/settings/VectorPreferences.kt
vector/src/main/res/layout/fragment_timeline.xml
2022-11-18 16:11:16 +01:00
Benoit Marty
65d898e3de
version++
2022-11-17 12:57:08 +01:00
Valere
cf366f7a9c
suspend verif WIP
2022-11-16 09:12:54 +01:00
dependabot[bot]
e4caf7be81
Bump barista from 4.2.0 to 4.3.0
...
Bumps [barista](https://github.com/AdevintaSpain/Barista ) from 4.2.0 to 4.3.0.
- [Release notes](https://github.com/AdevintaSpain/Barista/releases )
- [Commits](https://github.com/AdevintaSpain/Barista/compare/4.2.0...4.3.0 )
---
updated-dependencies:
- dependency-name: com.adevinta.android:barista
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
2022-11-15 23:03:53 +00:00
Benoit Marty
f203e5ac3a
Merge pull request #7536 from vector-im/dependabot/gradle/com.google.android.gms-play-services-location-21.0.1
...
Bump play-services-location from 21.0.0 to 21.0.1
2022-11-10 16:25:51 +01:00
SpiritCroc
773df1f4cc
Merge tag 'v1.5.7' into merge-v1.5.7
...
Change-Id: I5d64f28783cb2d9a331e97ccfb5b0855fe915c6e
2022-11-10 09:55:04 +01:00
dependabot[bot]
25d33e9b1a
Bump kotlin-reflect from 1.7.20 to 1.7.21
...
Bumps [kotlin-reflect](https://github.com/JetBrains/kotlin ) from 1.7.20 to 1.7.21.
- [Release notes](https://github.com/JetBrains/kotlin/releases )
- [Changelog](https://github.com/JetBrains/kotlin/blob/master/ChangeLog.md )
- [Commits](https://github.com/JetBrains/kotlin/commits )
---
updated-dependencies:
- dependency-name: org.jetbrains.kotlin:kotlin-reflect
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
2022-11-08 23:11:03 +00:00
dependabot[bot]
3a5af934cc
Bump play-services-location from 21.0.0 to 21.0.1
...
Bumps play-services-location from 21.0.0 to 21.0.1.
---
updated-dependencies:
- dependency-name: com.google.android.gms:play-services-location
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
2022-11-07 23:15:05 +00:00
Benoit Marty
c323326a58
Version 1.5.7
2022-11-07 17:14:18 +01:00
SpiritCroc
eab87760fe
Merge tag 'v1.5.6' into sc
...
Change-Id: I4c39b35ff50c57cc9894b709a91691fa745cb0a6
Conflicts:
dependencies.gradle
matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/sync/model/RoomSync.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/RoomSummaryMapper.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryUpdater.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/handler/room/RoomSyncHandler.kt
vector-app/src/debug/java/im/vector/app/flipper/VectorFlipperProxy.kt
vector/src/main/java/im/vector/app/features/home/room/detail/composer/MessageComposerFragment.kt
vector/src/main/java/im/vector/app/features/notifications/NotificationUtils.kt
2022-11-03 09:31:58 +01:00
ganfra
404383e683
Update versions
2022-11-02 17:58:10 +01:00
ganfra
d954c9eae4
Merge pull request #6195 from vector-im/feature/bma/jitsi_5_1_0
...
Upgrade Jitsi SDK to 6.2.2
2022-11-02 12:10:25 +01:00
Amit Kumar
b6746653f1
Add metrics plugin to track device download keys task ( #7438 )
...
* Add metrics tracking plugin for download device keys
* Add support for multiple metrics plugin
* Update copyright license header in matrix-sdk-android
* Add tests for MetricExtension
* Update changelog
* Improve MetricsExtension and reformatting
2022-11-02 13:43:57 +05:30
SpiritCroc
759da1fd09
Merge tag 'v1.5.4' into merge-v1.5.4
...
Change-Id: I3028022ed007c35d0ddbd6a859bc71958b8d2146
Conflicts:
library/ui-styles/src/main/res/values/colors.xml
matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/accountdata/UserAccountDataTypes.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/LocalEchoEventFactory.kt
vector-config/src/main/res/values/config-settings.xml
vector/src/main/java/im/vector/app/SpaceStateHandler.kt
vector/src/main/java/im/vector/app/SpaceStateHandlerImpl.kt
vector/src/main/java/im/vector/app/core/di/ActiveSessionHolder.kt
vector/src/main/java/im/vector/app/features/home/HomeActivity.kt
vector/src/main/java/im/vector/app/features/home/HomeActivityViewModel.kt
vector/src/main/java/im/vector/app/features/home/HomeDrawerFragment.kt
vector/src/main/java/im/vector/app/features/home/room/detail/TimelineFragment.kt
vector/src/main/java/im/vector/app/features/home/room/detail/composer/MessageComposerView.kt
vector/src/main/java/im/vector/app/features/home/room/detail/composer/MessageComposerViewModel.kt
vector/src/main/java/im/vector/app/features/home/room/detail/composer/voice/VoiceMessageViews.kt
vector/src/main/java/im/vector/app/features/settings/labs/VectorSettingsLabsFragment.kt
vector/src/main/java/im/vector/app/features/settings/notifications/VectorSettingsNotificationPreferenceFragment.kt
vector/src/main/java/im/vector/app/features/voice/VoiceRecorderL.kt
vector/src/main/res/drawable/ic_voice_mic.xml
vector/src/main/res/layout/fragment_timeline.xml
vector/src/main/res/layout/view_voice_message_recorder.xml
vector/src/main/res/xml/vector_settings_labs.xml
2022-10-28 18:02:53 +02:00
Benoit Marty
46d1795276
Fix crash due to missing notification
...
Thread: main, Exception: java.lang.RuntimeException: Unable to start service org.jitsi.meet.sdk.JitsiMeetOngoingConferenceService@3d1f0bc with Intent { cmp=im.vector.app.debug/org.jitsi.meet.sdk.JitsiMeetOngoingConferenceService (has extras) }: java.lang.IllegalArgumentException: Invalid notification (no valid small icon): Notification(channel=JitsiOngoingConferenceChannel pri=0 contentView=null vibrate=null sound=null defaults=0x0 flags=0xa color=0x00000000 category=call actions=2 vis=PUBLIC semFlags=0x0 semPriority=0 semMissedCount=0)
2022-10-28 11:10:08 +02:00
Benoit Marty
16a5046601
Add a DebugJitsiActivity for debug build only. It's quite useless...
2022-10-27 14:34:58 +02:00
Benoit Marty
36143d6f9f
Merge pull request #7367 from vector-im/dependabot/gradle/com.google.android.gms-play-services-location-21.0.0
...
Bump play-services-location from 20.0.0 to 21.0.0
2022-10-25 11:11:40 +02:00
Nikita Fedrunov
59cf20be35
added UI tests for new App Layout's screens ( #7305 )
2022-10-24 11:01:44 +02:00