mirrors/SchildiChat-android
1
0
Fork 0
mirror of https://github.com/SchildiChat/SchildiChat-android.git synced 2024-11-29 06:28:45 +03:00
Code Issues Projects Releases Packages Wiki Activity
10341 commits 6 branches 120 tags 229 MiB
Commit graph

512 commits

Author SHA1 Message Date
Benoit Marty
2bea2de0c5
Merge pull request #3365 from vector-im/dependabot/gradle/androidx.core-core-ktx-1.5.0 
Bump core-ktx from 1.3.2 to 1.5.0
 2021-05-26 14:22:26 +02:00
Benoit Marty
526f43044e
Merge pull request #3367 from vector-im/dependabot/gradle/androidx.fragment-fragment-ktx-1.3.4 
Bump fragment-ktx from 1.3.3 to 1.3.4
 2021-05-26 14:21:18 +02:00
SpiritCroc
3b2f09e80d Merge remote-tracking branch 'AquaWolf/feature/conversations' into sc 
Change-Id: Idbbe13f56d988900ade365c3d582bd03799d245c

Conflicts:
	vector/src/main/java/im/vector/app/features/notifications/NotificationUtils.kt
 2021-05-26 10:55:56 +02:00
SpiritCroc
6c06462ec9 Merge tag 'v1.1.8' into sc 
Change-Id: Ied7cd01e47a76e9d8f546ae1c2d6f10b083c4480

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/RoomDetailViewModel.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageTextItem.kt
	vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomController.kt
	vector/src/main/java/im/vector/app/features/spaces/SpaceSummaryController.kt
 2021-05-26 10:44:19 +02:00
dependabot[bot]
2703097294
Bump daggerVersion from 2.35.1 to 2.36 
Bumps `daggerVersion` from 2.35.1 to 2.36.

Updates `dagger` from 2.35.1 to 2.36
- [Release notes](https://github.com/google/dagger/releases)
- [Changelog](https://github.com/google/dagger/blob/master/CHANGELOG.md)
- [Commits](https://github.com/google/dagger/compare/dagger-2.35.1...dagger-2.36)

Updates `dagger-compiler` from 2.35.1 to 2.36
- [Release notes](https://github.com/google/dagger/releases)
- [Changelog](https://github.com/google/dagger/blob/master/CHANGELOG.md)
- [Commits](https://github.com/google/dagger/compare/dagger-2.35.1...dagger-2.36)

Signed-off-by: dependabot[bot] <support@github.com>
 2021-05-26 06:00:27 +00:00
Benoit Marty
680837611a Version++ 2021-05-25 18:13:09 +02:00
Benoit Marty
b44c1a1c77
Merge pull request #3383 from vector-im/feature/fga/authenticated_jitsi 
Feature/fga/authenticated jitsi
 2021-05-25 10:24:54 +02:00
SpiritCroc
4f46f470d6 Increment version 
Change-Id: I08b244059c9619a0adfe900c0aac569525cee9ad
 2021-05-22 10:12:03 +02:00
Benoit Marty
a7c1dc5cd9
Merge branch 'develop' into feature/bma/login_v2 2021-05-20 15:18:18 +02:00
dependabot[bot]
ef884d84dc
Bump fragment-ktx from 1.3.3 to 1.3.4 
Bumps fragment-ktx from 1.3.3 to 1.3.4.

Signed-off-by: dependabot[bot] <support@github.com>
 2021-05-20 13:08:13 +00:00
dependabot[bot]
9b6a2c91f4
Bump core-ktx from 1.3.2 to 1.5.0 
Bumps core-ktx from 1.3.2 to 1.5.0.

Signed-off-by: dependabot[bot] <support@github.com>
 2021-05-20 13:08:12 +00:00
Benoit Marty
5d7acad75c
Merge pull request #3366 from vector-im/dependabot/gradle/androidx.appcompat-appcompat-1.3.0 
Bump appcompat from 1.2.0 to 1.3.0
 2021-05-20 15:07:27 +02:00
Benoit Marty
4ba40b1d34 Disable LoginFlowV2 to merge it on develop 2021-05-20 13:56:41 +02:00
ganfra
82c50b7c1d Jitsi auth: introduce JitsiService and JWT token creation 2021-05-19 18:19:49 +02:00
dependabot[bot]
5629d30932
Bump appcompat from 1.2.0 to 1.3.0 
Bumps appcompat from 1.2.0 to 1.3.0.

Signed-off-by: dependabot[bot] <support@github.com>
 2021-05-19 06:20:33 +00:00
dependabot[bot]
e5cc6ceba7
Bump epoxy_version from 4.5.0 to 4.6.1 
Bumps `epoxy_version` from 4.5.0 to 4.6.1.

Updates `epoxy` from 4.5.0 to 4.6.1
- [Release notes](https://github.com/airbnb/epoxy/releases)
- [Changelog](https://github.com/airbnb/epoxy/blob/master/CHANGELOG.md)
- [Commits](https://github.com/airbnb/epoxy/compare/4.5.0...4.6.1)

Updates `epoxy-glide-preloading` from 4.5.0 to 4.6.1
- [Release notes](https://github.com/airbnb/epoxy/releases)
- [Changelog](https://github.com/airbnb/epoxy/blob/master/CHANGELOG.md)
- [Commits](https://github.com/airbnb/epoxy/compare/4.5.0...4.6.1)

Updates `epoxy-processor` from 4.5.0 to 4.6.1
- [Release notes](https://github.com/airbnb/epoxy/releases)
- [Changelog](https://github.com/airbnb/epoxy/blob/master/CHANGELOG.md)
- [Commits](https://github.com/airbnb/epoxy/compare/4.5.0...4.6.1)

Updates `epoxy-paging` from 4.5.0 to 4.6.1
- [Release notes](https://github.com/airbnb/epoxy/releases)
- [Changelog](https://github.com/airbnb/epoxy/blob/master/CHANGELOG.md)
- [Commits](https://github.com/airbnb/epoxy/compare/4.5.0...4.6.1)

Signed-off-by: dependabot[bot] <support@github.com>
 2021-05-18 18:18:15 +00:00
SpiritCroc
e40bf1704b Increment version 
Change-Id: If1b871b3ab76544d87e965986a8c53b782692f8e
 2021-05-15 10:03:28 +02:00
Philipp Neumann
74b8660a44
Merge branch 'develop' into feature/conversations 2021-05-13 14:19:59 +02:00
dependabot[bot]
90f6f9f7c1
Bump libphonenumber from 8.12.22 to 8.12.23 
Bumps [libphonenumber](https://github.com/google/libphonenumber) from 8.12.22 to 8.12.23.
- [Release notes](https://github.com/google/libphonenumber/releases)
- [Changelog](https://github.com/google/libphonenumber/blob/master/making-metadata-changes.md)
- [Commits](https://github.com/google/libphonenumber/compare/v8.12.22...v8.12.23)

Signed-off-by: dependabot[bot] <support@github.com>
 2021-05-13 06:30:31 +00:00
Benoit Marty
1b84039407
Merge pull request #3288 from vector-im/dependabot/gradle/androidx.media-media-1.3.1 
Bump media from 1.3.0 to 1.3.1
 2021-05-12 20:58:23 +02:00
Benoit Marty
796bb80868
Merge pull request #3252 from vector-im/dependabot/gradle/com.github.chrisbanes-PhotoView-2.3.0 
Bump PhotoView from 2.1.4 to 2.3.0
 2021-05-12 16:51:12 +02:00
dependabot[bot]
cbd9ec33fe
Bump android-snowfall from 1.2.0 to 1.2.1 
Bumps [android-snowfall](https://github.com/JetradarMobile/android-snowfall) from 1.2.0 to 1.2.1.
- [Release notes](https://github.com/JetradarMobile/android-snowfall/releases)
- [Changelog](https://github.com/JetradarMobile/android-snowfall/blob/master/CHANGELOG.md)
- [Commits](https://github.com/JetradarMobile/android-snowfall/compare/1.2.0...1.2.1)

Signed-off-by: dependabot[bot] <support@github.com>
 2021-05-12 14:50:50 +00:00
Benoit Marty
dcc37ec292
Merge pull request #3276 from vector-im/dependabot/gradle/daggerVersion-2.35.1 
Bump daggerVersion from 2.35 to 2.35.1
 2021-05-12 16:50:39 +02:00
dependabot[bot]
58dfe0f924
Bump daggerVersion from 2.35 to 2.35.1 
Bumps `daggerVersion` from 2.35 to 2.35.1.

Updates `dagger` from 2.35 to 2.35.1
- [Release notes](https://github.com/google/dagger/releases)
- [Changelog](https://github.com/google/dagger/blob/master/CHANGELOG.md)
- [Commits](https://github.com/google/dagger/compare/dagger-2.35...dagger-2.35.1)

Updates `dagger-compiler` from 2.35 to 2.35.1
- [Release notes](https://github.com/google/dagger/releases)
- [Changelog](https://github.com/google/dagger/blob/master/CHANGELOG.md)
- [Commits](https://github.com/google/dagger/compare/dagger-2.35...dagger-2.35.1)

Signed-off-by: dependabot[bot] <support@github.com>
 2021-05-12 14:50:20 +00:00
Benoit Marty
4b87413b5f
Merge pull request #3278 from vector-im/dependabot/gradle/nl.dionsegijn-konfetti-1.3.2 
Bump konfetti from 1.2.6 to 1.3.2
 2021-05-12 16:50:10 +02:00
Benoit Marty
2709c1e99b
Merge pull request #3321 from vector-im/dependabot/gradle/com.google.firebase-firebase-messaging-22.0.0 
Bump firebase-messaging from 21.1.0 to 22.0.0
 2021-05-12 16:49:27 +02:00
Benoit Marty
a42a9b5e32 Version++ 2021-05-12 15:15:24 +02:00
dependabot[bot]
3ddf181224
Bump firebase-messaging from 21.1.0 to 22.0.0 
Bumps firebase-messaging from 21.1.0 to 22.0.0.

Signed-off-by: dependabot[bot] <support@github.com>
 2021-05-12 05:58:36 +00:00
Philipp Neumann
f7d7362a85
Merge branch 'develop' into feature/conversations 2021-05-11 09:41:04 +02:00
dependabot[bot]
711dfe41b7
Bump media from 1.3.0 to 1.3.1 
Bumps media from 1.3.0 to 1.3.1.

Signed-off-by: dependabot[bot] <support@github.com>
 2021-05-06 07:11:17 +00:00
dependabot[bot]
314ace9208
Bump konfetti from 1.2.6 to 1.3.2 
Bumps [konfetti](https://github.com/DanielMartinus/Konfetti) from 1.2.6 to 1.3.2.
- [Release notes](https://github.com/DanielMartinus/Konfetti/releases)
- [Commits](https://github.com/DanielMartinus/Konfetti/compare/v1.2.6...v1.3.2)

Signed-off-by: dependabot[bot] <support@github.com>
 2021-05-05 07:12:55 +00:00
SpiritCroc
39359f7d24 Merge remote-tracking branch 'upstream/develop' into spaces 
Change-Id: I10235a7a808ae66f5b00ad2e58c2aedf395e8e25

Conflicts:
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/summary/RoomAggregateNotificationCount.kt
	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/RoomSummaryDataSource.kt
	vector/build.gradle
	vector/src/main/java/im/vector/app/core/extensions/TimelineEvent.kt
	vector/src/main/java/im/vector/app/features/configuration/VectorConfiguration.kt
	vector/src/main/java/im/vector/app/features/home/HomeDetailFragment.kt
	vector/src/main/java/im/vector/app/features/home/HomeDetailViewModel.kt
	vector/src/main/java/im/vector/app/features/home/HomeDrawerFragment.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/MessageActionsViewModel.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/MessageInformationDataFactory.kt
	vector/src/main/java/im/vector/app/features/home/room/list/RoomListAction.kt
	vector/src/main/java/im/vector/app/features/home/room/list/RoomListFragment.kt
	vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewModel.kt
	vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewModelFactory.kt
	vector/src/main/java/im/vector/app/features/home/room/list/SectionHeaderAdapter.kt
	vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomController.kt
	vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileActivity.kt
	vector/src/main/java/im/vector/app/features/ui/SharedPreferencesUiStateRepository.kt
 2021-05-02 12:12:52 +02:00
SpiritCroc
ca21a3fc43 Increment version 
Change-Id: I046fe728801113e31b8590f7b18422d0f9f85fba
 2021-05-02 10:03:17 +02:00
dependabot[bot]
5a53838194
Bump PhotoView from 2.1.4 to 2.3.0 
Bumps [PhotoView](https://github.com/Baseflow/PhotoView) from 2.1.4 to 2.3.0.
- [Release notes](https://github.com/Baseflow/PhotoView/releases)
- [Commits](https://github.com/Baseflow/PhotoView/compare/2.1.4...2.3.0)

Signed-off-by: dependabot[bot] <support@github.com>
 2021-04-30 07:06:20 +00:00
Benoit Marty
faef2fba9a Enable login v2 by default, but keep the possibility to use v1 2021-04-29 15:57:52 +02:00
Benoit Marty
55f1f56fec master branch has been renamed to main 
Also in project vector-im/jitsi_libre_maven
 2021-04-29 12:29:52 +02:00
Benoit Marty
264eb3b0a2
Merge pull request #3246 from vector-im/dependabot/gradle/com.googlecode.libphonenumber-libphonenumber-8.12.22 
Bump libphonenumber from 8.12.21 to 8.12.22
 2021-04-29 11:12:29 +02:00
dependabot[bot]
7593c3f03d
Bump libphonenumber from 8.12.21 to 8.12.22 
Bumps [libphonenumber](https://github.com/google/libphonenumber) from 8.12.21 to 8.12.22.
- [Release notes](https://github.com/google/libphonenumber/releases)
- [Changelog](https://github.com/google/libphonenumber/blob/master/making-metadata-changes.md)
- [Commits](https://github.com/google/libphonenumber/compare/v8.12.21...v8.12.22)

Signed-off-by: dependabot[bot] <support@github.com>
 2021-04-29 07:18:14 +00:00
Valere
0d3c2b4bef Fix space filtering 2021-04-28 11:15:58 +02:00
Philipp Neumann
dd7c264483 Added shortcut for conversation notifications 2021-04-28 09:54:05 +02:00
Benoit Marty
8b5d86f68d
Merge pull request #3228 from vector-im/dependabot/gradle/com.nulab-inc-zxcvbn-1.5.0 
Bump zxcvbn from 1.4.1 to 1.5.0
 2021-04-26 21:38:10 +02:00
dependabot[bot]
49d1b3e583
Bump zxcvbn from 1.4.1 to 1.5.0 
Bumps [zxcvbn](https://github.com/nulab/zxcvbn4j) from 1.4.1 to 1.5.0.
- [Release notes](https://github.com/nulab/zxcvbn4j/releases)
- [Changelog](https://github.com/nulab/zxcvbn4j/blob/master/CHANGELOG.md)
- [Commits](https://github.com/nulab/zxcvbn4j/compare/1.4.1...1.5.0)

Signed-off-by: dependabot[bot] <support@github.com>
 2021-04-26 14:31:37 +00:00
dependabot[bot]
ed9db95aa0
Bump fragment-ktx from 1.3.2 to 1.3.3 
Bumps fragment-ktx from 1.3.2 to 1.3.3.

Signed-off-by: dependabot[bot] <support@github.com>
 2021-04-26 14:27:59 +00:00
Benoit Marty
e3a667cbc6
Merge pull request #3220 from vector-im/dependabot/gradle/daggerVersion-2.35 
Bump daggerVersion from 2.34.1 to 2.35
 2021-04-26 16:27:39 +02:00
Benoit Marty
43b17be7a7
Merge pull request #3216 from vector-im/dependabot/gradle/epoxy_version-4.5.0 
Bump epoxy_version from 4.4.4 to 4.5.0
 2021-04-26 16:26:46 +02:00
dependabot[bot]
7575959c4a
Bump daggerVersion from 2.34.1 to 2.35 
Bumps `daggerVersion` from 2.34.1 to 2.35.

Updates `dagger` from 2.34.1 to 2.35
- [Release notes](https://github.com/google/dagger/releases)
- [Changelog](https://github.com/google/dagger/blob/master/CHANGELOG.md)
- [Commits](https://github.com/google/dagger/compare/dagger-2.34.1...dagger-2.35)

Updates `dagger-compiler` from 2.34.1 to 2.35
- [Release notes](https://github.com/google/dagger/releases)
- [Changelog](https://github.com/google/dagger/blob/master/CHANGELOG.md)
- [Commits](https://github.com/google/dagger/compare/dagger-2.34.1...dagger-2.35)

Signed-off-by: dependabot[bot] <support@github.com>
 2021-04-23 07:05:44 +00:00
dependabot[bot]
bb48fea116
Bump epoxy_version from 4.4.4 to 4.5.0 
Bumps `epoxy_version` from 4.4.4 to 4.5.0.

Updates `epoxy` from 4.4.4 to 4.5.0
- [Release notes](https://github.com/airbnb/epoxy/releases)
- [Changelog](https://github.com/airbnb/epoxy/blob/master/CHANGELOG.md)
- [Commits](https://github.com/airbnb/epoxy/compare/4.4.4...4.5.0)

Updates `epoxy-glide-preloading` from 4.4.4 to 4.5.0
- [Release notes](https://github.com/airbnb/epoxy/releases)
- [Changelog](https://github.com/airbnb/epoxy/blob/master/CHANGELOG.md)
- [Commits](https://github.com/airbnb/epoxy/compare/4.4.4...4.5.0)

Updates `epoxy-processor` from 4.4.4 to 4.5.0
- [Release notes](https://github.com/airbnb/epoxy/releases)
- [Changelog](https://github.com/airbnb/epoxy/blob/master/CHANGELOG.md)
- [Commits](https://github.com/airbnb/epoxy/compare/4.4.4...4.5.0)

Updates `epoxy-paging` from 4.4.4 to 4.5.0
- [Release notes](https://github.com/airbnb/epoxy/releases)
- [Changelog](https://github.com/airbnb/epoxy/blob/master/CHANGELOG.md)
- [Commits](https://github.com/airbnb/epoxy/compare/4.4.4...4.5.0)

Signed-off-by: dependabot[bot] <support@github.com>
 2021-04-20 17:59:41 +00:00
Benoit Marty
fe9bd38115
Merge pull request #3175 from vector-im/dependabot/gradle/daggerVersion-2.34.1 
Bump daggerVersion from 2.34 to 2.34.1
 2021-04-20 19:58:48 +02:00
Benoit Marty
47134c39af
Merge pull request #3174 from vector-im/dependabot/gradle/big_image_viewer_version-1.8.0 
Bump big_image_viewer_version from 1.7.1 to 1.8.0
 2021-04-20 19:58:36 +02:00
Benoit Marty
5e3d8a5424
Merge pull request #3173 from vector-im/dependabot/gradle/com.nulab-inc-zxcvbn-1.4.1 
Bump zxcvbn from 1.4.0 to 1.4.1
 2021-04-20 19:58:12 +02:00
SpiritCroc
2ae0fb8886 Merge tag 'v1.1.6' into sc 
Change-Id: I80d2ce9bdcb22c2fcc9795d3a5c727cb5ba772a6
 2021-04-16 15:32:18 +02:00
Benoit Marty
19427fbfec merge hotfix to develop 2021-04-16 14:36:15 +02:00
Benoit Marty
72515ee635 Prepare corrective release 1.1.6 2021-04-16 14:33:00 +02:00
SpiritCroc
28c5f036c8 Merge tag 'v1.1.5' into sc 
Change-Id: I263852c42cfa21935890bee435f063d7fa43edfa
 2021-04-15 12:29:59 +02:00
Benoit Marty
9565e8975e merge hotfix to develop 2021-04-15 11:09:58 +02:00
Benoit Marty
59637c4a6b Revert to Realm 10.3.1 to fix issue with migration 
Waiting for https://github.com/realm/realm-java/issues/7402
 2021-04-14 21:54:07 +02:00
dependabot[bot]
30b415e77e
Bump daggerVersion from 2.34 to 2.34.1 
Bumps `daggerVersion` from 2.34 to 2.34.1.

Updates `dagger` from 2.34 to 2.34.1
- [Release notes](https://github.com/google/dagger/releases)
- [Changelog](https://github.com/google/dagger/blob/master/CHANGELOG.md)
- [Commits](https://github.com/google/dagger/compare/dagger-2.34...dagger-2.34.1)

Updates `dagger-compiler` from 2.34 to 2.34.1
- [Release notes](https://github.com/google/dagger/releases)
- [Changelog](https://github.com/google/dagger/blob/master/CHANGELOG.md)
- [Commits](https://github.com/google/dagger/compare/dagger-2.34...dagger-2.34.1)

Signed-off-by: dependabot[bot] <support@github.com>
 2021-04-14 07:09:19 +00:00
dependabot[bot]
39f304a57b
Bump big_image_viewer_version from 1.7.1 to 1.8.0 
Bumps `big_image_viewer_version` from 1.7.1 to 1.8.0.

Updates `BigImageViewer` from 1.7.1 to 1.8.0
- [Release notes](https://github.com/Piasy/BigImageViewer/releases)
- [Changelog](https://github.com/Piasy/BigImageViewer/blob/master/CHANGELOG.md)
- [Commits](https://github.com/Piasy/BigImageViewer/commits)

Updates `GlideImageLoader` from 1.7.1 to 1.8.0
- [Release notes](https://github.com/Piasy/BigImageViewer/releases)
- [Changelog](https://github.com/Piasy/BigImageViewer/blob/master/CHANGELOG.md)
- [Commits](https://github.com/Piasy/BigImageViewer/commits)

Updates `ProgressPieIndicator` from 1.7.1 to 1.8.0
- [Release notes](https://github.com/Piasy/BigImageViewer/releases)
- [Changelog](https://github.com/Piasy/BigImageViewer/blob/master/CHANGELOG.md)
- [Commits](https://github.com/Piasy/BigImageViewer/commits)

Updates `GlideImageViewFactory` from 1.7.1 to 1.8.0
- [Release notes](https://github.com/Piasy/BigImageViewer/releases)
- [Changelog](https://github.com/Piasy/BigImageViewer/blob/master/CHANGELOG.md)
- [Commits](https://github.com/Piasy/BigImageViewer/commits)

Signed-off-by: dependabot[bot] <support@github.com>
 2021-04-14 07:09:03 +00:00
dependabot[bot]
afe617357d
Bump zxcvbn from 1.4.0 to 1.4.1 
Bumps [zxcvbn](https://github.com/nulab/zxcvbn4j) from 1.4.0 to 1.4.1.
- [Release notes](https://github.com/nulab/zxcvbn4j/releases)
- [Changelog](https://github.com/nulab/zxcvbn4j/blob/master/CHANGELOG.md)
- [Commits](https://github.com/nulab/zxcvbn4j/compare/1.4.0...1.4.1)

Signed-off-by: dependabot[bot] <support@github.com>
 2021-04-14 07:08:48 +00:00
SpiritCroc
0e601aa8f0 Merge tag 'v1.1.4' into sc 
Note: this merge needs more work, since upstream changed implementations
affecting following features:
- Mark unread
- Notification count badges
- Overview list filtering / combined overview
- Remember expanded categories
- Read receipt layout

Change-Id: If728bb54dd7c423b57bd3f59d23d86a1a0e5e435

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/database/model/RoomSummaryEntity.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/RoomAvatarResolver.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/user/accountdata/AccountDataAPI.kt
	vector/src/main/java/im/vector/app/core/resources/UserPreferencesProvider.kt
	vector/src/main/java/im/vector/app/core/utils/Emoji.kt
	vector/src/main/java/im/vector/app/features/home/HomeDetailViewModel.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/MessageInformationDataFactory.kt
	vector/src/main/java/im/vector/app/features/home/room/list/RoomListAction.kt
	vector/src/main/java/im/vector/app/features/home/room/list/RoomListFragment.kt
	vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewModel.kt
	vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewState.kt
	vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryController.kt
	vector/src/main/res/layout/item_timeline_event_base.xml
	vector/src/main/res/layout/item_timeline_event_base_state.xml
 2021-04-13 09:28:13 +02:00
SpiritCroc
d329f08162 Increment version 
Change-Id: Ieeae5d0355183e5fadd8a0303514d8af9d7301a5
 2021-04-12 10:57:35 +02:00
Benoit Marty
6d46bfc260
Merge pull request #3148 from vector-im/dependabot/gradle/com.google.firebase-firebase-messaging-21.1.0 
Bump firebase-messaging from 21.0.1 to 21.1.0
 2021-04-09 16:39:05 +02:00
Benoit Marty
d40f2ef463
Merge pull request #3139 from vector-im/dependabot/gradle/androidx.recyclerview-recyclerview-1.2.0 
Bump recyclerview from 1.2.0-rc01 to 1.2.0
 2021-04-09 16:38:53 +02:00
Benoit Marty
8d1b56d526
Merge pull request #3138 from vector-im/dependabot/gradle/androidx.media-media-1.3.0 
Bump media from 1.2.1 to 1.3.0
 2021-04-09 16:38:39 +02:00
Benoit Marty
388e4eb112
Merge pull request #3137 from vector-im/dependabot/gradle/daggerVersion-2.34 
Bump daggerVersion from 2.33 to 2.34
 2021-04-09 16:38:25 +02:00
Benoit Marty
bec6cfc46d Version++ 2021-04-09 12:42:59 +02:00
Marcus Hoffmann
1f37da276e propagate jitsi LIBRE_BUILD exclusion rules to not pull in gms libs 
Previously jitsi only had optional dependencies being disabled by the
LIBRE build flag but a while ago they introduced optional exclusion
rules which don't transitively propagate to consumers of the library, so
instead we need to mirror the exclusion rules from the jitsi gradle file:
See: 7a64bf006e/android/sdk/build.gradle (L53)

Signed-off-by: Marcus Hoffmann <bubu@bubu1.eu>
Change-Id: Ifadfef30a6b3f3040e98713fa21dbc4e2ee94a9b
 2021-04-09 12:25:47 +02:00
SpiritCroc
6aa6f3e01b Merge tag 'v1.1.3' into sc 
Change-Id: I50f78eeec11fc4d606ddabb68d08a5ff97bbad13

Conflicts:
	vector/src/main/res/layout/item_bottom_sheet_message_preview.xml
 2021-04-09 11:57:11 +02:00
dependabot[bot]
b5b651244b
Bump firebase-messaging from 21.0.1 to 21.1.0 
Bumps firebase-messaging from 21.0.1 to 21.1.0.

Signed-off-by: dependabot[bot] <support@github.com>
 2021-04-09 07:25:53 +00:00
dependabot[bot]
68efa63de4
Bump recyclerview from 1.2.0-rc01 to 1.2.0 
Bumps recyclerview from 1.2.0-rc01 to 1.2.0.

Signed-off-by: dependabot[bot] <support@github.com>
 2021-04-08 07:22:33 +00:00
dependabot[bot]
3ca00969c5
Bump media from 1.2.1 to 1.3.0 
Bumps media from 1.2.1 to 1.3.0.

Signed-off-by: dependabot[bot] <support@github.com>
 2021-04-08 07:22:02 +00:00
dependabot[bot]
505b01ad97
Bump daggerVersion from 2.33 to 2.34 
Bumps `daggerVersion` from 2.33 to 2.34.

Updates `dagger` from 2.33 to 2.34
- [Release notes](https://github.com/google/dagger/releases)
- [Changelog](https://github.com/google/dagger/blob/master/CHANGELOG.md)
- [Commits](https://github.com/google/dagger/compare/dagger-2.33...dagger-2.34)

Updates `dagger-compiler` from 2.33 to 2.34
- [Release notes](https://github.com/google/dagger/releases)
- [Changelog](https://github.com/google/dagger/blob/master/CHANGELOG.md)
- [Commits](https://github.com/google/dagger/compare/dagger-2.33...dagger-2.34)

Signed-off-by: dependabot[bot] <support@github.com>
 2021-04-08 07:19:20 +00:00
Marcus Hoffmann
62038e8a89 propagate jitsi LIBRE_BUILD exclusion rules to not pull in gms libs 
Previously jitsi only had optional dependencies being disabled by the
LIBRE build flag but a while ago they introduced optional exclusion
rules which don't transitively propagate to consumers of the library, so
instead we need to mirror the exclusion rules from the jitsi gradle file:
See: 7a64bf006e/android/sdk/build.gradle (L53)

Signed-off-by: Marcus Hoffmann <bubu@bubu1.eu>
 2021-04-06 20:55:48 +02:00
Benoit Marty
7d88d038f5
Merge pull request #3102 from vector-im/dependabot/gradle/moshi_version-1.12.0 
Bump moshi_version from 1.11.0 to 1.12.0
 2021-04-06 14:22:12 +02:00
dependabot[bot]
0addb3aeee
Bump libphonenumber from 8.12.20 to 8.12.21 
Bumps [libphonenumber](https://github.com/google/libphonenumber) from 8.12.20 to 8.12.21.
- [Release notes](https://github.com/google/libphonenumber/releases)
- [Changelog](https://github.com/google/libphonenumber/blob/master/making-metadata-changes.md)
- [Commits](https://github.com/google/libphonenumber/compare/v8.12.20...v8.12.21)

Signed-off-by: dependabot[bot] <support@github.com>
 2021-04-06 07:20:12 +00:00
dependabot[bot]
fcc635ac8f
Bump moshi_version from 1.11.0 to 1.12.0 
Bumps `moshi_version` from 1.11.0 to 1.12.0.

Updates `moshi-adapters` from 1.11.0 to 1.12.0
- [Release notes](https://github.com/square/moshi/releases)
- [Changelog](https://github.com/square/moshi/blob/master/CHANGELOG.md)
- [Commits](https://github.com/square/moshi/compare/moshi-parent-1.11.0...parent-1.12.0)

Updates `moshi-kotlin-codegen` from 1.11.0 to 1.12.0
- [Release notes](https://github.com/square/moshi/releases)
- [Changelog](https://github.com/square/moshi/blob/master/CHANGELOG.md)
- [Commits](https://github.com/square/moshi/compare/moshi-parent-1.11.0...parent-1.12.0)

Signed-off-by: dependabot[bot] <support@github.com>
 2021-04-02 07:19:53 +00:00
Benoit Marty
c0913711d6
Merge pull request #3059 from vector-im/dependabot/gradle/epoxy_version-4.4.4 
Bump epoxy_version from 4.4.3 to 4.4.4
 2021-03-31 17:57:05 +02:00
dependabot[bot]
57df510ecb
Bump stetho from 1.5.1 to 1.6.0 
Bumps [stetho](https://github.com/facebook/stetho) from 1.5.1 to 1.6.0.
- [Release notes](https://github.com/facebook/stetho/releases)
- [Changelog](https://github.com/facebook/stetho/blob/master/CHANGELOG.md)
- [Commits](https://github.com/facebook/stetho/compare/v1.5.1...v1.6.0)

Signed-off-by: dependabot[bot] <support@github.com>
 2021-03-31 06:58:20 +00:00
dependabot[bot]
980d057b4a
Bump epoxy_version from 4.4.3 to 4.4.4 
Bumps `epoxy_version` from 4.4.3 to 4.4.4.

Updates `epoxy` from 4.4.3 to 4.4.4
- [Release notes](https://github.com/airbnb/epoxy/releases)
- [Changelog](https://github.com/airbnb/epoxy/blob/master/CHANGELOG.md)
- [Commits](https://github.com/airbnb/epoxy/compare/4.4.3...4.4.4)

Updates `epoxy-glide-preloading` from 4.4.3 to 4.4.4
- [Release notes](https://github.com/airbnb/epoxy/releases)
- [Changelog](https://github.com/airbnb/epoxy/blob/master/CHANGELOG.md)
- [Commits](https://github.com/airbnb/epoxy/compare/4.4.3...4.4.4)

Updates `epoxy-processor` from 4.4.3 to 4.4.4
- [Release notes](https://github.com/airbnb/epoxy/releases)
- [Changelog](https://github.com/airbnb/epoxy/blob/master/CHANGELOG.md)
- [Commits](https://github.com/airbnb/epoxy/compare/4.4.3...4.4.4)

Updates `epoxy-paging` from 4.4.3 to 4.4.4
- [Release notes](https://github.com/airbnb/epoxy/releases)
- [Changelog](https://github.com/airbnb/epoxy/blob/master/CHANGELOG.md)
- [Commits](https://github.com/airbnb/epoxy/compare/4.4.3...4.4.4)

Signed-off-by: dependabot[bot] <support@github.com>
 2021-03-29 14:46:27 +00:00
Benoit Marty
11a56dacb6
Merge pull request #3054 from vector-im/dependabot/gradle/androidx.fragment-fragment-ktx-1.3.2 
Bump fragment-ktx from 1.3.0 to 1.3.2
 2021-03-25 13:57:02 +01:00
dependabot[bot]
ee1059f1db
Bump fragment-ktx from 1.3.0 to 1.3.2 
Bumps fragment-ktx from 1.3.0 to 1.3.2.

Signed-off-by: dependabot[bot] <support@github.com>
 2021-03-25 06:33:50 +00:00
dependabot[bot]
30515492ca
Bump recyclerview from 1.2.0-beta02 to 1.2.0-rc01 
Bumps recyclerview from 1.2.0-beta02 to 1.2.0-rc01.

Signed-off-by: dependabot[bot] <support@github.com>
 2021-03-25 06:31:57 +00:00
dependabot[bot]
973e111dad
Bump epoxy_version from 4.4.2 to 4.4.3 
Bumps `epoxy_version` from 4.4.2 to 4.4.3.

Updates `epoxy` from 4.4.2 to 4.4.3
- [Release notes](https://github.com/airbnb/epoxy/releases)
- [Changelog](https://github.com/airbnb/epoxy/blob/master/CHANGELOG.md)
- [Commits](https://github.com/airbnb/epoxy/commits)

Updates `epoxy-glide-preloading` from 4.4.2 to 4.4.3
- [Release notes](https://github.com/airbnb/epoxy/releases)
- [Changelog](https://github.com/airbnb/epoxy/blob/master/CHANGELOG.md)
- [Commits](https://github.com/airbnb/epoxy/commits)

Updates `epoxy-processor` from 4.4.2 to 4.4.3
- [Release notes](https://github.com/airbnb/epoxy/releases)
- [Changelog](https://github.com/airbnb/epoxy/blob/master/CHANGELOG.md)
- [Commits](https://github.com/airbnb/epoxy/commits)

Updates `epoxy-paging` from 4.4.2 to 4.4.3
- [Release notes](https://github.com/airbnb/epoxy/releases)
- [Changelog](https://github.com/airbnb/epoxy/blob/master/CHANGELOG.md)
- [Commits](https://github.com/airbnb/epoxy/commits)

Signed-off-by: dependabot[bot] <support@github.com>
 2021-03-18 12:12:17 +00:00
Benoit Marty
2f2bc758d7
Merge pull request #3022 from vector-im/dependabot/gradle/com.googlecode.libphonenumber-libphonenumber-8.12.20 
Bump libphonenumber from 8.12.19 to 8.12.20
 2021-03-18 13:11:41 +01:00
Benoit Marty
3078adf0da Version++ 2021-03-18 10:40:33 +01:00
dependabot[bot]
8e85d5515d
Bump libphonenumber from 8.12.19 to 8.12.20 
Bumps [libphonenumber](https://github.com/google/libphonenumber) from 8.12.19 to 8.12.20.
- [Release notes](https://github.com/google/libphonenumber/releases)
- [Changelog](https://github.com/google/libphonenumber/blob/master/making-metadata-changes.md)
- [Commits](https://github.com/google/libphonenumber/compare/v8.12.19...v8.12.20)

Signed-off-by: dependabot[bot] <support@github.com>
 2021-03-18 07:18:33 +00:00
Benoit Marty
5edf7ca520 Version++ 2021-03-16 22:31:25 +01:00
SpiritCroc
699ad4eaeb Merge tag 'v1.1.1' into sc 
Conflicts:
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt
	vector/src/main/AndroidManifest.xml
	vector/src/main/java/im/vector/app/core/epoxy/bottomsheet/BottomSheetRoomPreviewItem.kt
	vector/src/main/java/im/vector/app/features/home/HomeActivity.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/MessageInformationDataFactory.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/AbsMessageItem.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageFileItem.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageImageVideoItem.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageInformationData.kt
	vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileController.kt
	vector/src/main/res/drawable/rounded_rect_shape.xml
	vector/src/main/res/menu/menu_timeline.xml
	vector/src/main/res/values/array.xml
	vector/src/main/res/xml/vector_settings_preferences.xml
 2021-03-14 10:58:57 +01:00
Benoit Marty
b5fa61c8aa
Merge pull request #2983 from vector-im/dependabot/gradle/com.schibsted.spain-barista-3.9.0 
Bump barista from 3.8.0 to 3.9.0
 2021-03-11 22:44:54 +01:00
Benoit Marty
4b8c59a23b Fix crash on ViewSource of event 2021-03-11 14:14:55 +01:00
dependabot[bot]
507eba3ddb
Bump barista from 3.8.0 to 3.9.0 
Bumps barista from 3.8.0 to 3.9.0.

Signed-off-by: dependabot[bot] <support@github.com>
 2021-03-10 21:08:12 +00:00
Benoit Marty
4e3ad91c67 Version++ 2021-03-10 22:05:31 +01:00
Benoit Marty
263ad899d8 Setup com.likethesalad.android:string-reference to have compilation time build of Strings resource with the app_name 2021-03-03 17:30:57 +01:00
Onuray Sahin
8b39eabc0f Code review fixes. 2021-03-02 18:50:43 +01:00
Onuray Sahin
a623395585 Code review fixes. 2021-03-02 18:50:43 +01:00
Onuray Sahin
ae648c3e11 Make outbound key sharing strategy configurable. 2021-03-02 18:49:11 +01:00
dependabot[bot]
a9f923591d
Bump barista from 3.7.0 to 3.8.0 
Bumps barista from 3.7.0 to 3.8.0.

Signed-off-by: dependabot[bot] <support@github.com>
 2021-03-02 15:32:08 +00:00
Benoit Marty
7d7e4a0e6d
Merge pull request #2945 from vector-im/dependabot/gradle/big_image_viewer_version-1.7.1 
Bump big_image_viewer_version from 1.7.0 to 1.7.1
 2021-03-02 16:30:57 +01:00
dependabot[bot]
161804be0d
Bump big_image_viewer_version from 1.7.0 to 1.7.1 
Bumps `big_image_viewer_version` from 1.7.0 to 1.7.1.

Updates `BigImageViewer` from 1.7.0 to 1.7.1
- [Release notes](https://github.com/Piasy/BigImageViewer/releases)
- [Changelog](https://github.com/Piasy/BigImageViewer/blob/master/CHANGELOG.md)
- [Commits](https://github.com/Piasy/BigImageViewer/compare/1.7.0...v1.7.1)

Updates `GlideImageLoader` from 1.7.0 to 1.7.1
- [Release notes](https://github.com/Piasy/BigImageViewer/releases)
- [Changelog](https://github.com/Piasy/BigImageViewer/blob/master/CHANGELOG.md)
- [Commits](https://github.com/Piasy/BigImageViewer/compare/1.7.0...v1.7.1)

Updates `ProgressPieIndicator` from 1.7.0 to 1.7.1
- [Release notes](https://github.com/Piasy/BigImageViewer/releases)
- [Changelog](https://github.com/Piasy/BigImageViewer/blob/master/CHANGELOG.md)
- [Commits](https://github.com/Piasy/BigImageViewer/compare/1.7.0...v1.7.1)

Updates `GlideImageViewFactory` from 1.7.0 to 1.7.1
- [Release notes](https://github.com/Piasy/BigImageViewer/releases)
- [Changelog](https://github.com/Piasy/BigImageViewer/blob/master/CHANGELOG.md)
- [Commits](https://github.com/Piasy/BigImageViewer/compare/1.7.0...v1.7.1)

Signed-off-by: dependabot[bot] <support@github.com>
 2021-03-02 10:39:41 +00:00
Benoit Marty
32e7845c2b
Merge pull request #2943 from vector-im/dependabot/gradle/com.googlecode.libphonenumber-libphonenumber-8.12.19 
Bump libphonenumber from 8.12.18 to 8.12.19
 2021-03-02 11:39:38 +01:00