mirrors/SchildiChat-android
1
0
Fork 0
mirror of https://github.com/SchildiChat/SchildiChat-android.git synced 2024-12-27 19:38:53 +03:00
Code Issues Projects Releases Packages Wiki Activity
11225 commits 7 branches 124 tags 230 MiB
Commit graph

594 commits

Author SHA1 Message Date
Onuray Sahin
c7c589354e version++ 2021-07-30 18:01:22 +03:00
Onuray Sahin
c6bd6e4961
Merge pull request #3598 from vector-im/feature/ons/voice_message 
Voice Message
 2021-07-30 17:24:17 +03:00
David Langley
7091de9942 merge in static push definitions and adapt push v2 ui/logic 2021-07-27 19:54:17 +01:00
SpiritCroc
782141998d Increment version 
Change-Id: I710e0f58cc1fef70e5bc199ab4effb607ad321db
 2021-07-27 14:53:48 +02:00
SpiritCroc
f8b9d3571c Increment version 
Change-Id: I04751368e916d37162f752abd25243400dc6575d
 2021-07-26 12:51:54 +02:00
SpiritCroc
acb12c2005 Merge tag 'v1.1.14' into sc 
Change-Id: I7668fc7603c8f6e7aafa89886bb0fdf586e4a871

Conflicts:
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/DefaultFileService.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryDataSource.kt
	vector/src/main/java/im/vector/app/features/home/room/list/RoomListSectionBuilderGroup.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/RoomListViewModel.kt
 2021-07-24 10:12:48 +02:00
ganfra
4788630949 Merge branch 'develop' into feature/fga/new_voip_design 2021-07-23 12:17:05 +02:00
Benoit Marty
bdbfbe6175 Version++ 2021-07-23 11:53:21 +02:00
dependabot[bot]
a75ceee03f
Bump appcompat from 1.3.0 to 1.3.1 
Bumps appcompat from 1.3.0 to 1.3.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>
 2021-07-22 12:13:24 +00:00
Benoit Marty
2070b0ecde
Merge pull request #3718 from vector-im/dependabot/gradle/androidx.fragment-fragment-ktx-1.3.6 
Bump fragment-ktx from 1.3.5 to 1.3.6
 2021-07-22 14:12:42 +02:00
dependabot[bot]
76f412ffe8
Bump fragment-ktx from 1.3.5 to 1.3.6 
Bumps fragment-ktx from 1.3.5 to 1.3.6.

---
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>
 2021-07-21 23:05:41 +00:00
dependabot[bot]
b6e739afd3
Bump media from 1.3.1 to 1.4.0 
Bumps media from 1.3.1 to 1.4.0.

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

Signed-off-by: dependabot[bot] <support@github.com>
 2021-07-21 23:04:46 +00:00
Benoit Marty
e4ae80e348
Merge pull request #3708 from vector-im/dependabot/gradle/com.googlecode.libphonenumber-libphonenumber-8.12.28 
Bump libphonenumber from 8.12.27 to 8.12.28
 2021-07-21 09:28:19 +02:00
dependabot[bot]
89dc4bb13e
Bump daggerVersion from 2.37 to 2.38 
Bumps `daggerVersion` from 2.37 to 2.38.

Updates `dagger` from 2.37 to 2.38
- [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.37...dagger-2.38)

Updates `dagger-compiler` from 2.37 to 2.38
- [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.37...dagger-2.38)

---
updated-dependencies:
- 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
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-07-20 23:06:50 +00:00
dependabot[bot]
b809d4acf4
Bump libphonenumber from 8.12.27 to 8.12.28 
Bumps [libphonenumber](https://github.com/google/libphonenumber) from 8.12.27 to 8.12.28.
- [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.27...v8.12.28)

---
updated-dependencies:
- dependency-name: com.googlecode.libphonenumber:libphonenumber
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-07-20 23:06:30 +00:00
SpiritCroc
8497a307a1 Merge tag 'v1.1.13' into sc 
Change-Id: Icc97ef8699b1cc96447369121f3c88582ac651bc

Conflicts:
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt
	vector/src/main/java/im/vector/app/features/home/HomeDetailFragment.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/TimelineControllerInterceptorHelper.kt
	vector/src/main/java/im/vector/app/features/home/room/filtered/FilteredRoomFooterItem.kt
	vector/src/main/java/im/vector/app/features/home/room/list/RoomListFragment.kt
 2021-07-19 16:10:57 +02:00
Benoit Marty
6d1cabaee3 Version++ 2021-07-19 15:28:14 +02:00
SpiritCroc
0dcb14482d Increment version 
Change-Id: I8c9b382eea65a87575d0642eb8bfa5bc4f0b4707
 2021-07-16 12:34:43 +02:00
Benoit Marty
bfc70be5bb Record voice on Android 21 2021-07-15 17:23:46 +02:00
David Langley
5044b21545 add changelog, checks/tests 2021-07-14 11:49:16 +01:00
David Langley
baab726df2 Merge branch 'develop' of github.com:vector-im/element-android into feature/dla/reorg_account_notification_settings 2021-07-14 10:18:54 +01:00
David Langley
a3204fdad9 add resValue to enable feature, put back old code 2021-07-13 21:22:56 +01:00
dependabot[bot]
b0ea022eea
Bump kluent-android from 1.67 to 1.68 
Bumps [kluent-android](https://github.com/MarkusAmshove/Kluent) from 1.67 to 1.68.
- [Release notes](https://github.com/MarkusAmshove/Kluent/releases)
- [Changelog](https://github.com/MarkusAmshove/Kluent/blob/master/CHANGELOG.md)
- [Commits](https://github.com/MarkusAmshove/Kluent/commits)

---
updated-dependencies:
- dependency-name: org.amshove.kluent:kluent-android
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-07-12 23:07:08 +00:00
Benoit Marty
e391a1371c Merge branch 'develop' into feature/ons/voice_message 2021-07-09 22:19:50 +02:00
dependabot[bot]
76890a3b26
Bump libphonenumber from 8.12.26 to 8.12.27 
Bumps [libphonenumber](https://github.com/google/libphonenumber) from 8.12.26 to 8.12.27.
- [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.26...v8.12.27)

---
updated-dependencies:
- dependency-name: com.googlecode.libphonenumber:libphonenumber
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-07-07 23:06:17 +00:00
S1m
15c3bb7fc3 exclude firebase analytics 2021-07-07 23:11:18 +02:00
S1m
7ead76c8ca up: moshi to parse json 2021-07-07 03:35:16 +02:00
S1m
4ac4755868 up pr: code reviewed 2021-07-07 01:49:39 +02:00
S1m
6c153d04da Merge remote-tracking branch 'upstream/develop' into unifiedpush 2021-07-07 00:49:54 +02:00
Onuray Sahin
7a1b138894 Merge branch 'develop' into feature/ons/voice_message 
* develop: (286 commits)
  Fix crash after video call
  Fix issue on button styles
  Clean after benoits review
  Fix warning about implicit type, introduced in Kotlin 1.5.20. "Returning type parameter has been inferred to Nothing implicitly. Please specify type arguments explicitly to hide this warning. Nothing can produce an exception at runtime."
  Bump kotlin_version from 1.5.10 to 1.5.20
  Bump libphonenumber from 8.12.25 to 8.12.26
  Fix call invite processed after call is ended because of fastlane mode.
  Jump to unread: removes unnecessary check which can cause scroll issue
  Jump to unread: avoid blink when jumping
  Clean after Benoits review
  Delete unused drawable to avoid conflict on develop
  Jump to unread: add towncrier file.
  Read marker: fix some issues with jump to unread visibility.
  Stop using ProgressDialog, there is a theme issue with it. It's not maintain by Google since it's deprecated. Force usage of MaterialAlertDialogBuilder to have the same UI effect. We sometimes need to block the UI :/
  Reordering
  Add text style for dialogs
  Colored dialog button is now handled by the theme
  Update theme for material dialog and create a destructive variant
  Reorder buttons
  Update doc
  ...

# Conflicts:
#	library/ui-styles/src/main/res/values/theme_dark.xml
#	library/ui-styles/src/main/res/values/theme_light.xml
#	vector/build.gradle
#	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/composer/TextComposerView.kt
#	vector/src/main/res/values/strings.xml
 2021-07-06 13:17:49 +03:00
Benoit Marty
e22bd8f637
Merge pull request #3593 from vector-im/dependabot/gradle/androidx.test.ext-junit-1.1.3 
Bump junit from 1.1.2 to 1.1.3
 2021-07-05 21:36:38 +02:00
Benoit Marty
692adffa69
Merge pull request #3626 from vector-im/dependabot/gradle/com.google.android.material-material-1.4.0 
Bump material from 1.3.0 to 1.4.0
 2021-07-05 21:29:49 +02:00
ganfra
cdf97fc29f Merge branch 'develop' into feature/fga/new_voip_design 2021-07-05 18:02:19 +02:00
SpiritCroc
e5c9c33a0f Merge tag 'v1.1.12' into sc 
Change-Id: I224f427a0d65bfea7ed0b1e19a95e1f03d0d5236

Conflicts:
	library/ui-styles/src/main/res/values/text_appearances.xml
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.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/RoomDetailViewModel.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/helper/MessageInformationDataFactory.kt
	vector/src/main/java/im/vector/app/features/home/room/list/GroupRoomListSectionBuilder.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/RoomSummaryItemFactory.kt
	vector/src/main/java/im/vector/app/features/home/room/list/SpaceRoomListSectionBuilder.kt
	vector/src/main/java/im/vector/app/features/notifications/NotificationDrawerManager.kt
	vector/src/main/java/im/vector/app/features/spaces/SpacesListViewModel.kt
	vector/src/main/res/layout/dialog_export_e2e_keys.xml
	vector/src/main/res/layout/dialog_import_e2e_keys.xml
 2021-07-05 16:58:45 +02:00
dependabot[bot]
974d5c23d3
Bump junit from 1.1.2 to 1.1.3 
Bumps junit from 1.1.2 to 1.1.3.

---
updated-dependencies:
- dependency-name: androidx.test.ext:junit
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-07-05 14:19:54 +00:00
dependabot[bot]
8639582671
Bump espresso_version from 3.3.0 to 3.4.0 
Bumps `espresso_version` from 3.3.0 to 3.4.0.

Updates `espresso-core` from 3.3.0 to 3.4.0

Updates `espresso-contrib` from 3.3.0 to 3.4.0

Updates `espresso-intents` from 3.3.0 to 3.4.0

---
updated-dependencies:
- dependency-name: androidx.test.espresso:espresso-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
- dependency-name: androidx.test.espresso:espresso-contrib
  dependency-type: direct:production
  update-type: version-update:semver-minor
- dependency-name: androidx.test.espresso:espresso-intents
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-07-05 12:38:04 +00:00
Benoit Marty
5ccfbf4ed8
Merge pull request #3596 from vector-im/dependabot/gradle/androidx.core-core-ktx-1.6.0 
Bump core-ktx from 1.5.0 to 1.6.0
 2021-07-05 14:37:48 +02:00
Benoit Marty
f03155bbae
Merge pull request #3591 from vector-im/dependabot/gradle/androidxTest_version-1.4.0 
Bump androidxTest_version from 1.3.0 to 1.4.0
 2021-07-05 14:37:14 +02:00
Benoit Marty
72dcc92032 Version++ 2021-07-05 14:27:33 +02:00
SpiritCroc
1ba30d4bdb Increment version 
Change-Id: I01966a3e4b177a2a19f7c50322bb3e601cf1bb24
 2021-07-04 11:52:31 +02:00
dependabot[bot]
9ff1e20f07
Bump material from 1.3.0 to 1.4.0 
Bumps [material](https://github.com/material-components/material-components-android) from 1.3.0 to 1.4.0.
- [Release notes](https://github.com/material-components/material-components-android/releases)
- [Commits](https://github.com/material-components/material-components-android/compare/1.3.0...1.4.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>
 2021-07-02 23:07:53 +00:00
ganfra
f74a71001a Change active call bar + some minor changes in call screen 2021-07-01 20:05:58 +02:00
Benoit Marty
69c399a229
Merge pull request #3529 from erikhuizinga/erikhuizinga-3527-fix-google-play-service-application 
Apply Google Services Gradle plugin more robustly
 2021-07-01 10:16:00 +02:00
Onuray Sahin
5676226f42 Voice message recording view implementations. 2021-07-01 10:47:41 +03:00
dependabot[bot]
752290424c
Bump core-ktx from 1.5.0 to 1.6.0 
Bumps core-ktx from 1.5.0 to 1.6.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-06-30 23:07:55 +00:00
dependabot[bot]
2ebfeb1709
Bump androidxTest_version from 1.3.0 to 1.4.0 
Bumps `androidxTest_version` from 1.3.0 to 1.4.0.

Updates `core` from 1.3.0 to 1.4.0

Updates `runner` from 1.3.0 to 1.4.0

Updates `rules` from 1.3.0 to 1.4.0

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

Signed-off-by: dependabot[bot] <support@github.com>
 2021-06-30 23:06:24 +00:00
S1m
4a8fa4a3ce embedded distrib: original gateway 2021-06-30 19:53:24 +02:00
dependabot[bot]
9e2f2f2372
Bump libphonenumber from 8.12.25 to 8.12.26 
Bumps [libphonenumber](https://github.com/google/libphonenumber) from 8.12.25 to 8.12.26.
- [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.25...v8.12.26)

---
updated-dependencies:
- dependency-name: com.googlecode.libphonenumber:libphonenumber
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-06-24 23:05:19 +00:00
Benoit Marty
ca3e5cdf90
Merge pull request #3544 from vector-im/dependabot/gradle/org.amshove.kluent-kluent-android-1.67 
Bump kluent-android from 1.65 to 1.67
 2021-06-24 14:49:53 +02:00
Benoit Marty
14184aae6f
Merge pull request #3506 from vector-im/dependabot/gradle/com.googlecode.libphonenumber-libphonenumber-8.12.25 
Bump libphonenumber from 8.12.24 to 8.12.25
 2021-06-24 14:34:45 +02:00
Benoit Marty
ed90f376e6
Merge pull request #3518 from vector-im/dependabot/gradle/androidx.fragment-fragment-ktx-1.3.5 
Bump fragment-ktx from 1.3.4 to 1.3.5
 2021-06-24 14:31:04 +02:00
SpiritCroc
d11c1fcc62 Merge tag 'v1.1.11' into sc 
Change-Id: I15d6e584f1594764f956c129003b2a459b5d24a6
 2021-06-24 10:19:24 +02:00
SpiritCroc
72aa4bb999 Merge tag 'v1.1.10' into sc 
Change-Id: I01e7b61adf9444e6894232235ee71ac8295b00ab

Conflicts:
	library/ui-styles/src/main/res/color/bottom_navigation_icon_tint_selector.xml
	library/ui-styles/src/main/res/drawable/splash.xml
	library/ui-styles/src/main/res/values/theme_light.xml
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/accountdata/RoomAccountDataTypes.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/HomeDetailViewModel.kt
	vector/src/main/java/im/vector/app/features/home/HomeDetailViewState.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/composer/TextComposerView.kt
	vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomController.kt
	vector/src/main/java/im/vector/app/features/spaces/SpaceSettingsMenuBottomSheet.kt
	vector/src/main/java/im/vector/app/features/spaces/SpaceSummaryController.kt
	vector/src/main/java/im/vector/app/features/spaces/SpacesListViewModel.kt
	vector/src/main/java/im/vector/app/features/themes/ActivityOtherThemes.kt
	vector/src/main/java/im/vector/app/features/themes/ThemeUtils.kt
	vector/src/main/res/drawable/ic_attachment.xml
	vector/src/main/res/drawable/ic_insert_emoji.xml
	vector/src/main/res/drawable/ic_keyboard.xml
	vector/src/main/res/layout/composer_layout.xml
	vector/src/main/res/layout/composer_layout_constraint_set_compact.xml
	vector/src/main/res/layout/composer_layout_constraint_set_expanded.xml
	vector/src/main/res/layout/fragment_home_detail.xml
	vector/src/main/res/layout/fragment_login_server_url_form.xml
	vector/src/main/res/layout/fragment_user_list.xml
	vector/src/main/res/layout/item_bottom_sheet_message_preview.xml
	vector/src/main/res/layout/item_keys_backup_settings_button_footer.xml
	vector/src/main/res/layout/item_room.xml
	vector/src/main/res/layout/item_space_beta_header.xml
	vector/src/main/res/layout/item_suggested_room.xml
	vector/src/main/res/layout/item_timeline_event_redacted_stub.xml
	vector/src/main/res/layout/item_timeline_event_text_message_stub.xml
	vector/src/main/res/values/styles_riot.xml
 2021-06-23 13:38:41 +02:00
Benoit Marty
0c88d11429 Version++ 2021-06-22 12:28:18 +02:00
dependabot[bot]
e2e3e2de86
Bump kluent-android from 1.65 to 1.67 
Bumps [kluent-android](https://github.com/MarkusAmshove/Kluent) from 1.65 to 1.67.
- [Release notes](https://github.com/MarkusAmshove/Kluent/releases)
- [Changelog](https://github.com/MarkusAmshove/Kluent/blob/master/CHANGELOG.md)
- [Commits](https://github.com/MarkusAmshove/Kluent/commits)

---
updated-dependencies:
- dependency-name: org.amshove.kluent:kluent-android
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-06-21 23:06:17 +00:00
SpiritCroc
6626c5b600 Merge commit '8b138e8ff' into sc 
Change-Id: Icbda29234a03a5498d1aa1b9bbf9bba386f7c2cc

Conflicts:
	vector/src/main/java/im/vector/app/features/grouplist/HomeSpaceSummaryItem.kt
	vector/src/main/java/im/vector/app/features/home/room/breadcrumbs/BreadcrumbsController.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/MessageTextItem.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/ReadReceiptsItem.kt
	vector/src/main/java/im/vector/app/features/home/room/filtered/FilteredRoomFooterItem.kt
	vector/src/main/java/im/vector/app/features/home/room/list/RoomCategoryItem.kt
	vector/src/main/java/im/vector/app/features/spaces/SpaceSummaryController.kt
	vector/src/main/java/im/vector/app/features/spaces/SpaceSummaryItem.kt
	vector/src/main/java/im/vector/app/features/userdirectory/UserDirectoryUserItem.kt
 2021-06-20 09:18:03 +02:00
Benoit Marty
b30c27b7a6 Version++ 2021-06-18 21:50:12 +02:00
Erik Huizinga
cc5260b311
Disable non-Gplay flavor *GoogleServices* tasks 2021-06-18 17:23:11 +02:00
Erik Huizinga
22f3f612d7
Apply Google Services Gradle plugin more robustly 
Fixes #3527
 2021-06-18 12:26:31 +02:00
Onuray Sahin
69350ef514 Voice message UI initial implementation. 2021-06-17 16:17:38 +03:00
dependabot[bot]
7c19c9f0b7
Bump fragment-ktx from 1.3.4 to 1.3.5 
Bumps fragment-ktx from 1.3.4 to 1.3.5.

---
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>
 2021-06-16 23:08:30 +00:00
Benoit Marty
df613c6044
Merge pull request #3511 from vector-im/feature/bma/theme_again 
Create a module with themes and styles
 2021-06-16 14:33:45 +02:00
Benoit Marty
f5f09224b1 Create module for ui-styles 2021-06-15 12:23:54 +02:00
dependabot[bot]
dd74b8a755
Bump libphonenumber from 8.12.24 to 8.12.25 
Bumps [libphonenumber](https://github.com/google/libphonenumber) from 8.12.24 to 8.12.25.
- [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.24...v8.12.25)

---
updated-dependencies:
- dependency-name: com.googlecode.libphonenumber:libphonenumber
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-06-15 06:25:21 +00:00
dependabot[bot]
a2db0e4cce
Bump epoxy_version from 4.6.1 to 4.6.2 
Bumps `epoxy_version` from 4.6.1 to 4.6.2.

Updates `epoxy` from 4.6.1 to 4.6.2
- [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.6.1...4.6.2)

Updates `epoxy-glide-preloading` from 4.6.1 to 4.6.2
- [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.6.1...4.6.2)

Updates `epoxy-processor` from 4.6.1 to 4.6.2
- [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.6.1...4.6.2)

Updates `epoxy-paging` from 4.6.1 to 4.6.2
- [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.6.1...4.6.2)

---
updated-dependencies:
- dependency-name: com.airbnb.android:epoxy
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: com.airbnb.android:epoxy-glide-preloading
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: com.airbnb.android:epoxy-processor
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: com.airbnb.android:epoxy-paging
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-06-14 07:33:43 +00:00
SpiritCroc
99832243a6 Increment version 
Change-Id: Ia33c739201d13d466f302fce991488d8d850bbfd
 2021-06-12 10:29:05 +02:00
Benoit Marty
e9db1dbb08
Merge pull request #3488 from vector-im/dependabot/gradle/daggerVersion-2.37 
Bump daggerVersion from 2.36 to 2.37
 2021-06-11 12:24:49 +02:00
dependabot[bot]
cc67e83b21
Bump daggerVersion from 2.36 to 2.37 
Bumps `daggerVersion` from 2.36 to 2.37.

Updates `dagger` from 2.36 to 2.37
- [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.36...dagger-2.37)

Updates `dagger-compiler` from 2.36 to 2.37
- [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.36...dagger-2.37)

---
updated-dependencies:
- 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
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-06-11 05:54:29 +00:00
ganfra
68143ab2cf Merge branch 'develop' into feature/fga/voip_asserted_identity 2021-06-10 16:01:48 +02:00
Benoit Marty
aa8456575d use multidex from androidx and not android support 2021-06-09 20:49:56 +02:00
Benoit Marty
706b2f5ea2
Merge pull request #3455 from vector-im/dependabot/gradle/androidx.recyclerview-recyclerview-1.2.1 
Bump recyclerview from 1.2.0 to 1.2.1
 2021-06-09 18:02:36 +02:00
dependabot[bot]
b8c10312d1
Bump zxcvbn from 1.5.0 to 1.5.2 
Bumps [zxcvbn](https://github.com/nulab/zxcvbn4j) from 1.5.0 to 1.5.2.
- [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.5.0...1.5.2)

---
updated-dependencies:
- dependency-name: com.nulab-inc:zxcvbn
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-06-08 06:12:38 +00:00
Benoit Marty
8ec22de0b8
Merge pull request #3432 from vector-im/dependabot/gradle/com.github.yalantis-ucrop-2.2.7 
Bump ucrop from 2.2.6 to 2.2.7
 2021-06-03 10:13:28 +02:00
dependabot[bot]
37176b9770
Bump recyclerview from 1.2.0 to 1.2.1 
Bumps recyclerview from 1.2.0 to 1.2.1.

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

Signed-off-by: dependabot[bot] <support@github.com>
 2021-06-03 06:50:02 +00:00
SpiritCroc
c00600666e Merge tag 'v1.1.9' into sc 
Change-Id: I75baba645677d13f9937643a29630070f1470f9c

Conflicts:
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/RoomSyncHandler.kt
	vector/build.gradle
	vector/src/main/java/im/vector/app/features/media/ImageContentRenderer.kt
	vector/src/main/java/im/vector/app/features/ui/SharedPreferencesUiStateRepository.kt
 2021-06-02 17:49:34 +02:00
SpiritCroc
bddc574766 Increment version 
Change-Id: I03d7c37b12b0f5e6af2a44dedf76c3aff154d716
 2021-06-02 16:51:11 +02:00
Benoit Marty
26d54eeb8b Explicitly add dep to androidx.transition.transition, before it was a transitive dep from ucrop library. 2021-06-02 12:03:46 +02:00
Benoit Marty
77ffdabd60 Version++ 2021-06-02 11:48:08 +02:00
user
a3a946fb75 unifiedpush notification 2021-06-01 20:29:44 +02:00
ganfra
0eca809b83 Asserted identity: handle if needed and use the data 2021-06-01 18:12:10 +02:00
dependabot[bot]
92f5008a41
Bump ucrop from 2.2.6 to 2.2.7 
Bumps [ucrop](https://github.com/Yalantis/uCrop) from 2.2.6 to 2.2.7.
- [Release notes](https://github.com/Yalantis/uCrop/releases)
- [Commits](https://github.com/Yalantis/uCrop/compare/2.2.6...2.2.7)

Signed-off-by: dependabot[bot] <support@github.com>
 2021-05-31 19:10:36 +00:00
dependabot[bot]
7fb76b2541
Bump libphonenumber from 8.12.23 to 8.12.24 
Bumps [libphonenumber](https://github.com/google/libphonenumber) from 8.12.23 to 8.12.24.
- [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.23...v8.12.24)

Signed-off-by: dependabot[bot] <support@github.com>
 2021-05-27 06:23:10 +00:00
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