Commit Graph

3706 Commits

Author SHA1 Message Date
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
SpiritCroc 741ac9f3f6 Merge tag 'v1.2.2' into sc
Change-Id: Icda1859305bac1e48f3d1889282a23049dd83c29
2021-09-13 15:37:54 +02:00
Valere 8d2f95d5db Store device key in SharedSessionEntity
Code review changes


Fix database migraiton


Fix wrong self assignement + comment
2021-09-13 15:25:30 +02:00
SpiritCroc f4d8f78ac7 Fix timeline rebuild on DM state change
Needs slightly different handling after
50a042683b "Architecture: get rid of RoomSummariesHolder as it can lead to errors"

Change-Id: I1d34ca5058d93a73dc26c3b2fee7f8a296ec4880
2021-09-09 12:12:31 +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
Onuray Sahin 3bd392a55d Code review fixes. 2021-09-08 13:44:52 +03:00
Onuray Sahin 1df867f345 Fix rendering voice message if the waveform data is corrupted. 2021-09-08 13:20:56 +03:00
Benoit Marty ffedd6fcfa Fix other warning 2021-09-03 17:02:14 +02:00
Benoit Marty fc22376050 Ignore warning in test.
There is probably a better way than using the GlobalScope, but I'm not sure how to do it now.
2021-09-03 17:02:14 +02:00
Benoit Marty 377c4e00a3
Merge pull request #3954 from vector-im/dependabot/gradle/com.android.tools.build-gradle-7.0.2
Bump gradle from 4.2.2 to 7.0.2
2021-09-03 12:11:52 +02:00
Valere 1c7e567187 Fix test compilation (autojoin descoped) 2021-09-02 11:56:16 +02:00
Valere 9687a59371 Code review 2021-09-02 11:34:08 +02:00
Valere 97114b4f48 cleaning 2021-09-02 11:34:08 +02:00
Valere 0bcd363677 Cleaning 2021-09-02 11:34:08 +02:00
Valere 5297512f87 Support Space explore pagination 2021-09-02 11:34:08 +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 616e5b17f0 Fix warning
provider#androidx.work.impl.WorkManagerInitializer was tagged at AndroidManifest.xml:16 to remove other declarations but no other declaration present
2021-09-02 09:43:39 +02:00
Valere ec77006ddf FIx / bad format of restricted join rule 2021-09-01 17:15:37 +02:00
yostyle d579670080 Add password matrix errors 2021-09-01 10:30:20 +02:00
Benoit Marty 32bad57536 Cleanup 2021-08-31 11:50:23 +02:00
Benoit Marty d304469903
Merge branch 'develop' into develop 2021-08-30 14:25:13 +02:00
Benoit Marty 23e3241b95
Merge pull request #1809 from dkter/conversation-features
Support Android 11 Conversation features
2021-08-30 14:15:42 +02:00
Benoit Marty 2a89e2b4ac
Merge pull request #3908 from vector-im/feature/fga/fix_jitsi_widget
Fix Jitsi-hosted jitsi conferences not loading
2021-08-30 13:57:39 +02:00
dependabot[bot] 7cc1de0eb2
Bump realm-gradle-plugin from 10.7.1 to 10.8.0
Bumps [realm-gradle-plugin](https://github.com/realm/realm-java) from 10.7.1 to 10.8.0.
- [Release notes](https://github.com/realm/realm-java/releases)
- [Changelog](https://github.com/realm/realm-java/blob/master/CHANGELOG.md)
- [Commits](https://github.com/realm/realm-java/compare/v10.7.1...v10.8.0)

---
updated-dependencies:
- dependency-name: io.realm:realm-gradle-plugin
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-08-27 23:06:59 +00:00
Benoit Marty 65c8ae3597
Merge pull request #3739 from vector-im/feature/bca/accept_unbound_3pid_invite
support email invite
2021-08-27 19:02:42 +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
Valere 1ffacd1788 Code review 2021-08-27 17:30:32 +02:00
Valere 819e7c49b0 Code review 2021-08-27 17:30:32 +02:00
Valere f2ab0987cc Add change log + cleaning 2021-08-27 17:30:09 +02:00
Valere 69c84a2460 support email invite 2021-08-27 17:30:09 +02:00
Valere 4107d2643c
Merge pull request #3704 from vector-im/feature/bca/promote_restricted
Promote restricted join rule to admins
2021-08-27 17:27:57 +02:00
Benoit Marty 048800684c
Merge pull request #3914 from vector-im/feature/bma/enabled_body
PushRule enabling request is not following the spec
2021-08-27 16:58:51 +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
Benoit Marty 276b89b8b7 PushRule enabling request is not following the spec 2021-08-27 16:15:08 +02:00
Valere b408d7346f Fix / use unstable prefix for room_capabilities 2021-08-27 15:56:07 +02:00
Florian Renaud 7714cc41f7 Attach documentation reference to expired account error 2021-08-27 14:33:12 +02:00
Florian Renaud 1ca4b3b78a Add expired account error code
For synapse instances which have activated and configured the email account validity module, an error code (ORG_MATRIX_EXPIRED_ACCOUNT) is triggered for any request authenticated by the user's access token which is expired.
This change only add the error code in the matrix SDK but does not handle it for now in the client side.

More documentation can be found in the dedicated Synapse plugin module repository: https://github.com/matrix-org/synapse-email-account-validity
2021-08-27 14:28:07 +02:00
ganfra 84e6a67a51 Jitsi widget: refact a bit so we use data instead of url when possible 2021-08-27 14:03:52 +02:00
David Teresi 842ccb12b2 Improve shortcut sorting 2021-08-25 13:41:32 -04:00
David Langley daaa40b27a Merge branch 'develop' of github.com:vector-im/element-android into feature/dla/keyword_notification_settings 2021-08-25 17:41:37 +01:00
David Langley 1d767d6e3f Fix keyword style, preference persistence and add comment to keyword ruleid 2021-08-25 17:38:12 +01:00
Benoit Marty 4ad542f0d3
Merge pull request #3891 from vector-im/fre/when_statement
Use `when` statement instead of `if`/ `else`
2021-08-25 12:03:31 +02:00
Benoit Marty 4a4c76c4c4
Merge pull request #3896 from vector-im/dependabot/gradle/com.googlecode.libphonenumber-libphonenumber-8.12.31
Bump libphonenumber from 8.12.30 to 8.12.31
2021-08-25 11:59:18 +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 fb8c7f6be0 lint 2021-08-24 19:08:27 +01:00
ganfra 2e2deba3ac Fix message edition is not rendered in e2e rooms after pagination (#3887) 2021-08-24 19:58:54 +02:00
David Langley 3481fc70c7 Cleanup and fix resValue 2021-08-24 16:49:18 +01:00