Commit Graph

90 Commits

Author SHA1 Message Date
Hugh Nimmo-Smith d72371906e Add flag to allow QR login on all servers + split flag for showing in device manager 2022-10-14 06:17:48 +01:00
Onuray Sahin 1e1affbb7b Merge branch 'develop' into feature/ons/qr_code_login_ui
# Conflicts:
#	library/ui-strings/src/main/res/values/strings.xml
#	library/ui-styles/src/main/res/values/stylable_sessions_list_header_view.xml
#	vector-app/src/debug/java/im/vector/app/features/debug/features/DebugFeaturesStateFactory.kt
#	vector-app/src/debug/java/im/vector/app/features/debug/features/DebugVectorFeatures.kt
#	vector/src/main/java/im/vector/app/core/di/MavericksViewModelModule.kt
#	vector/src/main/java/im/vector/app/features/VectorFeatures.kt
#	vector/src/main/java/im/vector/app/features/settings/devices/v2/VectorSettingsDevicesFragment.kt
#	vector/src/main/java/im/vector/app/features/settings/devices/v2/list/SessionsListHeaderView.kt
#	vector/src/main/res/layout/fragment_other_sessions.xml
#	vector/src/main/res/layout/fragment_settings_devices.xml
2022-10-12 14:32:09 +03:00
Onuray Sahin d8ea9c8215 Add flag for qr code login. 2022-10-11 20:04:18 +03: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
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
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
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
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
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