mirrors/SchildiChat-android
1
0
Fork 0
mirror of https://github.com/SchildiChat/SchildiChat-android.git synced 2024-11-22 01:15:54 +03:00
Code Issues Projects Releases Packages Wiki Activity
20271 commits 6 branches 120 tags 229 MiB
Commit graph

191 commits

Author SHA1 Message Date
dependabot[bot]
53c0609c38
Bump mavericks from 2.6.1 to 2.7.0 
Bumps `mavericks` from 2.6.1 to 2.7.0.

Updates `mavericks` from 2.6.1 to 2.7.0
- [Release notes](https://github.com/airbnb/mavericks/releases)
- [Changelog](https://github.com/airbnb/mavericks/blob/main/CHANGELOG.md)
- [Commits](https://github.com/airbnb/mavericks/commits)

Updates `mavericks-testing` from 2.6.1 to 2.7.0
- [Release notes](https://github.com/airbnb/mavericks/releases)
- [Changelog](https://github.com/airbnb/mavericks/blob/main/CHANGELOG.md)
- [Commits](https://github.com/airbnb/mavericks/commits)

---
updated-dependencies:
- dependency-name: com.airbnb.android:mavericks
  dependency-type: direct:production
  update-type: version-update:semver-minor
- dependency-name: com.airbnb.android:mavericks-testing
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-06-13 15:37:13 +00:00
sim
04b297b261 Add UnifiedPush support 2022-06-09 10:16:59 +02:00
dependabot[bot]
524dcbb3d1
Bump core-ktx from 1.7.0 to 1.8.0 
Bumps core-ktx from 1.7.0 to 1.8.0.

---
updated-dependencies:
- dependency-name: androidx.core:core-ktx
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-06-02 10:50:27 +00:00
dependabot[bot]
7c50720b76
Bump appcompat from 1.4.1 to 1.4.2 
Bumps appcompat from 1.4.1 to 1.4.2.

---
updated-dependencies:
- dependency-name: androidx.appcompat:appcompat
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-06-01 23:19:50 +00:00
SpiritCroc
49663a1154 Merge tag 'v1.4.18' into sc 
Change-Id: I58667aa99a8eb99b0b1e7f0784d811061c2086a5

Conflicts:
	dependencies.gradle
	library/attachment-viewer/build.gradle
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomSummary.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/summary/RoomSummaryDataSource.kt
	vector/src/fdroid/java/im/vector/app/push/fcm/FcmHelper.kt
	vector/src/gplay/java/im/vector/app/gplay/push/fcm/VectorFirebaseMessagingService.kt
	vector/src/gplay/java/im/vector/app/push/fcm/FcmHelper.kt
	vector/src/main/java/im/vector/app/AppStateHandler.kt
	vector/src/main/java/im/vector/app/core/pushers/PushersManager.kt
	vector/src/main/java/im/vector/app/core/utils/Emoji.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/UnreadMessagesSharedViewModel.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/MessageLocationItem.kt
	vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryItem.kt
	vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryItemFactory.kt
	vector/src/main/java/im/vector/app/features/media/ImageContentRenderer.kt
	vector/src/main/res/xml/vector_settings_labs.xml
 2022-06-01 13:54:34 +02:00
dependabot[bot]
5934043d17
Bump material from 1.6.0 to 1.6.1 
Bumps [material](https://github.com/material-components/material-components-android) from 1.6.0 to 1.6.1.
- [Release notes](https://github.com/material-components/material-components-android/releases)
- [Commits](https://github.com/material-components/material-components-android/compare/1.6.0...1.6.1)

---
updated-dependencies:
- dependency-name: com.google.android.material:material
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-05-31 23:06:50 +00:00
dependabot[bot]
cb3e2b6a0c
Bump activity from 1.2.4 to 1.4.0 
Bumps activity from 1.2.4 to 1.4.0.

---
updated-dependencies:
- dependency-name: androidx.activity:activity
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-05-30 14:23:11 +00:00
Benoit Marty
0806e7358a
Merge pull request #5780 from ofalvai/dependency-cleanup 
Remove unused dependencies
 2022-05-30 15:41:10 +02:00
Benoit Marty
a94bea3b91
Merge pull request #6173 from vector-im/dependabot/gradle/kotlinCoroutines-1.6.2 
Bump kotlinCoroutines from 1.6.1 to 1.6.2
 2022-05-30 14:23:22 +02:00
dependabot[bot]
174e1fe332
Bump vanniktechEmoji from 0.13.0 to 0.15.0 
Bumps `vanniktechEmoji` from 0.13.0 to 0.15.0.

Updates `emoji-material` from 0.13.0 to 0.15.0
- [Release notes](https://github.com/vanniktech/Emoji/releases)
- [Changelog](https://github.com/vanniktech/Emoji/blob/master/CHANGELOG.md)
- [Commits](https://github.com/vanniktech/Emoji/compare/0.13.0...0.15.0)

Updates `emoji-google` from 0.13.0 to 0.15.0
- [Release notes](https://github.com/vanniktech/Emoji/releases)
- [Changelog](https://github.com/vanniktech/Emoji/blob/master/CHANGELOG.md)
- [Commits](https://github.com/vanniktech/Emoji/compare/0.13.0...0.15.0)

---
updated-dependencies:
- dependency-name: com.vanniktech:emoji-material
  dependency-type: direct:production
  update-type: version-update:semver-minor
- dependency-name: com.vanniktech:emoji-google
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-05-30 07:40:59 +00:00
dependabot[bot]
ff1dbf6f22
Bump kotlinCoroutines from 1.6.1 to 1.6.2 
Bumps `kotlinCoroutines` from 1.6.1 to 1.6.2.

Updates `kotlinx-coroutines-core` from 1.6.1 to 1.6.2
- [Release notes](https://github.com/Kotlin/kotlinx.coroutines/releases)
- [Changelog](https://github.com/Kotlin/kotlinx.coroutines/blob/master/CHANGES.md)
- [Commits](https://github.com/Kotlin/kotlinx.coroutines/compare/1.6.1...1.6.2)

Updates `kotlinx-coroutines-android` from 1.6.1 to 1.6.2
- [Release notes](https://github.com/Kotlin/kotlinx.coroutines/releases)
- [Changelog](https://github.com/Kotlin/kotlinx.coroutines/blob/master/CHANGES.md)
- [Commits](https://github.com/Kotlin/kotlinx.coroutines/compare/1.6.1...1.6.2)

Updates `kotlinx-coroutines-test` from 1.6.1 to 1.6.2
- [Release notes](https://github.com/Kotlin/kotlinx.coroutines/releases)
- [Changelog](https://github.com/Kotlin/kotlinx.coroutines/blob/master/CHANGES.md)
- [Commits](https://github.com/Kotlin/kotlinx.coroutines/compare/1.6.1...1.6.2)

---
updated-dependencies:
- dependency-name: org.jetbrains.kotlinx:kotlinx-coroutines-core
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: org.jetbrains.kotlinx:kotlinx-coroutines-android
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: org.jetbrains.kotlinx:kotlinx-coroutines-test
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-05-27 23:05:23 +00:00
Olivér Falvai
9ce9ad6d3a Merge remote-tracking branch 'origin/develop' into dependency-cleanup 2022-05-26 14:04:39 +02:00
Adam Brown
fdaaed430e
Merge pull request #6131 from vector-im/dependabot/gradle/vanniktechEmoji-0.13.0 
Bump vanniktechEmoji from 0.9.0 to 0.13.0
 2022-05-25 10:14:56 +01:00
Adam Brown
b9853d1aec excluding the gms play-service-location optional transistive dependency for the fdroid variant 
- fixes fdroid being unable to compile the project due to a non foss dependency

Change-Id: Ia24c07337f3da0de83b952e6e0082cf18acab357
 2022-05-25 10:56:35 +02:00
Adam Brown
ae9922a731
Merge pull request #6136 from vector-im/feature/adm/foss-avoid-gms-location-provider 
Excluding the gms play-service-location from maplibre for fdroid builds
 2022-05-25 08:59:18 +01:00
Michael Kaye
5faa2ff205 Add comment linking to an issue 2022-05-24 16:53:17 +01:00
Michael Kaye
5766414d79 Downgrade gradle from 7.2.0 to 7.1.3 2022-05-24 16:36:14 +01:00
dependabot[bot]
d4af2a7a87
Bump vanniktechEmoji from 0.9.0 to 0.13.0 
Bumps `vanniktechEmoji` from 0.9.0 to 0.13.0.

Updates `emoji-material` from 0.9.0 to 0.13.0
- [Release notes](https://github.com/vanniktech/Emoji/releases)
- [Changelog](https://github.com/vanniktech/Emoji/blob/master/CHANGELOG.md)
- [Commits](https://github.com/vanniktech/Emoji/compare/0.9.0...0.13.0)

Updates `emoji-google` from 0.9.0 to 0.13.0
- [Release notes](https://github.com/vanniktech/Emoji/releases)
- [Changelog](https://github.com/vanniktech/Emoji/blob/master/CHANGELOG.md)
- [Commits](https://github.com/vanniktech/Emoji/compare/0.9.0...0.13.0)

---
updated-dependencies:
- dependency-name: com.vanniktech:emoji-material
  dependency-type: direct:production
  update-type: version-update:semver-minor
- dependency-name: com.vanniktech:emoji-google
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-05-24 15:26:52 +00:00
Adam Brown
b4b2b97eb1
Merge pull request #6068 from vector-im/dependabot/gradle/vanniktechEmoji-0.12.0 
Bump vanniktechEmoji from 0.9.0 to 0.12.0
 2022-05-24 16:26:06 +01:00
Adam Brown
bec72264cd excluding the gms play-service-location optional transistive dependency for the fdroid variant 
- fixes fdroid being unable to compile the project due to a non foss dependency
 2022-05-24 10:10:03 +01:00
dependabot[bot]
13175212a0
Bump constraintlayout from 2.1.3 to 2.1.4 
Bumps [constraintlayout](https://github.com/androidx/constraintlayout) from 2.1.3 to 2.1.4.
- [Release notes](https://github.com/androidx/constraintlayout/releases)
- [Commits](https://github.com/androidx/constraintlayout/commits)

---
updated-dependencies:
- dependency-name: androidx.constraintlayout:constraintlayout
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-05-20 09:55:29 +00:00
Olivér Falvai
2dcc120cf7 Merge remote-tracking branch 'origin/develop' into dependency-cleanup 
# Conflicts:
#	build.gradle
#	dependencies.gradle
 2022-05-18 11:47:21 +02:00
SpiritCroc
4f60963741 Merge tag 'v1.4.16' into sc 
Change-Id: Ibfb03ebf80dc1403fa438a390f609f2201602ba9

Conflicts:
	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/session/room/timeline/DefaultTimeline.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/notifications/NotificationUtils.kt
	vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomController.kt
	vector/src/main/java/im/vector/app/features/roommemberprofile/RoomMemberProfileController.kt
	vector/src/main/java/im/vector/app/features/settings/VectorPreferences.kt
	vector/src/main/java/im/vector/app/features/settings/troubleshoot/TestTokenRegistration.kt
	vector/src/main/res/drawable/ic_settings_root_flair.xml
	vector/src/main/res/layout/fragment_timeline.xml
	vector/src/main/res/xml/vector_settings_labs.xml
 2022-05-18 09:59:01 +02:00
dependabot[bot]
271bc91303
Bump vanniktechEmoji from 0.9.0 to 0.12.0 
Bumps `vanniktechEmoji` from 0.9.0 to 0.12.0.

Updates `emoji-material` from 0.9.0 to 0.12.0
- [Release notes](https://github.com/vanniktech/Emoji/releases)
- [Changelog](https://github.com/vanniktech/Emoji/blob/master/CHANGELOG.md)
- [Commits](https://github.com/vanniktech/Emoji/compare/0.9.0...0.12.0)

Updates `emoji-google` from 0.9.0 to 0.12.0
- [Release notes](https://github.com/vanniktech/Emoji/releases)
- [Changelog](https://github.com/vanniktech/Emoji/blob/master/CHANGELOG.md)
- [Commits](https://github.com/vanniktech/Emoji/compare/0.9.0...0.12.0)

---
updated-dependencies:
- dependency-name: com.vanniktech:emoji-material
  dependency-type: direct:production
  update-type: version-update:semver-minor
- dependency-name: com.vanniktech:emoji-google
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-05-16 23:08:43 +00:00
Benoit Marty
4123da8ebc
Merge pull request #5981 from vector-im/dependabot/gradle/kotlinCoroutines-1.6.1 
Bump kotlinCoroutines from 1.6.0 to 1.6.1
 2022-05-16 07:13:56 +02:00
dependabot[bot]
d3ecc8e5c3
Bump mockk from 1.12.3 to 1.12.4 
Bumps `mockk` from 1.12.3 to 1.12.4.

Updates `mockk` from 1.12.3 to 1.12.4
- [Release notes](https://github.com/mockk/mockk/releases)
- [Commits](https://github.com/mockk/mockk/compare/1.12.3...1.12.4)

Updates `mockk-android` from 1.12.3 to 1.12.4
- [Release notes](https://github.com/mockk/mockk/releases)
- [Commits](https://github.com/mockk/mockk/compare/1.12.3...1.12.4)

---
updated-dependencies:
- dependency-name: io.mockk:mockk
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: io.mockk:mockk-android
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-05-11 23:11:45 +00:00
Benoit Marty
deb0f1ad1b
Merge pull request #6000 from vector-im/dependabot/gradle/androidx.preference-preference-ktx-1.2.0 
Bump preference-ktx from 1.1.1 to 1.2.0
 2022-05-11 16:17:17 +02:00
dependabot[bot]
530d43bcbb
Bump kotlinCoroutines from 1.6.0 to 1.6.1 
Bumps `kotlinCoroutines` from 1.6.0 to 1.6.1.

Updates `kotlinx-coroutines-core` from 1.6.0 to 1.6.1
- [Release notes](https://github.com/Kotlin/kotlinx.coroutines/releases)
- [Changelog](https://github.com/Kotlin/kotlinx.coroutines/blob/master/CHANGES.md)
- [Commits](https://github.com/Kotlin/kotlinx.coroutines/compare/1.6.0...1.6.1)

Updates `kotlinx-coroutines-android` from 1.6.0 to 1.6.1
- [Release notes](https://github.com/Kotlin/kotlinx.coroutines/releases)
- [Changelog](https://github.com/Kotlin/kotlinx.coroutines/blob/master/CHANGES.md)
- [Commits](https://github.com/Kotlin/kotlinx.coroutines/compare/1.6.0...1.6.1)

Updates `kotlinx-coroutines-test` from 1.6.0 to 1.6.1
- [Release notes](https://github.com/Kotlin/kotlinx.coroutines/releases)
- [Changelog](https://github.com/Kotlin/kotlinx.coroutines/blob/master/CHANGES.md)
- [Commits](https://github.com/Kotlin/kotlinx.coroutines/compare/1.6.0...1.6.1)

---
updated-dependencies:
- dependency-name: org.jetbrains.kotlinx:kotlinx-coroutines-core
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: org.jetbrains.kotlinx:kotlinx-coroutines-android
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: org.jetbrains.kotlinx:kotlinx-coroutines-test
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-05-10 16:25:02 +00:00
Benoit Marty
04cadb94cf
Merge pull request #5987 from vector-im/dependabot/gradle/org.jetbrains.kotlin-kotlin-gradle-plugin-1.6.21 
Bump kotlin-gradle-plugin from 1.6.0 to 1.6.21
 2022-05-10 18:23:51 +02:00
dependabot[bot]
e65d3ee993
Bump dagger from 2.41 to 2.42 (#5998) 
* Bump dagger from 2.41 to 2.42

Bumps `dagger` from 2.41 to 2.42.

Updates `hilt-android-gradle-plugin` from 2.41 to 2.42
- [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.41...dagger-2.42)

Updates `dagger` from 2.41 to 2.42
- [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.41...dagger-2.42)

Updates `dagger-compiler` from 2.41 to 2.42
- [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.41...dagger-2.42)

Updates `hilt-android` from 2.41 to 2.42
- [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.41...dagger-2.42)

Updates `hilt-compiler` from 2.41 to 2.42
- [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.41...dagger-2.42)

---
updated-dependencies:
- dependency-name: com.google.dagger:hilt-android-gradle-plugin
  dependency-type: direct:production
  update-type: version-update:semver-minor
- dependency-name: com.google.dagger:dagger
  dependency-type: direct:production
  update-type: version-update:semver-minor
- dependency-name: com.google.dagger:dagger-compiler
  dependency-type: direct:production
  update-type: version-update:semver-minor
- dependency-name: com.google.dagger:hilt-android
  dependency-type: direct:production
  update-type: version-update:semver-minor
- dependency-name: com.google.dagger:hilt-compiler
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

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

* maven central url added to element-android/buld.gradle to buildscript configuration

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: NIkita Fedrunov <fedrunov@element.io>
 2022-05-10 14:11:04 +02:00
Benoit Marty
a8c39e1d36
Merge pull request #6011 from vector-im/dependabot/gradle/androidx.fragment-fragment-ktx-1.4.1 
Bump fragment-ktx from 1.4.0 to 1.4.1
 2022-05-10 11:23:04 +02:00
Benoit Marty
3906ee371b
Merge pull request #6002 from vector-im/dependabot/gradle/lifecycle-2.4.1 
Bump lifecycle from 2.4.0 to 2.4.1
 2022-05-10 10:01:11 +02:00
dependabot[bot]
b566e15438
Bump fragment-ktx from 1.4.0 to 1.4.1 
Bumps fragment-ktx from 1.4.0 to 1.4.1.

---
updated-dependencies:
- dependency-name: androidx.fragment:fragment-ktx
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-05-10 07:59:21 +00:00
Benoit Marty
1e5a53e5c5
Merge pull request #5999 from vector-im/dependabot/gradle/androidx.appcompat-appcompat-1.4.1 
Bump appcompat from 1.4.0 to 1.4.1
 2022-05-10 09:58:57 +02:00
Benoit Marty
42513265cf
Merge pull request #6004 from vector-im/dependabot/gradle/androidx.constraintlayout-constraintlayout-2.1.3 
Bump constraintlayout from 2.1.2 to 2.1.3
 2022-05-10 09:56:50 +02:00
Benoit Marty
e05684d078
Merge pull request #6007 from vector-im/dependabot/gradle/com.google.android.material-material-1.6.0 
Bump material from 1.5.0 to 1.6.0
 2022-05-10 09:55:43 +02:00
dependabot[bot]
d36eeb1a06
Bump material from 1.5.0 to 1.6.0 
Bumps [material](https://github.com/material-components/material-components-android) from 1.5.0 to 1.6.0.
- [Release notes](https://github.com/material-components/material-components-android/releases)
- [Commits](https://github.com/material-components/material-components-android/compare/1.5.0...1.6.0)

---
updated-dependencies:
- dependency-name: com.google.android.material:material
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-05-09 23:10:28 +00:00
dependabot[bot]
e8c61cf86f
Bump constraintlayout from 2.1.2 to 2.1.3 
Bumps [constraintlayout](https://github.com/androidx/constraintlayout) from 2.1.2 to 2.1.3.
- [Release notes](https://github.com/androidx/constraintlayout/releases)
- [Commits](https://github.com/androidx/constraintlayout/compare/2.1.2...2.1.3)

---
updated-dependencies:
- dependency-name: androidx.constraintlayout:constraintlayout
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-05-09 23:09:32 +00:00
dependabot[bot]
900e05c1a1
Bump gradle from 7.0.4 to 7.2.0 
Bumps gradle from 7.0.4 to 7.2.0.

---
updated-dependencies:
- dependency-name: com.android.tools.build:gradle
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-05-09 23:09:09 +00:00
dependabot[bot]
5bab32f6dc
Bump lifecycle from 2.4.0 to 2.4.1 
Bumps `lifecycle` from 2.4.0 to 2.4.1.

Updates `lifecycle-common` from 2.4.0 to 2.4.1

Updates `lifecycle-livedata-ktx` from 2.4.0 to 2.4.1

Updates `lifecycle-process` from 2.4.0 to 2.4.1

Updates `lifecycle-runtime-ktx` from 2.4.0 to 2.4.1

---
updated-dependencies:
- dependency-name: androidx.lifecycle:lifecycle-common
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: androidx.lifecycle:lifecycle-livedata-ktx
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: androidx.lifecycle:lifecycle-process
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: androidx.lifecycle:lifecycle-runtime-ktx
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-05-09 23:08:43 +00:00
dependabot[bot]
48c126515c
Bump preference-ktx from 1.1.1 to 1.2.0 
Bumps preference-ktx from 1.1.1 to 1.2.0.

---
updated-dependencies:
- dependency-name: androidx.preference:preference-ktx
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-05-09 23:08:00 +00:00
dependabot[bot]
f3eb8dd325
Bump appcompat from 1.4.0 to 1.4.1 
Bumps appcompat from 1.4.0 to 1.4.1.

---
updated-dependencies:
- dependency-name: androidx.appcompat:appcompat
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-05-09 23:07:48 +00:00
dependabot[bot]
aabd705161
Bump vanniktechEmoji from 0.8.0 to 0.9.0 
Bumps `vanniktechEmoji` from 0.8.0 to 0.9.0.

Updates `emoji-material` from 0.8.0 to 0.9.0
- [Release notes](https://github.com/vanniktech/Emoji/releases)
- [Changelog](https://github.com/vanniktech/Emoji/blob/master/CHANGELOG.md)
- [Commits](https://github.com/vanniktech/Emoji/compare/0.8.0...0.9.0)

Updates `emoji-google` from 0.8.0 to 0.9.0
- [Release notes](https://github.com/vanniktech/Emoji/releases)
- [Changelog](https://github.com/vanniktech/Emoji/blob/master/CHANGELOG.md)
- [Commits](https://github.com/vanniktech/Emoji/compare/0.8.0...0.9.0)

---
updated-dependencies:
- dependency-name: com.vanniktech:emoji-material
  dependency-type: direct:production
  update-type: version-update:semver-minor
- dependency-name: com.vanniktech:emoji-google
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-05-09 15:01:48 +00:00
dependabot[bot]
381159ca2f
Bump mavericks from 2.5.0 to 2.6.1 
Bumps `mavericks` from 2.5.0 to 2.6.1.

Updates `mavericks` from 2.5.0 to 2.6.1
- [Release notes](https://github.com/airbnb/mavericks/releases)
- [Changelog](https://github.com/airbnb/mavericks/blob/main/CHANGELOG.md)
- [Commits](https://github.com/airbnb/mavericks/compare/2.5.0...2.6.1)

Updates `mavericks-testing` from 2.5.0 to 2.6.1
- [Release notes](https://github.com/airbnb/mavericks/releases)
- [Changelog](https://github.com/airbnb/mavericks/blob/main/CHANGELOG.md)
- [Commits](https://github.com/airbnb/mavericks/compare/2.5.0...2.6.1)

---
updated-dependencies:
- dependency-name: com.airbnb.android:mavericks
  dependency-type: direct:production
  update-type: version-update:semver-minor
- dependency-name: com.airbnb.android:mavericks-testing
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-05-09 15:01:07 +00:00
Benoit Marty
8c37a46994
Merge pull request #5982 from vector-im/dependabot/gradle/glide-4.13.2 
Bump glide from 4.12.0 to 4.13.2
 2022-05-09 17:00:12 +02:00
Benoit Marty
77977a0775
Merge pull request #5980 from vector-im/dependabot/gradle/dagger-2.41 
Bump dagger from 2.40.5 to 2.41
 2022-05-09 16:59:33 +02:00
Benoit Marty
9aa251b252
Merge pull request #5979 from vector-im/dependabot/gradle/mockk-1.12.3 
Bump mockk from 1.12.1 to 1.12.3
 2022-05-09 16:58:52 +02:00
dependabot[bot]
41359a53f7
Bump kotlin-gradle-plugin from 1.6.0 to 1.6.21 
Bumps [kotlin-gradle-plugin](https://github.com/JetBrains/kotlin) from 1.6.0 to 1.6.21.
- [Release notes](https://github.com/JetBrains/kotlin/releases)
- [Changelog](https://github.com/JetBrains/kotlin/blob/v1.6.21/ChangeLog.md)
- [Commits](https://github.com/JetBrains/kotlin/compare/v1.6.0...v1.6.21)

---
updated-dependencies:
- dependency-name: org.jetbrains.kotlin:kotlin-gradle-plugin
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-05-09 13:26:18 +00:00
dependabot[bot]
a4a587b247
Bump glide from 4.12.0 to 4.13.2 
Bumps `glide` from 4.12.0 to 4.13.2.

Updates `glide` from 4.12.0 to 4.13.2
- [Release notes](https://github.com/bumptech/glide/releases)
- [Commits](https://github.com/bumptech/glide/compare/v4.12.0...v4.13.2)

Updates `compiler` from 4.12.0 to 4.13.2
- [Release notes](https://github.com/bumptech/glide/releases)
- [Commits](https://github.com/bumptech/glide/compare/v4.12.0...v4.13.2)

---
updated-dependencies:
- dependency-name: com.github.bumptech.glide:glide
  dependency-type: direct:production
  update-type: version-update:semver-minor
- dependency-name: com.github.bumptech.glide:compiler
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-05-09 13:23:57 +00:00
dependabot[bot]
fc62861b02
Bump dagger from 2.40.5 to 2.41 
Bumps `dagger` from 2.40.5 to 2.41.

Updates `hilt-android-gradle-plugin` from 2.40.5 to 2.41
- [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.40.5...dagger-2.41)

Updates `dagger` from 2.40.5 to 2.41
- [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.40.5...dagger-2.41)

Updates `dagger-compiler` from 2.40.5 to 2.41
- [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.40.5...dagger-2.41)

Updates `hilt-android` from 2.40.5 to 2.41
- [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.40.5...dagger-2.41)

Updates `hilt-compiler` from 2.40.5 to 2.41
- [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.40.5...dagger-2.41)

---
updated-dependencies:
- dependency-name: com.google.dagger:hilt-android-gradle-plugin
  dependency-type: direct:production
  update-type: version-update:semver-minor
- dependency-name: com.google.dagger:dagger
  dependency-type: direct:production
  update-type: version-update:semver-minor
- dependency-name: com.google.dagger:dagger-compiler
  dependency-type: direct:production
  update-type: version-update:semver-minor
- dependency-name: com.google.dagger:hilt-android
  dependency-type: direct:production
  update-type: version-update:semver-minor
- dependency-name: com.google.dagger:hilt-compiler
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-05-09 13:23:24 +00:00
dependabot[bot]
ba687addc5
Bump mockk from 1.12.1 to 1.12.3 
Bumps `mockk` from 1.12.1 to 1.12.3.

Updates `mockk` from 1.12.1 to 1.12.3
- [Release notes](https://github.com/mockk/mockk/releases)
- [Commits](https://github.com/mockk/mockk/compare/1.12.1...1.12.3)

Updates `mockk-android` from 1.12.1 to 1.12.3
- [Release notes](https://github.com/mockk/mockk/releases)
- [Commits](https://github.com/mockk/mockk/compare/1.12.1...1.12.3)

---
updated-dependencies:
- dependency-name: io.mockk:mockk
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: io.mockk:mockk-android
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-05-09 13:22:52 +00:00
dependabot[bot]
f5e3dbb642
Bump jjwt from 0.11.2 to 0.11.5 
Bumps `jjwt` from 0.11.2 to 0.11.5.

Updates `jjwt-api` from 0.11.2 to 0.11.5
- [Release notes](https://github.com/jwtk/jjwt/releases)
- [Changelog](https://github.com/jwtk/jjwt/blob/master/CHANGELOG.md)
- [Commits](https://github.com/jwtk/jjwt/compare/0.11.2...0.11.5)

Updates `jjwt-impl` from 0.11.2 to 0.11.5
- [Release notes](https://github.com/jwtk/jjwt/releases)
- [Changelog](https://github.com/jwtk/jjwt/blob/master/CHANGELOG.md)
- [Commits](https://github.com/jwtk/jjwt/compare/0.11.2...0.11.5)

Updates `jjwt-orgjson` from 0.11.2 to 0.11.5

---
updated-dependencies:
- dependency-name: io.jsonwebtoken:jjwt-api
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: io.jsonwebtoken:jjwt-impl
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: io.jsonwebtoken:jjwt-orgjson
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-05-09 13:22:30 +00:00
SpiritCroc
99053e8467 Support inline images in the timeline 
Change-Id: I4af76058b400e9a0bf7c10e4ad98b7c7fb5015c1
 2022-04-29 15:28:02 +02:00
Olivér Falvai
2c84f234a6 Cleanup 2022-04-17 11:09:10 +02:00
Olivér Falvai
a8bbf29b42 Remove unused dependencies 2022-04-15 22:50:54 +02:00
SpiritCroc
7c35f5fda5 Merge tag 'v1.4.11' into sc 
Change-Id: I454f1ec4f1df6366065d5690d9704eb1bd573c2d

Conflicts:
	dependencies_groups.gradle
	library/ui-styles/build.gradle
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryUpdater.kt
	vector/src/main/AndroidManifest.xml
	vector/src/main/assets/open_source_licenses.html
	vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewEvents.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/timeline/factory/MessageItemFactory.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageVoiceItem.kt
	vector/src/main/java/im/vector/app/features/rageshake/BugReporter.kt
	vector/src/main/java/im/vector/app/features/settings/VectorSettingsLabsFragment.kt
	vector/src/main/java/im/vector/app/features/settings/notifications/VectorSettingsNotificationPreferenceFragment.kt
	vector/src/main/res/menu/menu_timeline.xml
 2022-04-12 11:57:16 +02:00
SpiritCroc
d5d555d07f Merge tag 'v1.4.8' into merge-v1.4.8 
Change-Id: Ic6338fef4f27ca95016eb11ab07a10d3f3a8986e

Conflicts:
	library/ui-styles/src/main/res/values/dimens.xml
	library/ui-styles/src/main/res/values/styles_buttons.xml
	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/session/room/summary/RoomSummaryUpdater.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/LoadTimelineStrategy.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/TimelineChunk.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/timeline/action/MessageActionsViewModel.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/style/TimelineMessageLayout.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/view/MessageBubbleView.kt
	vector/src/main/java/im/vector/app/features/home/room/list/RoomCategoryItem.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/RoomListSectionBuilderSpace.kt
	vector/src/main/java/im/vector/app/features/home/room/list/RoomsSection.kt
	vector/src/main/java/im/vector/app/features/home/room/list/SectionHeaderAdapter.kt
	vector/src/main/java/im/vector/app/features/roomprofile/notifications/RoomNotificationSettingsViewState.kt
	vector/src/main/res/drawable/ic_home_bottom_catchup.xml
	vector/src/main/res/drawable/ic_shield_custom.xml
	vector/src/main/res/drawable/ic_shield_trusted.xml
	vector/src/main/res/drawable/ic_shield_trusted_no_border.xml
	vector/src/main/res/layout/fragment_ftue_account_created.xml
	vector/src/main/res/layout/fragment_timeline.xml
	vector/src/main/res/layout/item_timeline_event_code_block_stub.xml
	vector/src/main/res/layout/view_attachment_type_selector.xml
	vector/src/main/res/layout/view_room_detail_toolbar.xml
	vector/src/main/res/menu/menu_submit.xml
 2022-03-30 15:53:51 +02:00
Benoit Marty
97bb5a9abb Also upgrade the coroutine lib 2022-03-22 16:13:06 +01:00
dependabot[bot]
e169c81a2c Bump moshi from 1.12.0 to 1.13.0 
Bumps `moshi` from 1.12.0 to 1.13.0.

Updates `moshi-adapters` from 1.12.0 to 1.13.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.12.0...moshi-parent-1.13.0)

Updates `moshi-kotlin-codegen` from 1.12.0 to 1.13.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.12.0...moshi-parent-1.13.0)

---
updated-dependencies:
- dependency-name: com.squareup.moshi:moshi-adapters
  dependency-type: direct:production
  update-type: version-update:semver-minor
- dependency-name: com.squareup.moshi:moshi-kotlin-codegen
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-03-22 16:13:06 +01:00
dependabot[bot]
6f55a25a30 Bump kotlin-gradle-plugin from 1.5.31 to 1.6.0 
Bumps [kotlin-gradle-plugin](https://github.com/JetBrains/kotlin) from 1.5.31 to 1.6.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/commits)

---
updated-dependencies:
- dependency-name: org.jetbrains.kotlin:kotlin-gradle-plugin
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-03-22 16:13:06 +01:00
Maxime Naturel
0aaa650ac3 Using flow to show items counter 2022-03-14 11:15:17 +01:00
SpiritCroc
f5afdefe2f Merge tag 'v1.4.4' into sc 
Change-Id: Ibfb35ec30a51abebb652044719417f62c8a6be50

Conflicts:
	library/ui-styles/src/main/res/values/dimens.xml
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/SyncTask.kt
	vector/src/gplay/java/im/vector/app/gplay/push/fcm/VectorFirebaseMessagingService.kt
	vector/src/main/AndroidManifest.xml
	vector/src/main/java/im/vector/app/features/home/HomeDetailFragment.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewState.kt
	vector/src/main/java/im/vector/app/features/rageshake/BugReporter.kt
	vector/src/main/res/drawable/bg_unread_notification.xml
	vector/src/main/res/drawable/ic_add_reaction_small.xml
	vector/src/main/res/layout/item_room.xml
	vector/src/main/res/layout/item_timeline_event_text_message_stub.xml
	vector/src/main/res/xml/vector_settings_preferences.xml
 2022-03-10 13:26:09 +01:00
ericdecanini
d6cd3f5719 Upgrades to material 1.5.0 library 2022-03-01 14:35:22 +01:00
Aris Kotsomitopoulos
077c0eea98
Revert "AGP 7.1.0" 2022-02-04 12:20:20 +02:00
SpiritCroc
7b9da40e52 [merge] Use java 11 again, pt.2 
Change-Id: I136053222ffa1a264ce97a9d6ec51515e10208a0
 2022-01-29 14:59:20 +01:00
SpiritCroc
a9d5700d2b Merge tag 'v1.3.16' into sc 
Change-Id: I8b3937f4ac30d3e72e2cb694eee2dc5bf034cb75

Conflicts:
	gradle.properties
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/pushrules/EventMatchCondition.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/timeline/Timeline.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/di/NetworkModule.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/LocalEchoEventFactory.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/room/timeline/DefaultTimeline.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/TokenChunkEventPersistor.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/job/SyncThread.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/job/SyncWorker.kt
	vector/src/main/AndroidManifest.xml
	vector/src/main/java/im/vector/app/features/home/HomeDrawerFragment.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/RoomDetailViewState.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/composer/ComposerEditText.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/composer/MessageComposerViewState.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/MessageActionsViewModel.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/MatrixItemColorProvider.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/TimelineEventVisibilityHelper.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageTextItem.kt
	vector/src/main/java/im/vector/app/features/home/room/list/RoomListSectionBuilderSpace.kt
	vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryItem.kt
	vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryItemFactory.kt
	vector/src/main/java/im/vector/app/features/html/EventHtmlRenderer.kt
	vector/src/main/java/im/vector/app/features/rageshake/BugReportActivity.kt
	vector/src/main/java/im/vector/app/features/rageshake/BugReporter.kt
	vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileController.kt
	vector/src/main/java/im/vector/app/features/settings/VectorSettingsBaseFragment.kt
	vector/src/main/java/im/vector/app/features/settings/VectorSettingsLabsFragment.kt
	vector/src/main/res/layout/activity_call.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/item_timeline_event_base.xml
	vector/src/main/res/layout/view_voice_message_recorder.xml
	vector/src/main/res/values/config.xml
	vector/src/main/res/xml/vector_settings_labs.xml
 2022-01-29 12:18:19 +01:00
Benoit Marty
4aff1ab017 AGP 7.1.0 2022-01-27 16:08:47 +01:00
Benoit Marty
194a584e4c Merge branch hotfix/1.3.15 2022-01-18 14:21:09 +01:00
Benoit Marty
bdd30e3b8f Fix crash when viewing source which contains an emoji. 
Import source of jsonviewer as a module of this project.
 2022-01-18 12:04:06 +01:00
Benoit Marty
f2165201eb Remove unused module matrix-sdk-android-rx and do some cleanup 2022-01-13 17:54:25 +01:00
ariskotsomitopoulos
261030f51e - Fix integration tests (still not perfect while github actions are very very limited for that) 
- Split them in msdk and app test along with multiple smaller steps.
- Mark the not working tests with @Ignore so that they will not run neither local or on github actions
- Add user friendly comment on PR to view the results
 2022-01-05 23:42:57 +02:00
Benoit Marty
5bfba837c1 Add group for dependency, and use latest markwon version 2021-12-31 17:01:11 +01:00
Benoit Marty
95b1ae9488
Merge branch 'develop' into maths 2021-12-31 16:41:06 +01:00
SpiritCroc
acdd4e24b9 Merge tag 'v1.3.12' into sc 
Change-Id: I66c0120371c3f52295f033ec21702c08381b5b10

Conflicts:
	build.gradle
	vector/build.gradle
	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/TimelineEventVisibilityHelper.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageTextItem.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/url/PreviewUrlView.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/actions/RoomListQuickActionsEpoxyController.kt
	vector/src/main/java/im/vector/app/features/navigation/DefaultNavigator.kt
	vector/src/main/java/im/vector/app/features/navigation/Navigator.kt
	vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileActivity.kt
	vector/src/main/java/im/vector/app/features/settings/VectorPreferences.kt
	vector/src/main/java/im/vector/app/features/settings/VectorSettingsBaseFragment.kt
	vector/src/main/java/im/vector/app/features/spaces/SpaceSummaryController.kt
	vector/src/main/res/drawable/highlighted_message_background.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/fragment_home_detail.xml
	vector/src/main/res/layout/fragment_login_server_selection.xml
	vector/src/main/res/layout/fragment_room_detail.xml
	vector/src/main/res/layout/item_bottom_sheet_message_preview.xml
	vector/src/main/res/layout/item_expandable_textview.xml
	vector/src/main/res/layout/item_login_header.xml
	vector/src/main/res/layout/item_radio.xml
	vector/src/main/res/layout/item_room.xml
	vector/src/main/res/layout/item_timeline_event_base.xml
	vector/src/main/res/layout/item_timeline_event_call_tile_stub.xml
	vector/src/main/res/layout/item_timeline_event_code_block_stub.xml
	vector/src/main/res/layout/item_timeline_event_media_message_stub.xml
	vector/src/main/res/layout/item_timeline_event_poll_stub.xml
	vector/src/main/res/layout/item_timeline_event_redacted_stub.xml
	vector/src/main/res/layout/item_timeline_event_voice_stub.xml
	vector/src/main/res/layout/view_stub_room_profile_header.xml
	vector/src/main/res/layout/view_url_preview.xml
	vector/src/main/res/xml/vector_settings_labs.xml
	vector/src/main/res/xml/vector_settings_root.xml
 2021-12-23 14:36:13 +01:00
dependabot[bot]
f97753fdc1
Bump gradle from 7.0.3 to 7.0.4 
Bumps gradle from 7.0.3 to 7.0.4.

---
updated-dependencies:
- dependency-name: com.android.tools.build:gradle
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-12-08 23:07:58 +00:00
dependabot[bot]
d13a3eaad5
Bump mavericks from 2.4.0 to 2.5.0 
Bumps `mavericks` from 2.4.0 to 2.5.0.

Updates `mavericks` from 2.4.0 to 2.5.0
- [Release notes](https://github.com/airbnb/mavericks/releases)
- [Changelog](https://github.com/airbnb/mavericks/blob/main/CHANGELOG.md)
- [Commits](https://github.com/airbnb/mavericks/compare/2.4.0...2.5.0)

Updates `mavericks-testing` from 2.4.0 to 2.5.0
- [Release notes](https://github.com/airbnb/mavericks/releases)
- [Changelog](https://github.com/airbnb/mavericks/blob/main/CHANGELOG.md)
- [Commits](https://github.com/airbnb/mavericks/compare/2.4.0...2.5.0)

---
updated-dependencies:
- dependency-name: com.airbnb.android:mavericks
  dependency-type: direct:production
  update-type: version-update:semver-minor
- dependency-name: com.airbnb.android:mavericks-testing
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-12-08 00:40:35 +00:00
dependabot[bot]
0defac348e
Bump dagger from 2.40.4 to 2.40.5 
Bumps `dagger` from 2.40.4 to 2.40.5.

Updates `hilt-android-gradle-plugin` from 2.40.4 to 2.40.5
- [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.40.4...dagger-2.40.5)

Updates `dagger` from 2.40.4 to 2.40.5
- [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.40.4...dagger-2.40.5)

Updates `dagger-compiler` from 2.40.4 to 2.40.5
- [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.40.4...dagger-2.40.5)

Updates `hilt-android` from 2.40.4 to 2.40.5
- [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.40.4...dagger-2.40.5)

Updates `hilt-compiler` from 2.40.4 to 2.40.5
- [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.40.4...dagger-2.40.5)

---
updated-dependencies:
- dependency-name: com.google.dagger:hilt-android-gradle-plugin
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: com.google.dagger:dagger
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: com.google.dagger:dagger-compiler
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: com.google.dagger:hilt-android
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: com.google.dagger:hilt-compiler
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-12-06 23:08:06 +00:00
SpiritCroc
4b63a9f939 Merge tag 'v1.3.9' into sc 
Change-Id: I26834af19e0b02887f288b6441ced6d993cb8861

Conflicts:
	vector/src/fdroid/java/im/vector/app/di/FlavorModule.kt
	vector/src/gplay/java/im/vector/app/push/fcm/EmbeddedDistrib.kt
	vector/src/main/java/im/vector/app/VectorApplication.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/composer/MessageComposerViewEvents.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/MessageComposerViewState.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/composer/VoiceMessageRecorderView.kt
	vector/src/main/res/drawable/ic_shield_custom.xml
	vector/src/main/res/drawable/ic_shield_trusted.xml
 2021-12-05 13:46:55 +01:00
dependabot[bot]
850620cd99
Bump dagger from 2.40.3 to 2.40.4 
Bumps `dagger` from 2.40.3 to 2.40.4.

Updates `hilt-android-gradle-plugin` from 2.40.3 to 2.40.4
- [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.40.3...dagger-2.40.4)

Updates `dagger` from 2.40.3 to 2.40.4
- [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.40.3...dagger-2.40.4)

Updates `dagger-compiler` from 2.40.3 to 2.40.4
- [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.40.3...dagger-2.40.4)

Updates `hilt-android` from 2.40.3 to 2.40.4
- [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.40.3...dagger-2.40.4)

Updates `hilt-compiler` from 2.40.3 to 2.40.4
- [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.40.3...dagger-2.40.4)

---
updated-dependencies:
- dependency-name: com.google.dagger:hilt-android-gradle-plugin
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: com.google.dagger:dagger
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: com.google.dagger:dagger-compiler
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: com.google.dagger:hilt-android
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: com.google.dagger:hilt-compiler
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-12-02 23:08:16 +00:00
dependabot[bot]
7c41d3cacb
Bump dagger from 2.40.2 to 2.40.3 
Bumps `dagger` from 2.40.2 to 2.40.3.

Updates `hilt-android-gradle-plugin` from 2.40.2 to 2.40.3
- [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.40.2...dagger-2.40.3)

Updates `dagger` from 2.40.2 to 2.40.3
- [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.40.2...dagger-2.40.3)

Updates `dagger-compiler` from 2.40.2 to 2.40.3
- [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.40.2...dagger-2.40.3)

Updates `hilt-android` from 2.40.2 to 2.40.3
- [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.40.2...dagger-2.40.3)

Updates `hilt-compiler` from 2.40.2 to 2.40.3
- [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.40.2...dagger-2.40.3)

---
updated-dependencies:
- dependency-name: com.google.dagger:hilt-android-gradle-plugin
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: com.google.dagger:dagger
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: com.google.dagger:dagger-compiler
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: com.google.dagger:hilt-android
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: com.google.dagger:hilt-compiler
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-11-29 23:08:54 +00:00
dependabot[bot]
c9637967c9
Bump dagger from 2.40.1 to 2.40.2 
Bumps `dagger` from 2.40.1 to 2.40.2.

Updates `hilt-android-gradle-plugin` from 2.40.1 to 2.40.2
- [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.40.1...dagger-2.40.2)

Updates `dagger` from 2.40.1 to 2.40.2
- [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.40.1...dagger-2.40.2)

Updates `dagger-compiler` from 2.40.1 to 2.40.2
- [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.40.1...dagger-2.40.2)

Updates `hilt-android` from 2.40.1 to 2.40.2
- [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.40.1...dagger-2.40.2)

Updates `hilt-compiler` from 2.40.1 to 2.40.2
- [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.40.1...dagger-2.40.2)

---
updated-dependencies:
- dependency-name: com.google.dagger:hilt-android-gradle-plugin
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: com.google.dagger:dagger
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: com.google.dagger:dagger-compiler
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: com.google.dagger:hilt-android
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: com.google.dagger:hilt-compiler
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-11-24 23:08:16 +00:00
Benoit Marty
42c0df8f26
Merge pull request #4496 from vector-im/dependabot/gradle/androidx.appcompat-appcompat-1.4.0 
Bump appcompat from 1.3.1 to 1.4.0
 2021-11-18 11:24:32 +01:00
Benoit Marty
00ab7aaea9
Merge branch 'develop' into dependabot/gradle/androidx.constraintlayout-constraintlayout-2.1.2 2021-11-18 10:18:44 +01:00
Benoit Marty
958be65389
Merge pull request #4493 from vector-im/dependabot/gradle/androidx.work-work-runtime-ktx-2.7.1 
Bump work-runtime-ktx from 2.7.0 to 2.7.1
 2021-11-18 10:17:34 +01:00
dependabot[bot]
bff72a4d52
Bump appcompat from 1.3.1 to 1.4.0 
Bumps appcompat from 1.3.1 to 1.4.0.

---
updated-dependencies:
- dependency-name: androidx.appcompat:appcompat
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-11-17 23:08:48 +00:00
dependabot[bot]
84d86a5433
Bump constraintlayout from 2.1.1 to 2.1.2 
Bumps [constraintlayout](https://github.com/androidx/constraintlayout) from 2.1.1 to 2.1.2.
- [Release notes](https://github.com/androidx/constraintlayout/releases)
- [Commits](https://github.com/androidx/constraintlayout/commits)

---
updated-dependencies:
- dependency-name: androidx.constraintlayout:constraintlayout
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-11-17 23:07:57 +00:00
dependabot[bot]
f56691a942
Bump work-runtime-ktx from 2.7.0 to 2.7.1 
Bumps work-runtime-ktx from 2.7.0 to 2.7.1.

---
updated-dependencies:
- dependency-name: androidx.work:work-runtime-ktx
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-11-17 23:07:14 +00:00
dependabot[bot]
9ae6197f4c
Bump fragment-ktx from 1.3.6 to 1.4.0 
Bumps fragment-ktx from 1.3.6 to 1.4.0.

---
updated-dependencies:
- dependency-name: androidx.fragment:fragment-ktx
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-11-17 23:07:08 +00:00
SpiritCroc
d9a5991559 Merge tag 'v1.3.8' into HEAD 
Change-Id: If3e3927755638ee38d8817f8504f09b0df14f309

Conflicts:
	dependencies.gradle
	vector/src/fdroid/AndroidManifest.xml
	vector/src/gplay/AndroidManifest.xml
	vector/src/gplay/java/im/vector/app/gplay/push/fcm/VectorFirebaseMessagingService.kt
	vector/src/main/AndroidManifest.xml
	vector/src/main/java/im/vector/app/features/home/HomeActivity.kt
	vector/src/main/java/im/vector/app/features/home/UnreadMessagesSharedViewModel.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/composer/ComposerEditText.kt
	vector/src/main/java/im/vector/app/features/home/room/list/RoomListFragment.kt
 2021-11-17 20:17:45 +01:00
SpiritCroc
c5f48fa4d2 Merge tag 'v1.3.7' into sc 
Change-Id: Id73c834c10e11ccd46d7d2adc8328eb95d051941

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/content/VideoCompressor.kt
	vector/build.gradle
	vector/src/fdroid/AndroidManifest.xml
	vector/src/gplay/java/im/vector/app/gplay/features/settings/troubleshoot/TestFirebaseToken.kt
	vector/src/gplay/java/im/vector/app/push/fcm/FcmHelper.kt
	vector/src/main/java/im/vector/app/VectorApplication.kt
	vector/src/main/java/im/vector/app/core/pushers/VectorMessagingReceiver.kt
	vector/src/main/java/im/vector/app/core/receiver/OnApplicationUpgradeOrRebootReceiver.kt
	vector/src/main/java/im/vector/app/features/home/HomeActivity.kt
	vector/src/main/java/im/vector/app/features/notifications/NotificationDrawerManager.kt
	vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileActivity.kt
	vector/src/main/java/im/vector/app/features/settings/VectorSettingsBaseFragment.kt
 2021-11-17 19:01:22 +01:00
dependabot[bot]
d763c61c61
Bump mockk from 1.12.0 to 1.12.1 
Bumps `mockk` from 1.12.0 to 1.12.1.

Updates `mockk` from 1.12.0 to 1.12.1
- [Release notes](https://github.com/mockk/mockk/releases)
- [Commits](https://github.com/mockk/mockk/compare/v1.12.0...1.12.1)

Updates `mockk-android` from 1.12.0 to 1.12.1
- [Release notes](https://github.com/mockk/mockk/releases)
- [Commits](https://github.com/mockk/mockk/compare/v1.12.0...1.12.1)

---
updated-dependencies:
- dependency-name: io.mockk:mockk
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: io.mockk:mockk-android
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-11-16 23:08:15 +00:00
Benoit Marty
be3aafeef2
Merge pull request #4433 from vector-im/feature/bma/android12 
Android12
 2021-11-16 13:27:33 +01:00
Benoit Marty
9429b039de androidx.lifecycle:lifecycle-common-java8 -> androidx.lifecycle:lifecycle-common 
https://developer.android.com/jetpack/androidx/releases/lifecycle#2.4.0
 2021-11-15 12:24:48 +01:00
Benoit Marty
7e59c18050 Add dep for ProcessLifecycleOwner 2021-11-15 12:24:48 +01:00
Benoit Marty
a1630b5546 androidx.lifecycle:lifecycle-extensions is deprecated 
See https://developer.android.com/jetpack/androidx/releases/lifecycle#declaring_dependencies
 2021-11-15 12:24:48 +01:00
Benoit Marty
a1c8835f31 Same version for all lifecycle deps 2021-11-15 12:24:48 +01:00
dependabot[bot]
2880798627 Bump core-ktx from 1.6.0 to 1.7.0 
Bumps core-ktx from 1.6.0 to 1.7.0.

---
updated-dependencies:
- dependency-name: androidx.core:core-ktx
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-11-15 12:24:48 +01:00
dependabot[bot]
540a1b52ad Bump lifecycle-livedata-ktx from 2.3.1 to 2.4.0 
Bumps lifecycle-livedata-ktx from 2.3.1 to 2.4.0.

---
updated-dependencies:
- dependency-name: androidx.lifecycle:lifecycle-livedata-ktx
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-11-15 12:24:48 +01:00
dependabot[bot]
f1e1729d40 Bump work-runtime-ktx from 2.6.0 to 2.7.0 
Bumps work-runtime-ktx from 2.6.0 to 2.7.0.

---
updated-dependencies:
- dependency-name: androidx.work:work-runtime-ktx
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-11-15 12:24:48 +01:00
Benoit Marty
aa3f36b7b7 Target API 31 - Android 12 - #4262 2021-11-15 12:24:48 +01:00