Commit Graph

768 Commits

Author SHA1 Message Date
SpiritCroc bd6814325b Increment version
Change-Id: Ibbb95ad01f2fbc96d1941de8db57c754c059ea7f
2021-11-06 09:24:27 +01:00
Benoit Marty f3655d4664
Merge pull request #4363 from vector-im/feature/fga/rx_flow_migration
Feature/fga/rx flow migration
2021-11-04 18:44:48 +01:00
Benoit Marty bcffbbefd7 Version++ 2021-11-04 18:42:52 +01:00
dependabot[bot] 959e6b67e3
Bump firebase-messaging from 22.0.0 to 23.0.0
Bumps firebase-messaging from 22.0.0 to 23.0.0.

---
updated-dependencies:
- dependency-name: com.google.firebase:firebase-messaging
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-10-29 23:07:15 +00:00
ganfra 16e4a7f653 Flow migration: fix kotlinx-coroutines-debug dependencie 2021-10-28 18:17:01 +02:00
Adam Brown 73995eb7bd downgrading zxing library as it has a known crash on android versions below 7.0 2021-10-28 16:18:34 +01:00
ganfra 635ca8e276 Merge branch 'develop' into feature/fga/rx_flow_migration 2021-10-27 16:05:43 +02:00
SpiritCroc 72a7e0677e Merge tag 'v1.3.6' into sc
Change-Id: I6fb1ef7b45ef67915a8d5bd17bf36cab90e9bf02
2021-10-27 15:25:05 +02:00
ganfra 34cb99e8ae Flow migration: remove Rx completely (rxbinding) 2021-10-27 12:13:49 +02:00
dependabot[bot] 82b3d17db6
Bump libphonenumber from 8.12.35 to 8.12.36
Bumps [libphonenumber](https://github.com/google/libphonenumber) from 8.12.35 to 8.12.36.
- [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.35...v8.12.36)

---
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-10-26 23:08:52 +00:00
Benoit Marty 042e91ee1c Set version to 1.3.6 2021-10-26 18:28:47 +02:00
ganfra a9d192fa39 Flow migration: add back some test 2021-10-26 18:09:07 +02:00
Benoit Marty 01a29f67d0 Version++ 2021-10-26 17:33:23 +02:00
ganfra 9479342a64 Flow: remove more rx 2021-10-26 15:16:10 +02:00
ganfra c936954119 Flow migration: start replacing Rx by Flow 2021-10-26 14:24:23 +02:00
Benoit Marty 3354cd1760
Merge pull request #4312 from vector-im/feature/fga/hilt_app_migration
Migrate App DI framework to Hilt
2021-10-25 12:41:02 +02:00
Benoit Marty 79d56319b7 Version++ 2021-10-25 12:40:24 +02:00
ganfra e9b58844b3 Merge branch 'develop' into feature/fga/hilt_app_migration 2021-10-22 11:30:49 +02:00
SpiritCroc 8171a85657 Merge remote-tracking branch 'upstream/develop' into sc
Change-Id: Ia092f493aa3e3ad509eb7876e19fc773b40cc233
2021-10-22 11:16:40 +02:00
SpiritCroc 978056e01f Merge tag 'v1.3.4' into sc
Conflicts:
	dependencies.gradle
	gradle.properties
	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/parsing/RoomSyncAccountDataHandler.kt
	vector/build.gradle
	vector/src/gplay/java/im/vector/app/push/fcm/FcmHelper.kt
	vector/src/main/java/im/vector/app/core/pushers/PushersManager.kt
	vector/src/main/java/im/vector/app/core/pushers/VectorMessagingReceiver.kt
	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/timeline/TimelineEventController.kt
	vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryItem.kt
	vector/src/main/java/im/vector/app/features/settings/notifications/VectorSettingsNotificationPreferenceFragment.kt
	vector/src/main/java/im/vector/app/features/settings/troubleshoot/TestTokenRegistration.kt
	vector/src/main/java/im/vector/app/features/spaces/SpaceListViewState.kt

Parts of conflict resolution taken from

    commit 3302ab563ea549684f1e7d7604da01d6856c8d8d
    Merge: 06f52832b 1f74bc986
    Author: S1m <git@sgougeon.fr>
    Date:   Fri Oct 15 09:36:46 2021 +0200

        Merge remote-tracking branch 'upstream/develop' into unifiedpush

Change-Id: I25ad98c59df8b8057147260d790eb2a86d6a6e9b
2021-10-21 17:31:11 +02:00
ganfra d41ff50097 Fix crash when clicking on ViewEvent source actions #4279 2021-10-21 16:34:20 +02:00
Benoit Marty 7c9c4ecf5f Version++ 2021-10-20 10:49:40 +02:00
Benoit Marty 85983562fa No need to add explicit dependencies on stdlib, this is added by the gradle plugin since 1.4
https://kotlinlang.org/docs/whatsnew14.html#dependency-on-the-standard-library-added-by-default
2021-10-19 19:06:27 +02:00
ganfra ff53cf4db9 Hilt: replace the VectorComponent 2021-10-14 18:47:28 +02:00
dependabot[bot] 0a9c6673af
Bump media from 1.4.2 to 1.4.3
Bumps media from 1.4.2 to 1.4.3.

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

Signed-off-by: dependabot[bot] <support@github.com>
2021-10-13 23:05:53 +00:00
dependabot[bot] 7be7d50575
Bump libphonenumber from 8.12.34 to 8.12.35
Bumps [libphonenumber](https://github.com/google/libphonenumber) from 8.12.34 to 8.12.35.
- [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.34...v8.12.35)

---
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-10-12 23:10:59 +00:00
Benoit Marty e3034e5d11
Merge pull request #4190 from vector-im/feature/fga/mavericks_2
Feature/fga/mavericks 2
2021-10-12 14:11:00 +02:00
ganfra a24a9b43fa Mavericks 2: make the UT happy. Let SDK exposes MatrixCoroutineDispatchers. 2021-10-12 13:47:32 +02:00
Benoit Marty f89a32da1f Add opt-in for kotlinx.coroutines annotations 2021-10-11 14:27:55 +02:00
Benoit Marty 6721669d1d Fixes false positive "This is an internal Mavericks API. It is not intended for external use."
of MvRx `by viewModel()` calls. Maybe due to the inlining of code... This is a temporary fix...
2021-10-11 14:27:45 +02:00
SpiritCroc 57a9ea4617 Merge tag 'v1.3.3' into sc
Change-Id: Ie2c7157dba2c23916e99669ee5c3705c2f6cea30
2021-10-11 12:42:06 +02:00
Benoit Marty 343783f807 Version++ 2021-10-11 12:06:51 +02:00
SpiritCroc dffc0c1d65 Merge tag 'v1.3.2' into sc
Change-Id: I7faf88b02994b10027bbbd00b7ac565a94381cc5

Conflicts:
	.gitignore
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/ReadQueries.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryUpdater.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/TokenChunkEventPersistor.kt
	vector/src/main/AndroidManifest.xml
	vector/src/main/java/im/vector/app/core/di/FragmentModule.kt
	vector/src/main/java/im/vector/app/features/configuration/VectorConfiguration.kt
	vector/src/main/java/im/vector/app/features/grouplist/HomeSpaceSummaryItem.kt
	vector/src/main/java/im/vector/app/features/home/HomeActivity.kt
	vector/src/main/java/im/vector/app/features/home/HomeDrawerFragment.kt
	vector/src/main/java/im/vector/app/features/home/UnreadMessagesSharedViewModel.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/TextComposerView.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/composer/VoiceMessageRecorderView.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/filtered/FilteredRoomFooterItem.kt
	vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewModel.kt
	vector/src/main/java/im/vector/app/features/notifications/NotificationDrawerManager.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/settings/troubleshoot/TestTokenRegistration.kt
	vector/src/main/java/im/vector/app/features/spaces/SpaceListViewState.kt
	vector/src/main/java/im/vector/app/features/themes/ThemeUtils.kt
	vector/src/main/res/layout/composer_layout_constraint_set_compact.xml
	vector/src/main/res/layout/composer_layout_constraint_set_expanded.xml
2021-10-11 09:55:26 +02:00
ganfra 2a29243298 Mavericks 2: clean code, but have warnings 2021-10-08 16:45:29 +02:00
Benoit Marty 3a387c5e32 version++ 2021-10-08 16:36:48 +02:00
ganfra 3bdf264a53 Merge develop into feature/fga/mavericks_2 2021-10-08 10:49:43 +02:00
SpiritCroc 2eec10a0c9 Increment version
Change-Id: I59493d232f89b6d61d442993b6a260c4d5e578b3
2021-10-08 08:49:37 +02:00
ganfra 362ebcbe42 Revert "Mavericks 2: remove matrix-sdk-android-flow as it will be easier when entirely migrating to flow"
This reverts commit d9b02a20d8.
2021-10-07 11:11:44 +02:00
dependabot[bot] c55598a099
Bump libphonenumber from 8.12.33 to 8.12.34
Bumps [libphonenumber](https://github.com/google/libphonenumber) from 8.12.33 to 8.12.34.
- [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.33...v8.12.34)

---
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-10-06 23:07:32 +00:00
S1m 450b0bbbaf Update UnifiedPush:android-connector to 1.2.2 2021-10-06 09:24:48 +02:00
ganfra d9b02a20d8 Mavericks 2: remove matrix-sdk-android-flow as it will be easier when entirely migrating to flow 2021-10-05 18:57:34 +02:00
ganfra 9337e0e76d Mavericks 2: create sdk flow module 2021-10-01 15:19:48 +02:00
ganfra 2324bf5d05 Mavericks 2: include the libs and make it compile 2021-09-30 19:52:37 +02:00
SpiritCroc 38ae03893f Merge tag 'v1.3.1' into sc
Change-Id: I1e5589c78e3398867519b1dbd326581cbe60baea

Conflicts:
	vector/src/main/java/im/vector/app/features/home/room/detail/composer/VoiceMessageRecorderView.kt
	vector/src/main/java/im/vector/app/features/settings/VectorSettingsAdvancedSettingsFragment.kt
	vector/src/main/res/drawable/ic_jump_to_unread.xml
	vector/src/main/res/drawable/ic_radio_on.xml
	vector/src/main/res/drawable/ic_voice_message_locked.xml
	vector/src/main/res/drawable/ic_voice_mic_recording.xml
2021-09-30 09:27:15 +02:00
SpiritCroc de0f44307b Switch to own UP FCM fork for now
Change-Id: Ic96668ca69da62d93d360a4175e08579d58c6e67
2021-09-30 09:18:57 +02:00
Benoit Marty d5f9d8086a
Merge pull request #4049 from vector-im/dependabot/gradle/com.arthenica-ffmpeg-kit-audio-4.5
Bump ffmpeg-kit-audio from 4.4.LTS to 4.5
2021-09-29 17:10:31 +02:00
Benoit Marty 31a7bfed02 version++ 2021-09-29 14:56:10 +02:00
SpiritCroc 0c7981dc26 Revert "Revert "Revert "Use Java 11 source code"""
This reverts commit 23afa02cad957e4426cc7fc872910c6f0b556cb5.

Change-Id: I0dc76749a7084473a5c15e84032f0ba5058cac72

Conflicts:
	attachment-viewer/build.gradle
	library/ui-styles/build.gradle
	matrix-sdk-android-rx/build.gradle
	matrix-sdk-android/build.gradle
	vector/build.gradle
2021-09-29 09:56:32 +02:00
SpiritCroc 4f93eb041c Merge tag 'v1.3.0' into sc
Change-Id: Ib681fa5493f078b15d6110262ba622b9d0384d68

Conflicts:
	gradle.properties
	vector/build.gradle
	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/pushers/VectorMessagingReceiver.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/RoomDetailViewModel.kt
	vector/src/main/java/im/vector/app/features/settings/notifications/VectorSettingsNotificationPreferenceFragment.kt
	vector/src/main/java/im/vector/app/features/spaces/SpaceSettingsMenuBottomSheet.kt
	vector/src/main/res/layout/reaction_button.xml
2021-09-29 09:55:02 +02:00
SpiritCroc b51bd743c7 Revert "Revert "Use Java 11 source code""
This will make the latest upstream merge easier.

This reverts commit 302b2865264ec94471c59041ce8efdc45d3764f4.
2021-09-29 09:13:59 +02:00
dependabot[bot] ae3e6a0706
Bump seismic from 1.0.2 to 1.0.3
Bumps [seismic](https://github.com/square/seismic) from 1.0.2 to 1.0.3.
- [Release notes](https://github.com/square/seismic/releases)
- [Changelog](https://github.com/square/seismic/blob/master/CHANGELOG.md)
- [Commits](https://github.com/square/seismic/compare/seismic-parent-1.0.2...seismic-parent-1.0.3)

---
updated-dependencies:
- dependency-name: com.squareup:seismic
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-09-28 23:06:09 +00:00
Benoit Marty 23615c0038
Merge pull request #4091 from vector-im/feature/adm/verify-exported-keys-output
Verify exported keys output
2021-09-28 15:14:34 +02:00
Benoit Marty 7d7ea3b9ad Avoid multiple PRs from Dependabot when a new version of com.vanniktech:emoji* is available
Not updating the vesion here, dependabot will do it.
2021-09-28 11:29:52 +02:00
Adam Brown 789cc6b597 exlcuding the slf4j logger from the test dependencies
the videocache dependency includes slf4j which in turn causes mockk to reflectively attempt to call real Log functions, which crashes the units tests due to the stub android.jar
2021-09-27 17:23:03 +01:00
Benoit Marty 9f93850046
Keep LTS version 2021-09-27 16:22:00 +02:00
Benoit Marty 5b5dcf988d Version++ 2021-09-27 13:09:58 +02:00
Benoit Marty 53c8862ca2 Change version to 1.3.0 2021-09-27 11:57:23 +02:00
Nick Hu 78b870c558
Downgrade markwon version and enable LaTeX rendering for messages 2021-09-24 13:50:34 +01:00
dependabot[bot] 5e7e66b18c
Bump barista from 4.1.0 to 4.2.0
Bumps [barista](https://github.com/AdevintaSpain/Barista) from 4.1.0 to 4.2.0.
- [Release notes](https://github.com/AdevintaSpain/Barista/releases)
- [Commits](https://github.com/AdevintaSpain/Barista/compare/4.1.0...4.2.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
2021-09-24 07:53:52 +00:00
Benoit Marty 1b262a4df8
Merge pull request #4071 from vector-im/tools/adm/connected_tests
Fixing no tests found when running vector:connectedAndroidTest
2021-09-24 09:53:04 +02:00
Adam Brown 7bd8890276 extracting orchestrator dependency to the dependencies.gradle file 2021-09-23 20:24:16 +01:00
Adam Brown d7bc32d7ca including tech orchestrator in the vector module script, fixes the no tests found error 2021-09-23 17:22:19 +01:00
Benoit Marty e4bc60d255
Merge pull request #4020 from vector-im/dependabot/gradle/androidx.media-media-1.4.2
Bump media from 1.4.1 to 1.4.2
2021-09-23 15:53:17 +02:00
dependabot[bot] 6e010ad693
Bump ffmpeg-kit-audio from 4.4.LTS to 4.5
Bumps [ffmpeg-kit-audio](https://github.com/tanersener/ffmpeg-kit) from 4.4.LTS to 4.5.
- [Release notes](https://github.com/tanersener/ffmpeg-kit/releases)
- [Commits](https://github.com/tanersener/ffmpeg-kit/compare/v4.4.LTS...v4.5)

---
updated-dependencies:
- dependency-name: com.arthenica:ffmpeg-kit-audio
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-09-23 12:24:46 +00:00
Benoit Marty 93506d18fa Display push counter on debug mode 2021-09-23 13:54:03 +02:00
dependabot[bot] 654010570e
Bump libphonenumber from 8.12.32 to 8.12.33
Bumps [libphonenumber](https://github.com/google/libphonenumber) from 8.12.32 to 8.12.33.
- [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.32...v8.12.33)

---
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-09-22 23:05:09 +00:00
SpiritCroc f97549073e Increment version
Change-Id: If37db85f2d3e0affd140961f9efc87c8440c5033
2021-09-18 20:38:14 +02:00
SpiritCroc 756529e565 Revert "Use Java 11 source code"
This seems to break device compatibility with a ZTE Blade L3, Android
5.0.2, stock ROM - even though the Google Play Developer Console views
the device as supported.

Not sure how long we want to stick to Java 8, but we should at least
give everyone who had v1.2.0 installed the chance to get to v1.2.2, to
get a version with the recent security vulerability fix.

This reverts commit 80f23f1f3c.

Change-Id: If599d9154e9385a33f10b6df17469cd86deccb7b
2021-09-18 20:26:29 +02:00
dependabot[bot] a3a49593e4
Bump media from 1.4.1 to 1.4.2
Bumps media from 1.4.1 to 1.4.2.

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

Signed-off-by: dependabot[bot] <support@github.com>
2021-09-17 13:29:35 +00:00
ariskotsomitopoulos 1dcf6b9539 Enhance dependencies handling to support Dependabot 2021-09-17 14:58:44 +03:00
ariskotsomitopoulos 87fefdc7bb Add more dependencies to common dependencies.gradle 2021-09-15 20:22:52 +03:00
ariskotsomitopoulos c89b2c0536 Optimize dependencies handling 2021-09-15 13:21:25 +03:00
SpiritCroc c38ece586e Increment version
Change-Id: I70c18491f03854898fa9989add666530dbc0b668
2021-09-13 16:20:06 +02:00
SpiritCroc 741ac9f3f6 Merge tag 'v1.2.2' into sc
Change-Id: Icda1859305bac1e48f3d1889282a23049dd83c29
2021-09-13 15:37:54 +02:00
Benoit Marty db55693201 version++ 2021-09-13 15:29:51 +02:00
Benoit Marty cccf812906 Version++ (1.2.2) 2021-09-13 15:25:56 +02:00
dependabot[bot] 57abc04752
Bump libphonenumber from 8.12.31 to 8.12.32
Bumps [libphonenumber](https://github.com/google/libphonenumber) from 8.12.31 to 8.12.32.
- [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.31...v8.12.32)

---
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-09-10 23:07:44 +00:00
SpiritCroc 3be0b85dcf Actually, this is 1.2.1 now
Change-Id: I13a84dc84c37892cf5d18c549bc305f9a6b1e7ce
2021-09-09 16:21:19 +02:00
SpiritCroc 133579d066 Merge tag 'v1.2.1' into sc
Change-Id: I7446b0a3b8f2bbeee76e337e78eb722cbd05ef2a

Conflicts:
	build.gradle
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt
	vector/src/main/java/im/vector/app/core/di/VectorComponent.kt
	vector/src/main/java/im/vector/app/features/home/HomeActivity.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/composer/VoiceMessageRecorderView.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/actions/RoomListQuickActionsEpoxyController.kt
	vector/src/main/java/im/vector/app/features/notifications/NotificationUtils.kt
	vector/src/main/java/im/vector/app/features/settings/VectorSettingsBaseFragment.kt
	vector/src/main/java/im/vector/app/features/settings/VectorSettingsLabsFragment.kt
2021-09-09 10:51:12 +02:00
Benoit Marty 5a5d4fda2d DSL value has shorter alias now 2021-09-09 09:55:24 +02:00
SpiritCroc 832f0e0e5b Increment version
Change-Id: Ia225fd512fb1bccd7a2277a2e6f423c8f7ef8969
2021-09-09 09:39:24 +02:00
Benoit Marty 9914fb2d0f Version++ 2021-09-08 19:15:08 +02:00
Benoit Marty 73881d0813 Upgrade dependency on Barista.
Should fix #3929

Barista has changed location since 4.0.0
2021-09-03 17:02:14 +02:00
Benoit Marty ec6bae6b1e Lint now check all the modules, but is does not check all the variants. Let's keep it like that for now
https://developer.android.com/studio/releases/gradle-plugin#running_lint_on_default_variant_only
2021-09-02 10:43:33 +02:00
Benoit Marty 80f23f1f3c Use Java 11 source code
https://developer.android.com/studio/releases/gradle-plugin#java-11
2021-09-02 09:50:34 +02:00
Benoit Marty 5b2478a34f
Merge pull request #3894 from vector-im/feature/dla/keyword_notification_settings
Feature/dla/keyword notification settings
2021-08-27 18:19:17 +02:00
Benoit Marty 54a4a84ac0
Merge pull request #3741 from vector-im/dependabot/gradle/daggerVersion-2.38.1
Bump daggerVersion from 2.38 to 2.38.1
2021-08-27 17:37:03 +02:00
Benoit Marty 0046de576e
Merge pull request #3767 from vector-im/dependabot/gradle/androidx.constraintlayout-constraintlayout-2.1.0
Bump constraintlayout from 2.1.0-beta02 to 2.1.0
2021-08-27 16:39:34 +02:00
dependabot[bot] 7a44c6980c
Bump daggerVersion from 2.38 to 2.38.1
Bumps `daggerVersion` from 2.38 to 2.38.1.

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

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

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

Signed-off-by: dependabot[bot] <support@github.com>
2021-08-27 14:33:17 +00:00
Benoit Marty fa1a6b141a
Merge pull request #3832 from vector-im/dependabot/gradle/com.jakewharton.timber-timber-5.0.1
Bump timber from 4.7.1 to 5.0.1
2021-08-27 16:32:29 +02:00
ganfra fd25813862 Merge branch 'develop' into feature/fga/new_voip_design 2021-08-26 15:15:16 +02:00
David Langley ce9acd440e Enabled Notifications V2 2021-08-25 17:54:23 +01:00
Benoit Marty f843712d7e
Merge pull request #3825 from vector-im/feature/dla/room_notification_settings
Room Notification Settings V2
2021-08-25 15:20:43 +02:00
dependabot[bot] 8988ea8997
Bump libphonenumber from 8.12.30 to 8.12.31
Bumps [libphonenumber](https://github.com/google/libphonenumber) from 8.12.30 to 8.12.31.
- [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.30...v8.12.31)

---
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-08-24 23:09:52 +00:00
David Langley 4d4d370b8f checks and remove build settings 2021-08-24 22:33:32 +01:00
David Langley f8114dd7a1 Fix HomeList error snackbar and add dialog for bottom sheet errors 2021-08-24 22:28:31 +01:00
ganfra 42bfa129b3 Merge branch 'develop' into feature/fga/new_voip_design 2021-08-24 16:21:35 +02:00
dependabot[bot] 3a03b5b63c
Bump timber from 4.7.1 to 5.0.1
Bumps [timber](https://github.com/JakeWharton/timber) from 4.7.1 to 5.0.1.
- [Release notes](https://github.com/JakeWharton/timber/releases)
- [Changelog](https://github.com/JakeWharton/timber/blob/trunk/CHANGELOG.md)
- [Commits](https://github.com/JakeWharton/timber/compare/4.7.1...5.0.1)

---
updated-dependencies:
- dependency-name: com.jakewharton.timber:timber
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-08-23 13:12:59 +00:00
dependabot[bot] 9659bcf3e0
Bump constraintlayout from 2.1.0-beta02 to 2.1.0
Bumps [constraintlayout](https://github.com/androidx/constraintlayout) from 2.1.0-beta02 to 2.1.0.
- [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-08-23 13:12:18 +00:00
Benoit Marty 49f2ac26ad
Merge pull request #3783 from vector-im/dependabot/gradle/big_image_viewer_version-1.8.1
Bump big_image_viewer_version from 1.8.0 to 1.8.1
2021-08-23 15:09:29 +02:00
Benoit Marty 20baee2f53
Merge pull request #3794 from vector-im/dependabot/gradle/androidx.media-media-1.4.1
Bump media from 1.4.0 to 1.4.1
2021-08-23 15:05:33 +02:00
SpiritCroc 4918b7e7bf Merge branch 'unifiedpush' into sc
Change-Id: I0d19e4032b0f31cc1dee404cb383046d04a3259e
2021-08-21 09:21:19 +02:00
SpiritCroc 5f18fce771 Increment version
Change-Id: Iaee1fa3f6de051c2ea57b0e2cb286de25052e31c
2021-08-20 10:45:57 +02:00
SpiritCroc cad30d4790 Actually, we're still at 1.2.0
Got develop in by accident due to unifiedpush, but whatever

Change-Id: I3d15dd820274076e4383aa17467a87dac9eebe31
2021-08-19 10:42:47 +02:00
SpiritCroc 8475f24f17 Merge remote-tracking branch 'p1gp1g/unifiedpush' into unifiedpush
Change-Id: Ief98ae56d40f0724ba0e5f1f1c6ec09832425e58
2021-08-18 13:16:37 +02:00
SpiritCroc 3b3e39bbb6 Merge branch 'sc' into unifiedpush
Change-Id: I715e67cc1600706a6cfd7a2317df38909c74e11e
2021-08-18 13:16:19 +02:00
dependabot[bot] fac0198b26
Bump libphonenumber from 8.12.28 to 8.12.30
Bumps [libphonenumber](https://github.com/google/libphonenumber) from 8.12.28 to 8.12.30.
- [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.28...v8.12.30)

---
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-08-17 23:05:56 +00:00
ganfra 3b1249c489 Merge branch 'develop' into feature/fga/new_voip_design 2021-08-17 17:10:10 +02:00
S1m c584fa60dd Merge remote-tracking branch 'upstream/develop' into unifiedpush 2021-08-16 18:00:33 +02:00
SpiritCroc 8fe2a0021f Increment version
Change-Id: I5c2d1293f5251d6d4c0cb889195f2db8a509e378
2021-08-14 14:38:23 +02:00
SpiritCroc cf756b8789 Merge branch 'sc' into unifiedpush
Change-Id: Ieae8e880360266f2f5e44aac371701e0356419de
2021-08-12 09:30:41 +02:00
SpiritCroc 58f5310e83 Merge tag 'v1.2.0' into sc
v1.2.0

Change-Id: I900672607ec264e60c96c886d0accb053934fa4a

Conflicts:
	vector/src/main/res/xml/vector_settings_labs.xml
2021-08-12 09:03:42 +02:00
Onuray Sahin 37e722e85d version++ 2021-08-12 02:36:39 +03:00
SpiritCroc 5b7e2fdcaa Merge remote-tracking branch 'p1gp1g/unifiedpush' into unifiedpush-2
Change-Id: If4c64b14513d70cd376e3e1a9fbaeb1efb0ded12

Conflicts:
	vector/src/main/java/im/vector/app/features/call/webrtc/WebRtcCallManager.kt
	vector/src/main/java/im/vector/app/features/settings/notifications/VectorSettingsNotificationPreferenceFragment.kt
2021-08-11 18:08:02 +02:00
David Langley de5b2ad460 simplify logic in bottom sheet and add comment 2021-08-11 15:00:27 +01:00
Onuray Sahin 8216acfd5c version++ 2021-08-11 16:40:45 +03:00
David Langley 92a44cd9d6 add build config, use single variable in grandle file and update source to use feature flag 2021-08-11 13:13:38 +01:00
ganfra bcc9a75bdb Merge branch 'develop' into feature/fga/new_voip_design 2021-08-11 12:37:54 +02:00
David Langley 7f3c4f0073 Merge branch 'develop' of github.com:vector-im/element-android into feature/dla/reorg_account_notification_settings 2021-08-10 10:54:22 +01:00
SpiritCroc 677330921d Merge tag 'v1.1.16' into sc
v1.1.16

Change-Id: Id68bd7e36129c9168cc871d81c5c0935b689e1e9

Conflicts:
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/RealmCryptoStore.kt
	vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomController.kt
2021-08-10 09:54:58 +02:00
Onuray Sahin c167c8874d version++ 2021-08-09 00:54:16 +03:00
dependabot[bot] 9006118bc7
Bump media from 1.4.0 to 1.4.1
Bumps media from 1.4.0 to 1.4.1.

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

Signed-off-by: dependabot[bot] <support@github.com>
2021-08-04 23:10:33 +00:00
dependabot[bot] ef1a66a37c
Bump big_image_viewer_version from 1.8.0 to 1.8.1
Bumps `big_image_viewer_version` from 1.8.0 to 1.8.1.

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

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

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

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

---
updated-dependencies:
- dependency-name: com.github.piasy:BigImageViewer
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: com.github.piasy:GlideImageLoader
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: com.github.piasy:ProgressPieIndicator
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: com.github.piasy:GlideImageViewFactory
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-08-03 23:06:57 +00:00
SpiritCroc 25ba52115b Merge tag 'v1.1.15' into sc
Change-Id: I6bc7a7c052ccaae6adec247889b37baac2672ba4

Conflicts:
	vector/src/main/assets/open_source_licenses.html
	vector/src/main/java/im/vector/app/features/home/room/detail/composer/TextComposerView.kt
	vector/src/main/res/drawable/ic_insert_emoji.xml
	vector/src/main/res/layout/composer_layout_constraint_set_compact.xml
	vector/src/main/res/layout/fragment_room_detail.xml
	vector/src/main/res/layout/item_timeline_event_base.xml
	vector/src/main/res/xml/vector_settings_labs.xml
2021-08-01 09:37:33 +02:00
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