Commit Graph

5112 Commits

Author SHA1 Message Date
Onuray Sahin d8947f5c0b Add report action for live location messages. 2022-06-10 14:01:43 +03:00
ericdecanini 87053f2c70 Reformats after merging 2022-06-08 13:01:26 +02:00
ericdecanini 6df88fba59 Merge remote-tracking branch 'origin/develop' into task/eric/when-arrow-alignment
# Conflicts:
#	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/handler/GroupSyncHandler.kt
#	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/handler/room/RoomSyncHandler.kt
#	vector/src/main/java/im/vector/app/features/home/HomeActivity.kt
#	vector/src/main/java/im/vector/app/features/home/HomeActivityViewModel.kt
#	vector/src/main/java/im/vector/app/features/home/InitSyncStepFormatter.kt
#	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/MessageItemFactory.kt
#	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/style/TimelineMessageLayoutFactory.kt
#	vector/src/main/java/im/vector/app/features/sync/widget/SyncStateView.kt
2022-06-08 12:59:54 +02:00
Benoit Marty 3b2f9d9404
Merge pull request #6029 from vector-im/feature/bma/sdk_sync_service
Feature/bma/sdk sync service
2022-06-08 11:58:38 +02:00
Adam Brown a4721033c8
Merge pull request #6229 from vector-im/dependabot/gradle/org.matrix.android-olm-sdk-3.2.12
Bump olm-sdk from 3.2.11 to 3.2.12
2022-06-08 10:04:08 +01:00
Benoit Marty 1bad8f7741 Introduce `SessionState` to be able to check the Session state from several places. 2022-06-08 09:55:28 +02:00
Benoit Marty de960116b3 Rename internal fun. 2022-06-08 09:55:28 +02:00
Benoit Marty dd22cdf7f2 Rename existing SyncService to SyncAndroidService to avoid confusion 2022-06-08 09:55:28 +02:00
Benoit Marty f62d598b79 Create a SyncService and move some methods from Session there.
Merge SyncStatusService to SyncService, and rename some classes
2022-06-08 09:53:33 +02:00
Maxime NATUREL 73568dbc86
Merge pull request #6212 from vector-im/fix/mna/6209-wrong-live-status
Fix wrong status of live location sharing in timeline (PSF-1073)
2022-06-08 09:40:33 +02:00
Benoit Marty c290dd6c1d
Merge branch 'develop' into task/eric/when-arrow-alignment 2022-06-07 23:03:36 +02:00
Adam Brown 462d3071de
Merge pull request #6171 from vector-im/feature/adm/sdk-new-password-on-confirmation
[SDK] Allow passwords to be set at the point of reset confirmation
2022-06-07 16:43:28 +01:00
Benoit Marty 26dcc9bc52 Merge hotfix 1.4.19 into develop 2022-06-07 15:14:29 +02:00
Benoit Marty b2f67f971b Prepare v1.4.19 2022-06-07 15:11:46 +02:00
Valere a6113526d0 code review 2022-06-07 15:01:57 +02:00
Valere 2fa25f8b5e Fix param name 2022-06-07 15:01:29 +02:00
Valere d67f86a1e0 fix slow paged room list 2022-06-07 15:00:54 +02:00
Michael Kaye 10125f4738
Merge pull request #6111 from vector-im/michaelk/sonarqube_fixes
Sonarqube including coverage on each PR.
2022-06-07 09:44:00 +01:00
Michael Kaye c2ac07b1c9 Fix ktlint error 2022-06-06 18:56:05 +01:00
Michael Kaye 56608d564e Retry ALL THE THINGS, and always send sonarqube 2022-06-06 17:08:02 +01:00
Adam Brown 0ef67b6b64
Merge pull request #6214 from vector-im/feature/adm/homeserver-version-parsing
Homeserver version without patch number parsing
2022-06-06 14:54:32 +01:00
Adam Brown fa21b6d224 creating generic extension for converting empty strings to null and making use for finding option regex match 2022-06-06 14:16:01 +01:00
Adam Brown edfabb0f26 adding missing loading state when confirming password reset
- adds reset test cases to the onboarding view model
2022-06-06 13:59:34 +01:00
Adam Brown cc8f17b786 moving the reset password new password to the reset confirmation step
- the new password is moved to the in memory view model state
2022-06-06 13:57:59 +01:00
Adam Brown 35163f77ba allow passing the new password when resetting passwords either upfront or as part of the confirmation step 2022-06-06 13:57:59 +01:00
ericdecanini 7d8590d85f Disables when arrow alignment post merge with develop 2022-06-03 12:14:47 +02:00
ericdecanini 5cc7deea4e Merge remote-tracking branch 'origin/develop' into task/eric/when-arrow-alignment
# Conflicts:
#	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/registration/DefaultRegistrationWizard.kt
#	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/DefaultKeysBackupService.kt
#	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryDataSource.kt
#	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/worker/MatrixWorkerFactory.kt
#	vector/src/main/java/im/vector/app/core/ui/views/ReadReceiptsView.kt
#	vector/src/main/java/im/vector/app/core/utils/TextUtils.kt
#	vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapSharedViewModel.kt
#	vector/src/main/java/im/vector/app/features/crypto/verification/VerificationBottomSheetViewModel.kt
#	vector/src/main/java/im/vector/app/features/home/HomeActivity.kt
#	vector/src/main/java/im/vector/app/features/home/HomeActivityViewModel.kt
#	vector/src/main/java/im/vector/app/features/home/HomeDetailFragment.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/timeline/factory/LiveLocationShareMessageItemFactory.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/RoomListSectionBuilderSpace.kt
#	vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryItemFactory.kt
#	vector/src/main/java/im/vector/app/features/onboarding/OnboardingViewModel.kt
#	vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthVariant.kt
2022-06-03 12:06:23 +02:00
dependabot[bot] 941d5844b5
Bump olm-sdk from 3.2.11 to 3.2.12
Bumps olm-sdk from 3.2.11 to 3.2.12.

---
updated-dependencies:
- dependency-name: org.matrix.android:olm-sdk
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-06-03 01:03:37 +00:00
Adam Brown 4f8aedb038 moving and updating duplicated service function doc 2022-06-01 16:48:10 +01:00
Adam Brown b0c294b41b avoiding resetting pending state when starting a new login flow
- fixes selecting a incorrect homeserver and returning to the previous login page also failing
2022-06-01 16:48:10 +01:00
Adam Brown 10016fcb15 using correct license for matrix sdk class 2022-06-01 13:45:59 +01:00
Adam Brown 3756b2d240 adding trailing commas to lists 2022-06-01 10:44:23 +01:00
Adam Brown 4501c7cf45 adding test case for trailing . on the version 2022-06-01 10:44:10 +01:00
Adam Brown 289ce7419d supporting homeserver versions without a patch value 2022-06-01 10:41:37 +01:00
Adam Brown ea151b37f0 adding test cases around parsing homeserver versions 2022-06-01 10:41:37 +01:00
Benoit Marty 8e709dbbdb
Merge pull request #5528 from SpiritCroc/chunk-modification-issue
Fix missing/swapped/duplicated messages due to wrong TimelineChunk modifications or insertions
2022-05-31 18:24:08 +02:00
Benoit Marty 884525bef0
Merge pull request #6125 from vector-im/task/eric/code-style-parenthesis
Code Style - New line before and after method parentheses
2022-05-31 18:17:07 +02:00
Benoit Marty 1c73e28226 Version++ 2022-05-31 17:58:09 +02:00
Maxime NATUREL b1750c1c21 Adding log in worker 2022-05-31 15:56:36 +02:00
Maxime NATUREL 102684ed88 Fixing aggregation process 2022-05-31 15:56:23 +02:00
ericdecanini 8af49891ff Post merge conflict reformatting 2022-05-31 14:23:02 +02:00
ericdecanini e6e05317e1 Merge remote-tracking branch 'origin/develop' into task/eric/code-style-parenthesis
# Conflicts:
#	matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/verification/qrcode/VerificationTest.kt
#	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/DefaultKeysBackupService.kt
#	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/DefaultRoomService.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/RoomSummaryItemFactory.kt
#	vector/src/main/java/im/vector/app/features/media/ImageContentRenderer.kt
2022-05-31 14:21:16 +02:00
Benoit Marty ae94f45f34
Merge pull request #5952 from vector-im/feature/bma/sdk_user_story
Sdk user story
2022-05-30 18:30:56 +02:00
Benoit Marty 0806e7358a
Merge pull request #5780 from ofalvai/dependency-cleanup
Remove unused dependencies
2022-05-30 15:41:10 +02:00
Maxime NATUREL eeaf9fd616
Merge pull request #6129 from vector-im/feature/mna/PSF-1019-user-pins
[Location sharing] - Show user live location pins in map view (PSF-1019)
2022-05-30 12:32:09 +02:00
Benoit Marty c071dc502e Create extension `String?.toActiveSpaceOrOrphanRooms()` to reduce noise. 2022-05-30 11:38:31 +02:00
Benoit Marty ad60467ae7 Fix test compilation 2022-05-30 11:38:03 +02:00
Benoit Marty cffdb7f7a6 Add some Kdoc 2022-05-30 11:38:03 +02:00
Benoit Marty 5fbcec0c9c Add some Kdoc 2022-05-30 11:34:55 +02:00
Benoit Marty 0b6f35b256 Create SpaceFilter.OrphanRooms to improve the API.
Not 100% of the side effect. There is probably some (fixed?) bugs here.
2022-05-30 11:34:55 +02:00
Benoit Marty c7997edf9a Rename ActiveSpaceFilter to SpaceFilter 2022-05-30 11:34:55 +02:00
Benoit Marty 00809027c1 Remove `ActiveSpaceFilter.None`
Prefer nullability for API coherency of `RoomSummaryQueryParams`
2022-05-30 11:34:55 +02:00
Benoit Marty 289f27b738 Add some Kdoc 2022-05-30 11:34:55 +02:00
Benoit Marty 3442829e11 Remove duplicated lines of code (the same code is done a few lines later) 2022-05-30 11:34:55 +02:00
Benoit Marty 8843fe0a54 Remove `RoomCategoryFilter.ALL`
Prefer nullability for API coherency of `RoomSummaryQueryParams`
2022-05-30 11:34:55 +02:00
Benoit Marty 8d7a54a6cf `displayName` default value is now `QueryStringValue.NoCondition`.
It was working fine since in the DB we always have a name using `RoomDisplayNameFallbackProvider`, which in our current implementation always return a non empty String.
2022-05-30 11:34:55 +02:00
Benoit Marty 2b0077b138 Small rework for nicer code 2022-05-30 11:34:55 +02:00
Benoit Marty bfdc885d7f Remove `roomId` from `RoomSummaryQueryParams.Builder()`.
Create a new API in RoomService to observe a room summary from a roomId.
2022-05-30 11:34:55 +02:00
Benoit Marty 49a29fb56f Always use `roomSummaryQueryParams`, and not directly a `RoomSummaryQueryParams.Builder()`
Also format and add some Kdoc
2022-05-30 11:34:55 +02:00
Benoit Marty 12b3afbc50 Always use `roomSummaryQueryParams`, and not directly a `RoomSummaryQueryParams.Builder()`
Also format and add some Kdoc
2022-05-30 11:34:55 +02:00
Eric Decanini eeb7d60e59
Merge pull request #5860 from vector-im/feature/eric/replace-search-room-subheader
Replaces subtitle in Search Rooms with room context rather than last event
2022-05-30 11:13:10 +02:00
Adam Brown d18e7ad001 Merge branch 'develop' of github.com:vector-im/element-android into michaelk/sonarqube_fixes 2022-05-30 10:07:43 +01:00
Adam Brown ead189a9c7 temporarily ignoring flaky test when ran on the CI 2022-05-30 09:37:39 +01:00
Maxime NATUREL 066c540eb7 Filter event id in the DB query for active lives 2022-05-30 10:06:04 +02:00
Maxime NATUREL f707f177d9 Improving mapper tests 2022-05-30 10:03:27 +02:00
dependabot[bot] c6751f00ab
Bump libphonenumber from 8.12.48 to 8.12.49
Bumps [libphonenumber](https://github.com/google/libphonenumber) from 8.12.48 to 8.12.49.
- [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.48...v8.12.49)

---
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>
2022-05-27 23:07:12 +00:00
ericdecanini a5dc8ec181 Only gets flattenParents if specifically requested 2022-05-27 15:05:39 +02:00
Valere c8b44bfd4c fix test post rebase 2022-05-27 10:17:40 +02:00
Olivér Falvai 9ce9ad6d3a Merge remote-tracking branch 'origin/develop' into dependency-cleanup 2022-05-26 14:04:39 +02:00
Valere 5735b094ac post rebase fix 2022-05-25 18:41:37 +02:00
Valere e1292c03a1 code review 2022-05-25 18:40:33 +02:00
Valere adb5b4c1b9 Fix closing deactivated accounts in tests 2022-05-25 18:40:33 +02:00
Valere 3332d827f0 rename testHelpers and make constructor private 2022-05-25 18:40:33 +02:00
Valere 29ff4d1e84 use withTestHelpers in sanity tests 2022-05-25 18:40:33 +02:00
Valere e18402f834 Improve test stability 2022-05-25 18:40:33 +02:00
ericdecanini 927f526c6c Post merge conflict reformatting 2022-05-25 17:35:54 +02:00
ericdecanini 8647400dda Merge remote-tracking branch 'origin/develop' into task/eric/code-style-parenthesis
# Conflicts:
#	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/MXOlmDevice.kt
2022-05-25 17:35:31 +02:00
Valere d7c8abbe98 quick format 2022-05-25 16:52:56 +02:00
Valere abb335c43d Improve redaction test 2022-05-25 16:52:56 +02:00
Valere 136d2e330a added change log 2022-05-25 16:52:56 +02:00
Valere 755da616ed Fix decrypting redacted event 2022-05-25 16:52:56 +02:00
Valere 52eb48d808
Merge pull request #6077 from vector-im/feature/aris/crypto_replay_attack
Feature/aris/crypto replay attack
2022-05-25 16:20:26 +02:00
Michael Kaye 9f4f3f482c
Merge branch 'develop' into michaelk/sonarqube_fixes 2022-05-25 14:22:10 +01:00
Michael Kaye f5b4e897fa
Merge pull request #6099 from vector-im/michaelk/retry_keys_backup_test
Track number of retries of tests,retry KeysBackupTest, Ignore E2eeSanityTests
2022-05-25 14:16:47 +01:00
Michael Kaye ba109a486f Update to build scripts to enable sonarqube reporting including coverage. 2022-05-25 13:35:40 +01:00
Maxime NATUREL eda0aa97d0 Fixing code quality issues 2022-05-25 14:11:18 +02:00
Maxime NATUREL 33151eef73 Move the default implementation of location sharing service into internal package 2022-05-25 14:05:14 +02:00
Maxime NATUREL 8d2debf47e Adding missing ending dots in comments 2022-05-25 14:05:14 +02:00
Maxime NATUREL 1b8440d7c8 Removing unused imports 2022-05-25 14:05:14 +02:00
Maxime NATUREL 095cc12e10 Fixing unit tests of the mapper 2022-05-25 14:05:14 +02:00
Maxime NATUREL d9480bb136 Adding todo to add unit tests on aggregation process 2022-05-25 14:05:14 +02:00
Maxime NATUREL 5efe26c7dd Fix code quality issues 2022-05-25 14:05:14 +02:00
Maxime NATUREL c07bc0890f WIP - unit tests 2022-05-25 14:05:14 +02:00
Maxime NATUREL 79212321a2 Deactivate all previous active beacons when receiving one from user 2022-05-25 14:05:12 +02:00
Maxime NATUREL bec3f793f3 Improve query of current running live location shares 2022-05-25 14:04:22 +02:00
Maxime NATUREL ca9591e423 Fix set of userId in aggregation process 2022-05-25 14:04:22 +02:00
Maxime NATUREL 3b06f18ccb Remove unused imports 2022-05-25 14:04:22 +02:00
Maxime NATUREL 7a7af40d61 Creation of LocationSharingService to get current users sharing their live locations 2022-05-25 14:04:20 +02:00
Michael Kaye c59c5cfb4a Ignore all tests that have failed during testing. 2022-05-25 12:36:21 +01:00
Maxime NATUREL 791d4fb1e8 Improve computation of the work name to limit its length 2022-05-25 11:10:54 +02:00
Maxime NATUREL 8864a3cf2c Using replace instead of keep strategy for the worker 2022-05-25 11:06:02 +02:00
Maxime NATUREL cfdc18d421 Improve code readability in aggregation processor 2022-05-25 11:05:28 +02:00
Maxime NATUREL b081429725 Replace getOrCreate() by get() in worker 2022-05-25 10:59:08 +02:00
ericdecanini c3209d7049 Manually fixes more formatting issues 2022-05-24 15:31:20 +02:00
ericdecanini 6c21a6b48d Separates some method parameters 2022-05-24 15:26:24 +02:00
Maxime NATUREL 683a9cdfff Schedule work during aggregation 2022-05-23 17:34:52 +02:00
Maxime NATUREL 47eb7173f0 Creation of a worker to deactivate a live after timeout 2022-05-23 17:34:52 +02:00
Maxime NATUREL d76b93ced3 Adding comment on isActive field 2022-05-23 17:34:51 +02:00
ericdecanini b3fdb5ed17 Changes code style when arrow alignment 2022-05-23 12:57:57 +02:00
ericdecanini 3f3662e605 Changes code style method parameters new line around parentheses to true 2022-05-23 12:30:42 +02:00
Benoit Marty 53c83ab8d8 Add missing punctuation 2022-05-20 21:22:47 +02:00
Benoit Marty 92d54dc733 Fix compilation issue 2022-05-20 21:14:42 +02:00
Benoit Marty b86693580e `class` with `private constructor` instead of `object` 2022-05-20 21:14:42 +02:00
Benoit Marty 827c7e58f6 Package have been renamed, so also rename it here.
Dokka does not complain about unknown package in this file :/
2022-05-20 21:14:42 +02:00
Benoit Marty 8218d8f267 Typo: isStucked -> isStuck 2022-05-20 21:14:42 +02:00
Benoit Marty 8d74acf060 Fix post rebase issue 2022-05-20 21:14:42 +02:00
Benoit Marty dc1eba2847 Improve documentation 2022-05-20 21:14:42 +02:00
Benoit Marty d92875e3c2 Improve documentation 2022-05-20 21:14:42 +02:00
Benoit Marty 740acda60b Please ktlint. Ok, the user story will appear at the end of the doc. 2022-05-20 21:14:42 +02:00
Benoit Marty 853c0a25bf Method `onSecretKeyGossip` doe snot have to be in the public interface 2022-05-20 21:14:42 +02:00
Benoit Marty ede784684f Change in KeysBackupService: `isEnabled` and `isStucked` are now fun, and `state` has been renamed to `getState` and is now a fun. 2022-05-20 21:14:42 +02:00
Benoit Marty 1ab4ae9eac Extract KeyRef to its own file 2022-05-20 21:14:42 +02:00
Benoit Marty d3d17ebbcb Extract HttpPusher to its own file 2022-05-20 21:14:42 +02:00
Benoit Marty 768df330b5 Rename `currentThreePid` to `getCurrentThreePid` 2022-05-20 21:14:42 +02:00
Benoit Marty e6c8ffd1b8 Change `val` to `fun` on the SDK interfaces.
Dokka will generate a better documentation (`Functions` and `Properties` are 2 distinct tab), and for Service it's better to have only `fun`
2022-05-20 21:14:42 +02:00
Benoit Marty cfd6456614 Add other user stories (with TODO) 2022-05-20 21:14:42 +02:00
Benoit Marty 96c825e265 Create _userstories package and add the 2 first user stories 2022-05-20 21:14:42 +02:00
Benoit Marty bad62be497 Use Kdoc format, else it's not extracted to the documentation by dokka 2022-05-20 21:14:42 +02:00
ariskotsomitopoulos 85f3592938 PR remarks 2022-05-20 17:03:15 +03:00
ariskotsomitopoulos 1bea28e27a fix documentation format 2022-05-20 16:03:39 +03:00
ariskotsomitopoulos e323caa233 Merge branch 'develop' into feature/aris/crypto_replay_attack
# Conflicts:
#	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/MXOlmDevice.kt
2022-05-20 15:46:15 +03:00
ariskotsomitopoulos c958d3a383 Merge branch 'develop' into feature/aris/crypto_replay_attack 2022-05-20 15:43:08 +03:00
ariskotsomitopoulos 7bc880e6bf Improve documentation 2022-05-20 15:33:29 +03:00
ariskotsomitopoulos 2081e2c45b Reduce log visibility to verbose 2022-05-20 13:32:55 +03:00
Benoit Marty 4094a66f3c
Merge pull request #6084 from vector-im/feature/bma/detekt_outdated_doc
Feature/bma/detekt outdated doc
2022-05-20 12:06:34 +02:00
Benoit Marty b547a49ab3
Merge pull request #6089 from vector-im/feature/bma/real_fail
Ensure calling 'fail()' is not caught by the Exception handler
2022-05-20 10:33:02 +02:00
Benoit Marty f5d0663b06 Remove non needed extra spaces 2022-05-20 09:48:17 +02:00
Benoit Marty dae0b66c90 PR review 2022-05-20 09:48:05 +02:00
Benoit Marty 51fe7b9a93 Detekt: Fix OutdatedDocumentation 2022-05-20 09:48:05 +02:00
Benoit Marty 2a66e03742 Kdoc: remove unnecessary `:` 2022-05-20 09:47:54 +02:00
Michael Kaye a4fa65b4fd Fix linting 2022-05-19 12:37:41 +01:00
Michael Kaye fe793798fa Ignore E2eeSanityTests.
They fail infrequently, but in a way that takes the entire test framework down,
so ignore them for now and open an issue to fix.
2022-05-19 12:06:54 +01:00
Onuray Sahin 9adbeb8dd2 Fix import. 2022-05-19 14:04:37 +03:00
Onuray Sahin 1605ae1607 Merge branch 'develop' into feature/ons/poll_refactoring
* develop: (251 commits)
  Space explore rooms screen alignment with design in figma (#5834)
  leaving space aligned with ios (#5942)
  Fix usage of System.currentTimeMillis(). This a bit mocky but anyway it's better to use SystemClock.elapsedRealtime() for this case.
  Update TimelinePreviousLastForwardTest.kt
  Changelog.d
  Rename 'getDomain' to 'getServerName'.
  Well-known lookups should not include the port of a server.
  Ah it was used in Gplay variant. Anyway I think we can still remove this now.
  Fix parsing of location data in non encrypted room
  Additionally increment for TimelinePreviousLastForwardTest
  Notify other devices of acceptance of verification request
  Instead of using a magic number, explicitly test for the events we expect.
  Adding comments on some strings and removing non necessary plural
  Remove ShortcutBadger lib and usage (it was dead code)
  Version++
  Fastlane file
  Towncrier
  Add `.login` to get the username of the PR merger.
  Rename folder for the PlayStore
  Remove empty translations
  ...

# Conflicts:
#	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/SessionModule.kt
2022-05-19 13:39:43 +03:00
Olivér Falvai f036d35829 Merge branch 'develop' into dependency-cleanup 2022-05-19 12:27:09 +02:00
Michael Kaye 28c4abb505 Track number of retries of tests, and retry KeysBackupTest 2022-05-19 10:34:38 +01:00
Michael Kaye 5260e729ac
Merge pull request #6095 from vector-im/michaelk/correct_well_known_behaviour
Well known lookups should be to port 443 only.
2022-05-18 16:50:43 +01:00
Michael Kaye d57841c0d0
Merge pull request #6088 from vector-im/michaelk/fix_forward_pagination_test
In TimelineForwardPaginationTest, explicitly test for the events we expect
2022-05-18 16:50:09 +01:00
Michael Kaye 94411ed60e
Update TimelinePreviousLastForwardTest.kt
Update comments in line with code changes.
2022-05-18 16:34:39 +01:00
Michael Kaye e66284fbd3 Rename 'getDomain' to 'getServerName'.
In the context of matrix IDs, this removes the leading @name: leaving the hostname or hostname and port.
2022-05-18 15:21:33 +01:00