Commit Graph

197 Commits

Author SHA1 Message Date
Onuray Sahin d8ea9c8215 Add flag for qr code login. 2022-10-11 20:04:18 +03:00
Maxime NATUREL 7b352b44dc Replacing the feature flag by the new lab flag 2022-10-11 17:48:19 +02:00
Eric Decanini a096ff03c8
Merge pull request #7217 from vector-im/feature/eric/msc3881
Implements MSC3881 (enabled and device_id fields for Pusher API)
2022-10-10 12:37:47 -04:00
ericdecanini 267431d06e Fixes error 2022-10-10 11:37:39 -04:00
ericdecanini 4af2e62150 Merge branch 'develop' into feature/eric/msc3881 2022-10-09 12:45:19 -04:00
SpiritCroc 0e6eca191d Change default build-flavor to fdroid
Change-Id: I37cb532cbddc849c1a74a290fc75dc0cafb32f12
2022-10-08 11:25:40 +02:00
SpiritCroc fe785613e7 Merge tag 'v1.5.2' into sc
Change-Id: I0fe8262be9f2e5852815ad5f93329ffa17970b0e

Conflicts:
	vector/src/main/java/im/vector/app/SpaceStateHandlerImpl.kt
	vector/src/main/java/im/vector/app/features/disclaimer/DisclaimerDialog.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/NoticeItem.kt
	vector/src/main/java/im/vector/app/features/home/room/list/home/HomeRoomListViewModel.kt
	vector/src/main/java/im/vector/app/features/html/EventHtmlRenderer.kt
	vector/src/main/java/im/vector/app/features/media/ImageContentRenderer.kt
	vector/src/main/java/im/vector/app/features/settings/VectorLocale.kt
	vector/src/main/java/im/vector/app/features/settings/VectorPreferences.kt
	vector/src/main/java/im/vector/app/features/spaces/NewSpaceSummaryController.kt
	vector/src/main/java/im/vector/app/features/spaces/SpaceSummaryController.kt
	vector/src/main/java/im/vector/app/features/themes/ThemeUtils.kt
	vector/src/main/java/im/vector/app/features/voice/VoiceRecorderL.kt
	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
2022-10-07 20:32:26 +02:00
ericdecanini 42d0e4f265 Fixes bindings 2022-10-07 09:09:19 -04:00
Benoit Marty b1d3cc85c2 Remove the workaround, this is fixed in `androidx.sharetarget:sharetarget:1.2.0`. (with exported="true" declared in the library)
https://android-review.googlesource.com/c/platform/frameworks/support/+/1742473
2022-10-07 14:31:19 +02:00
Benoit Marty 652069d520 Manage new Android 13 notification permission. 2022-10-06 18:56:23 +02:00
dependabot[bot] ef88386fc1
Bump sharetarget from 1.1.0 to 1.2.0
Bumps sharetarget from 1.1.0 to 1.2.0.

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

Signed-off-by: dependabot[bot] <support@github.com>
2022-10-05 23:14:09 +00:00
Benoit Marty cde088e315
Merge branch 'develop' into dependabot/gradle/epoxy-5.0.0 2022-10-05 17:29:17 +02:00
Benoit Marty 38ca3b6cdb Version++ 2022-10-05 17:20:05 +02:00
Benoit Marty c76945f9c6 Fix tests, there is a new item in the list 2022-10-05 16:46:15 +02:00
ericdecanini 034046701d Merge remote-tracking branch 'origin/develop' into feature/eric/msc3881
# Conflicts:
#	vector/src/test/java/im/vector/app/test/fakes/FakeCryptoService.kt
2022-10-04 14:05:23 -04:00
Benoit Marty 17cd2a3302
Merge pull request #7266 from vector-im/dependabot/gradle/org.jetbrains.kotlin-kotlin-reflect-1.7.20
Bump kotlin-reflect from 1.7.10 to 1.7.20
2022-10-04 16:06:25 +02:00
ericdecanini f4dc435a97 Adds bindings to fdroid variant 2022-10-03 17:54:06 -04:00
Benoit Marty cba920f3e5 Enable Ksp for Epoxy Processor 2022-10-03 16:45:23 +02:00
Florian Renaud 0b0ea64a4b Add Voice Broadcast feature flag 2022-10-03 09:25:02 +02:00
dependabot[bot] 1db669d1c2
Bump kotlin-reflect from 1.7.10 to 1.7.20
Bumps [kotlin-reflect](https://github.com/JetBrains/kotlin) from 1.7.10 to 1.7.20.
- [Release notes](https://github.com/JetBrains/kotlin/releases)
- [Changelog](https://github.com/JetBrains/kotlin/blob/v1.7.20/ChangeLog.md)
- [Commits](https://github.com/JetBrains/kotlin/compare/v1.7.10...v1.7.20)

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

Signed-off-by: dependabot[bot] <support@github.com>
2022-09-29 23:21:58 +00:00
SpiritCroc bf78ec8964 Increment version
Change-Id: I2bc1e70cf0eaec2180b569e608f724d3ef145c26
2022-09-28 17:05:14 +02:00
SpiritCroc 87eaf85224 Security patch v1.5.1
Conflicts:
	library/ui-styles/src/main/res/values/colors.xml
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/AbsBaseMessageItem.kt

Change-Id: I0c8f5e098f92d0bf42e5ddc41bb6ad43c69bfdd2
2022-09-28 10:41:00 +02:00
Nikita Fedrunov e9d1a9e04e
app layout labs flag is enabled by default (#7237) 2022-09-27 09:54:24 +02:00
ericdecanini 4cebfa13e8 Adds missing bindings 2022-09-26 11:39:40 -04:00
Adam Brown ac9333312a switching emulator image to the playstore variant to fix no network on the buildjet runner
- updates max workers to match available resources
- re-enables previously failing test
2022-09-26 12:28:50 +01:00
SpiritCroc bb6595110b Merge tag 'v1.5.0' into merge-v1.5.0
Change-Id: Ifaa56941340ac1774d8b7bd470e32c5203d15f69

Conflicts:
	library/ui-styles/src/main/res/values/colors.xml
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt
	vector-app/src/fdroid/java/im/vector/app/fdroid/package-info.kt
	vector-app/src/gplay/java/im/vector/app/nightly/FirebaseNightlyProxy.kt
	vector/build.gradle
	vector/src/fdroid/java/im/vector/app/fdroid/package-info.kt
	vector/src/main/java/im/vector/app/features/autocomplete/member/AutocompleteEmojiDataItem.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/RoomListViewState.kt
	vector/src/main/java/im/vector/app/features/home/room/list/home/HomeRoomListViewModel.kt
	vector/src/main/java/im/vector/app/features/home/room/list/home/recent/RecentRoomCarouselController.kt
	vector/src/main/java/im/vector/app/features/settings/VectorPreferences.kt
	vector/src/main/res/menu/menu_new_home.xml
	vector/src/main/res/xml/vector_settings_labs.xml
2022-09-23 16:28:00 +02:00
Benoit Marty 46311356b7
Merge pull request #7222 from vector-im/feature/bma/ignore_flaky_test
Ignore flaky test "CantVerifyTest" and "fix" VoiceRecorderLTests
2022-09-23 15:10:30 +02:00
ganfra 92be6d1b49 Merge branch 'main' into develop 2022-09-23 12:20:00 +02:00
Benoit Marty 56f3ecc4af Disable flaky CantVerifyTest, for the time we are investigating the issue. 2022-09-23 11:46:40 +02:00
ganfra f8ed3520f5 Applayout: disable applayout by default 2022-09-23 11:45:34 +02:00
Benoit Marty 60bfd0dd42
Merge pull request #7159 from vector-im/feature/bma/fix_new_lint_warning
Fix lint warning
2022-09-22 17:35:10 +02:00
Adam Brown 65156a8ece
Merge pull request #7198 from vector-im/feature/adm/configurable-sync-timeout
Allow configurable sync timeout
2022-09-22 15:40:58 +01:00
Benoit Marty 2266723789 Remove `DefaultSharedPreferences` since we now have @DefaultPreferences which provide a singleton. 2022-09-22 16:32:14 +02:00
Benoit Marty 5736c8f648 Remove `DefaultSharedPreferences` since we now have @DefaultPreferences which provide a singleton.
Some fun has been moved to injectable classes due to this change. Not compiling, still work to do, but I prefer to split into 2 separate commits.
2022-09-22 16:32:14 +02:00
Benoit Marty d8436874e2 Fix `StaticFieldLeak` issue (context).
Make VectorLocal an injectable class.
2022-09-22 16:32:14 +02:00
Benoit Marty 151f6245db
Merge pull request #6929 from vector-im/feature/bma/android12
Target API 32 (Android 12)
2022-09-22 16:30:04 +02:00
ganfra fabfe36ede Update versions to 1.5.2 2022-09-22 10:31:31 +02:00
Adam Brown 600588dbbb adding trailing commas 2022-09-21 16:37:31 +01:00
Adam Brown 9ab78c93e2 reducing sync timeout for instrumentation tests to speed them up 2022-09-21 15:39:13 +01:00
Benoit Marty b9c28ba4ce
Merge branch 'develop' into feature/bma/android12 2022-09-21 16:24:30 +02:00
Benoit Marty d31d833959
Merge pull request #7180 from vector-im/feature/fre/deferred_dm_labs_flag
Deferred DMs - Add and enable the feature by default in the labs settings
2022-09-21 12:17:19 +02:00
Florian Renaud e9d809d9c3 Move and enable deferred DMs into labs settings 2022-09-21 09:36:07 +02:00
NIkita Fedrunov f6dfd64326 fixed all screens test to follow latest changes 2022-09-20 23:27:00 +02:00
Eric Decanini 7d2cbf5263
Merge pull request #7166 from vector-im/feature/eric/enable-app-layout-labs
Enables New App Layout in Labs
2022-09-19 13:35:40 -04:00
Benoit Marty e2d131fc4f Move xml resource in the module where they are used to avoid lint false positive `UnusedResources` issues. 2022-09-19 11:56:40 +02:00
NIkita Fedrunov 237da2ce22 changed app layout flag for all_test 2022-09-19 11:08:25 +02:00
Benoit Marty c91ba06285 Fix lint warnings, some code has vanished dur to the rebasing of the branch... 2022-09-19 10:50:15 +02:00
Benoit Marty 874bcc117a Fix regression on our dependency, due to merge of #6788.
We do not use `android-embedded_fcm_distributor` anymore (since #7068).
The code was compiling because `android-embedded_fcm_distributor` has a dependency on `firebase-messaging`.
2022-09-19 10:34:39 +02:00
NIkita Fedrunov 298aaece01 fixed checkVerifyPopup test fail 2022-09-18 18:02:45 +02:00
SpiritCroc 991a658221 Increment version
Change-Id: Ie455b8bc10071367f735a8cd1d1a0d1fd1323d16
2022-09-17 10:47:04 +02:00
dependabot[bot] 43a1bdb620
Bump play-services-location from 16.0.0 to 20.0.0
Bumps play-services-location from 16.0.0 to 20.0.0.

---
updated-dependencies:
- dependency-name: com.google.android.gms:play-services-location
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-09-16 23:18:13 +00:00
Benoit Marty 57db43c80a Fix gradle warning:
WARNING:API 'ApkVariantOutput.getVersionCodeOverride()' is obsolete and has been replaced with 'VariantOutput.versionCode()'.
2022-09-16 23:01:29 +02:00
Benoit Marty 536b9cf926 Move `@Suppress("DEPRECATION")` closer to the deprecated usage. Will help to detect other deprecated API usage. 2022-09-16 23:00:39 +02:00
Adam Brown e9d15b46d8 lifting the activity alias entry to the application module
- fixes the androidTests expecting a shortcuts xml
2022-09-15 14:50:08 +01:00
Adam Brown e9e29603de adding missing nightly source inclusions 2022-09-15 14:50:08 +01:00
Adam Brown 9e5f07a855 suppressing lint warning for constant that delegates to the correct value 2022-09-15 14:50:08 +01:00
Adam Brown 1d50bbdbda fixing manifest imports and giving androidTest its own dedicated manifest 2022-09-15 14:50:08 +01:00
Adam Brown 0c469ae079 removing extra application id declaration 2022-09-15 14:50:08 +01:00
Adam Brown 3a38898961 lifting fdroid and gplay variants to the application module 2022-09-15 14:50:08 +01:00
Adam Brown 373a0ca4fb split commit to make debug changes to avoid files being seen as new! 2022-09-15 14:50:08 +01:00
Adam Brown 5d533d4ec9 lifting debug build type to the application module 2022-09-15 14:50:08 +01:00
Adam Brown a947a53e14 lifting the release build type to the application module 2022-09-15 14:50:08 +01:00
Adam Brown b72a174edf lifting nightly to the application module 2022-09-15 14:50:08 +01:00
SpiritCroc bc1f3cb24d Merge tag 'v1.4.36' into merge-v1.4.36
Change-Id: I6fa1182a07b7b8ad507124fad3a8971ac38f2ac5

Conflicts:
	library/ui-strings/src/main/res/values-bg/strings_sc.xml
	library/ui-strings/src/main/res/values-cs/strings_sc.xml
	library/ui-strings/src/main/res/values-de/strings_sc.xml
	library/ui-strings/src/main/res/values-de/strings_sc_donottranslate.xml
	library/ui-strings/src/main/res/values-es/strings_sc.xml
	library/ui-strings/src/main/res/values-et/strings_sc.xml
	library/ui-strings/src/main/res/values-eu/strings_sc.xml
	library/ui-strings/src/main/res/values-fa/strings_sc.xml
	library/ui-strings/src/main/res/values-fr/strings_sc.xml
	library/ui-strings/src/main/res/values-hu/strings_sc.xml
	library/ui-strings/src/main/res/values-it/strings_sc.xml
	library/ui-strings/src/main/res/values-nb-rNO/strings_sc.xml
	library/ui-strings/src/main/res/values-nl/strings_sc.xml
	library/ui-strings/src/main/res/values-pl/strings_sc.xml
	library/ui-strings/src/main/res/values-pt-rBR/strings_sc.xml
	library/ui-strings/src/main/res/values-ro/strings_sc.xml
	library/ui-strings/src/main/res/values-ru/strings_sc.xml
	library/ui-strings/src/main/res/values-sk/strings_sc.xml
	library/ui-strings/src/main/res/values-sv/strings_sc.xml
	library/ui-strings/src/main/res/values-tr/strings_sc.xml
	library/ui-strings/src/main/res/values-vi/strings_sc.xml
	library/ui-strings/src/main/res/values-zh-rCN/strings_sc.xml
	library/ui-strings/src/main/res/values-zh-rTW/strings_sc.xml
	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/sync/SyncResponseHandler.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/handler/room/RoomSyncHandler.kt
	vector-app/src/main/res/mipmap-anydpi-v26/ic_launcher_sc.xml
	vector-app/src/main/res/mipmap-hdpi/ic_launcher_foreground_sc.png
	vector-app/src/main/res/mipmap-hdpi/ic_launcher_sc.png
	vector-app/src/main/res/mipmap-mdpi/ic_launcher_foreground_sc.png
	vector-app/src/main/res/mipmap-mdpi/ic_launcher_sc.png
	vector-app/src/main/res/mipmap-xhdpi/ic_launcher_foreground_sc.png
	vector-app/src/main/res/mipmap-xhdpi/ic_launcher_sc.png
	vector-app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground_sc.png
	vector-app/src/main/res/mipmap-xxhdpi/ic_launcher_sc.png
	vector-app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground_sc.png
	vector-app/src/main/res/mipmap-xxxhdpi/ic_launcher_sc.png
	vector/build.gradle
	vector/src/fdroid/java/im/vector/app/fdroid/receiver/KeepInternalDistributor.kt
	vector/src/main/AndroidManifest.xml
	vector/src/main/java/im/vector/app/SpaceStateHandlerImpl.kt
	vector/src/main/java/im/vector/app/core/di/FragmentModule.kt
	vector/src/main/java/im/vector/app/core/pushers/KeepInternalDistributor.kt
	vector/src/main/java/im/vector/app/core/pushers/VectorPushHandler.kt
	vector/src/main/java/im/vector/app/core/receiver/KeepInternalDistributor.kt
	vector/src/main/java/im/vector/app/features/attachments/AttachmentsHelper.kt
	vector/src/main/java/im/vector/app/features/grouplist/HomeSpaceSummaryItem.kt
	vector/src/main/java/im/vector/app/features/grouplist/NewHomeSpaceSummaryItem.kt
	vector/src/main/java/im/vector/app/features/home/HomeDetailFragment.kt
	vector/src/main/java/im/vector/app/features/home/HomeDrawerFragment.kt
	vector/src/main/java/im/vector/app/features/home/room/breadcrumbs/BreadcrumbsItem.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/item/MessageImageVideoItem.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/RoomSummaryItem.kt
	vector/src/main/java/im/vector/app/features/home/room/list/SectionHeaderAdapter.kt
	vector/src/main/java/im/vector/app/features/home/room/list/UnreadCounterBadgeView.kt
	vector/src/main/java/im/vector/app/features/home/room/list/home/recent/RecentRoomItem.kt
	vector/src/main/java/im/vector/app/features/media/ImageContentRenderer.kt
	vector/src/main/java/im/vector/app/features/permalink/PermalinkHandler.kt
	vector/src/main/java/im/vector/app/features/settings/VectorPreferences.kt
	vector/src/main/java/im/vector/app/features/settings/VectorSettingsAdvancedSettingsFragment.kt
	vector/src/main/java/im/vector/app/features/settings/VectorSettingsPreferencesFragment.kt
	vector/src/main/java/im/vector/app/features/settings/notifications/VectorSettingsNotificationPreferenceFragment.kt
	vector/src/main/java/im/vector/app/features/spaces/NewSpaceSummaryController.kt
	vector/src/main/java/im/vector/app/features/spaces/NewSpaceSummaryItem.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/spaces/SubSpaceSummaryItem.kt
	vector/src/main/res/xml/vector_settings_labs.xml
	vector/src/main/res/xml/vector_settings_preferences.xml
2022-09-10 15:24:40 +02:00
Benoit Marty e37344a059 Version++ 2022-09-10 08:15:31 +02:00
Benoit Marty 8c884f45fb Ignore `Instantiatable` class warning 2022-09-09 16:50:55 +02:00
Benoit Marty f88039b7fd
Merge pull request #7068 from p1gp1g/fix/fcm-push2
Use firebaseReceiver with FCM
2022-09-09 09:46:06 +02:00
sim 2527dbbeb2 Rename FirebaseReceiver to VectorFirebaseMessagingService 2022-09-08 15:37:18 +02:00
NIkita Fedrunov 2ab0343e4f sanity test now reads properties value to determine app layout feature status + small fix for tests 2022-09-08 12:37:25 +02:00
NIkita Fedrunov 6badbe738d robots are not checking feature flag for newAppLayout 2022-09-08 12:09:33 +02:00
sim 9cf6dd7a88 Use firebaseReceiver with FCM 2022-09-07 18:02:26 +02:00
ericdecanini 37b216393e Merge remote-tracking branch 'origin/develop' into feature/eric/new-layout-labs 2022-09-07 14:02:10 +02:00
Benoit Marty bdfbbbb2e6
Merge pull request #7020 from vector-im/feature/nfe/app_layout_all_screens_test
fixed allscreens sanity test for enabled app layout flag
2022-09-07 13:57:17 +02:00
ericdecanini b7efd6384c Changes vector feature preference key and function name for clarity 2022-09-06 16:07:12 +02:00
Benoit Marty f604b1d384 Private val is better. 2022-09-06 15:00:55 +02:00
NIkita Fedrunov 4dc01fcfa6 changes according to CR 2022-09-06 14:51:11 +02:00
NIkita Fedrunov 1b651f2aa5 fixed lint 2022-09-06 06:59:10 +02:00
NIkita Fedrunov 67b7bc3d83 fixed allscreens sanity test for enabled app layout flag 2022-09-06 00:00:35 +02:00
Benoit Marty 59f55beab1 Moving manifest `manifest.application$name` attribute to the main manifest, to make it available for both fdroid and gplay variant. Fixes #6995. 2022-09-05 17:49:42 +02:00
Benoit Marty bf25ef4369 There are no views to bind in this module. 2022-09-05 17:40:34 +02:00
Adam Brown 22ce829645 moving all the strings to a dedicated libray/strings module 2022-09-01 14:58:07 +01:00
Adam Brown 177049ba91 merging with develop 2022-08-31 09:16:01 +01:00
Adam Brown 244aa094ef adding fragment testing dependency as a possible solution for missing jacoco agent on CI 2022-08-31 09:16:01 +01:00
Adam Brown 18a9846071 moving application based tests to the vector-app module
- they require the VectorApplication to trigger
2022-08-31 09:16:01 +01:00
Adam Brown d2ca4edc6d lifting the application launcher colour to the application module 2022-08-31 09:16:01 +01:00
Adam Brown c7f945c8b5 lifting the application config and icon to the application module 2022-08-31 09:16:00 +01:00
Adam Brown 4d3e21d046 reusing lint file 2022-08-31 09:16:00 +01:00
Adam Brown 117948f3f1 renaming output apks to match the previous name 2022-08-31 09:16:00 +01:00
Adam Brown 615ab414ff moving imports around to match application/library split 2022-08-31 09:16:00 +01:00
Adam Brown f67ec6d14e copying the vector lint config for the top level application 2022-08-31 09:16:00 +01:00
Adam Brown ad398d8caa moving font certs file to the module that uses it 2022-08-31 09:16:00 +01:00
Adam Brown 32b32376c9 updating artifact paths to match new module location 2022-08-31 09:16:00 +01:00
Adam Brown 1ff340b018 lifting the manifest provider references to the app module manifest 2022-08-31 09:16:00 +01:00
Adam Brown c29e96ab46 reording import 2022-08-31 09:16:00 +01:00
Adam Brown ddaaa1aaeb avoid clashing buildconfig and moving placeholders to the modules which uses them 2022-08-31 09:16:00 +01:00
Adam Brown 2e81056b1e adding library support for the android-stem plugin 2022-08-31 09:16:00 +01:00
Adam Brown f0bc18d5ca introducing vector-app module to act as the top level application 2022-08-31 09:16:00 +01:00