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
9f631768eb
Avoid crash in debug app
2021-07-19 13:34:51 +02:00
2f6d2cfe09
Avoid crash in debug app
2021-07-19 13:31:09 +02:00
45efb4386b
Merge pull request #3668 from vector-im/dependabot/gradle/org.amshove.kluent-kluent-android-1.68
...
Bump kluent-android from 1.67 to 1.68
2021-07-16 18:05:45 +02:00
5d4e71a011
Standardise casing of integration manager
...
Signed-off-by: Paulo Pinto <paulo.pinto@automattic.com>
2021-07-15 15:58:50 +01:00
d39e14cc5c
Standardise casing of homeserver
...
Signed-off-by: Paulo Pinto <paulo.pinto@automattic.com>
2021-07-15 15:58:50 +01:00
74104d7d84
Standardise casing of identity server
...
Signed-off-by: Paulo Pinto <paulo.pinto@automattic.com>
2021-07-15 15:58:50 +01:00
e61c8c28bb
Standardise spelling and casing of homeserver
...
Signed-off-by: Paulo Pinto <paulo.pinto@automattic.com>
2021-07-15 15:58:50 +01:00
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
995f9d87bb
Typo in InitializeCrossSigningTask.kt
...
Typo in comment. Was "userSigningKey" instead of "selfSigningKey".
2021-07-10 22:17:17 +02:00
bcb7ff01bb
Avoid incomplete downloads in cache
...
Previously, when a download was aborted (e.g. due to a bad internet
connection), a partly downloaded file was remaining in cache, which
would then be delivered upon later requests.
This can lead e.g. to chats where images aren't loading.
To avoid this, first download files to a temporary file that is not the
final cache file, and only rename/move it on finish.
Note that if you already have broken downloads, you still need to clear
cache once to get rid of them after this commit, but it should not
occur anymore afterwards.
Change-Id: Ic4fb58853f04f8239c639814031e9ef00c091995
2021-07-10 10:52:02 +02:00
910c0ff326
Merge pull request #3648 from vector-im/dependabot/gradle/com.googlecode.libphonenumber-libphonenumber-8.12.27
...
Bump libphonenumber from 8.12.26 to 8.12.27
2021-07-09 09:47:45 +02:00
2948f03978
Merge pull request #3551 from vector-im/feature/bca/room_upgrade
...
Feature/bca/room upgrade
2021-07-08 10:00:01 +02:00
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
e22bd8f637
Merge pull request #3593 from vector-im/dependabot/gradle/androidx.test.ext-junit-1.1.3
...
Bump junit from 1.1.2 to 1.1.3
2021-07-05 21:36:38 +02:00
ca45cdd5c7
Merge pull request #3585 from vector-im/feature/bma/wellknown
...
Improve wellknown usage
2021-07-05 21:36:16 +02:00
e5c9c33a0f
Merge tag 'v1.1.12' into sc
...
Change-Id: I224f427a0d65bfea7ed0b1e19a95e1f03d0d5236
Conflicts:
library/ui-styles/src/main/res/values/text_appearances.xml
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.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/home/room/detail/timeline/TimelineEventController.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/GroupRoomListSectionBuilder.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/RoomListViewModel.kt
vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewModelFactory.kt
vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryItemFactory.kt
vector/src/main/java/im/vector/app/features/home/room/list/SpaceRoomListSectionBuilder.kt
vector/src/main/java/im/vector/app/features/notifications/NotificationDrawerManager.kt
vector/src/main/java/im/vector/app/features/spaces/SpacesListViewModel.kt
vector/src/main/res/layout/dialog_export_e2e_keys.xml
vector/src/main/res/layout/dialog_import_e2e_keys.xml
2021-07-05 16:58:45 +02:00
d29e04f16c
Create fun String.getDomain(): String to avoid duplicated code
2021-07-05 16:49:09 +02:00
67f41028ff
Remove Riot ref: Riot -> Web client
2021-07-05 16:41:26 +02:00
974d5c23d3
Bump junit from 1.1.2 to 1.1.3
...
Bumps junit from 1.1.2 to 1.1.3.
---
updated-dependencies:
- dependency-name: androidx.test.ext:junit
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
2021-07-05 14:19:54 +00:00
d85099f23c
Merge pull request #3595 from vector-im/dependabot/gradle/espresso_version-3.4.0
...
Bump espresso_version from 3.3.0 to 3.4.0
2021-07-05 16:19:17 +02:00
edbf70c820
Merge pull request #3273 from vector-im/feature/bma/cleanup_redundant_fields
...
Cleanup redundant fields - TO BE MERGED ON JULY 1st
2021-07-05 16:16:33 +02:00
b285bd0359
Merge branch 'develop' into feature/bca/room_upgrade
2021-07-05 16:01:27 +02:00
c40add88f9
Merge pull request #3617 from vector-im/dependabot/gradle/io.realm-realm-gradle-plugin-10.6.1
...
Bump realm-gradle-plugin from 10.6.0 to 10.6.1
2021-07-05 14:38:07 +02:00
8639582671
Bump espresso_version from 3.3.0 to 3.4.0
...
Bumps `espresso_version` from 3.3.0 to 3.4.0.
Updates `espresso-core` from 3.3.0 to 3.4.0
Updates `espresso-contrib` from 3.3.0 to 3.4.0
Updates `espresso-intents` from 3.3.0 to 3.4.0
---
updated-dependencies:
- dependency-name: androidx.test.espresso:espresso-core
dependency-type: direct:production
update-type: version-update:semver-minor
- dependency-name: androidx.test.espresso:espresso-contrib
dependency-type: direct:production
update-type: version-update:semver-minor
- dependency-name: androidx.test.espresso:espresso-intents
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
2021-07-05 12:38:04 +00:00
5ccfbf4ed8
Merge pull request #3596 from vector-im/dependabot/gradle/androidx.core-core-ktx-1.6.0
...
Bump core-ktx from 1.5.0 to 1.6.0
2021-07-05 14:37:48 +02:00
242962f770
Merge pull request #3594 from vector-im/dependabot/gradle/io.mockk-mockk-android-1.12.0
...
Bump mockk-android from 1.11.0 to 1.12.0
2021-07-05 14:37:33 +02:00
ca39182665
Merge pull request #3592 from vector-im/dependabot/gradle/io.mockk-mockk-1.12.0
...
Bump mockk from 1.11.0 to 1.12.0
2021-07-05 14:37:20 +02:00
f03155bbae
Merge pull request #3591 from vector-im/dependabot/gradle/androidxTest_version-1.4.0
...
Bump androidxTest_version from 1.3.0 to 1.4.0
2021-07-05 14:37:14 +02:00
80b1aa3c01
Merge pull request #3590 from vector-im/dependabot/gradle/androidx.test-orchestrator-1.4.0
...
Bump orchestrator from 1.3.0 to 1.4.0
2021-07-05 14:37:07 +02:00
2513be744c
CryptoStore migration has to be object to avoid crash
...
Thread: main, Exception: java.lang.IllegalArgumentException: Configurations cannot be different if used to open the same file. The most likely cause is that equals() and hashCode() are not overridden in the migration class: org.matrix.android.sdk.internal.database.RealmSessionStoreMigration
2021-07-02 17:29:44 +02:00
b808d8b464
Avoid chat position jumps during message loading
...
Sometimes, the chat list would jump without the user scrolling:
- During intial loading of a room content, i.e. when it is expected
that the list stays scrolled to bottom
- During loading of messages after jumping to a linked message
With this commit, the target event is repeatedly scrolled to upon list
changes until the users scroll themselves, to avoid above scenarios.
Change-Id: Iabbe76832e7e68686431b0baed9356c88eb50901
2021-07-02 15:19:20 +02:00
7dc5d8490f
Merge pull request #3584 from vector-im/feature/bca/fix_oom_spacechild
...
Fix / dm flattenParents always growing
2021-07-02 09:35:51 +02:00
9430d7a5dd
Bump realm-gradle-plugin from 10.6.0 to 10.6.1
...
Bumps [realm-gradle-plugin](https://github.com/realm/realm-java ) from 10.6.0 to 10.6.1.
- [Release notes](https://github.com/realm/realm-java/releases )
- [Changelog](https://github.com/realm/realm-java/blob/v10.6.1/CHANGELOG.md )
- [Commits](https://github.com/realm/realm-java/compare/v10.6.0...v10.6.1 )
---
updated-dependencies:
- dependency-name: io.realm:realm-gradle-plugin
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
2021-07-01 23:07:36 +00:00
adcd1a64df
empty migration to fix big flattenParentIds for DM
2021-07-01 15:28:26 +02:00
ef31aad42c
Fix copyright
2021-07-01 14:47:04 +02:00
ed7be13ea3
PR review part 2
2021-07-01 12:51:33 +02:00
752290424c
Bump core-ktx from 1.5.0 to 1.6.0
...
Bumps core-ktx from 1.5.0 to 1.6.0.
---
updated-dependencies:
- dependency-name: androidx.core:core-ktx
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
2021-06-30 23:07:55 +00:00
7316bf4ee0
Bump mockk-android from 1.11.0 to 1.12.0
...
Bumps [mockk-android](https://github.com/mockk/mockk ) from 1.11.0 to 1.12.0.
- [Release notes](https://github.com/mockk/mockk/releases )
- [Commits](https://github.com/mockk/mockk/compare/1.11.0...v1.12.0 )
---
updated-dependencies:
- dependency-name: io.mockk:mockk-android
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
2021-06-30 23:07:27 +00:00
f1001231d6
Bump mockk from 1.11.0 to 1.12.0
...
Bumps [mockk](https://github.com/mockk/mockk ) from 1.11.0 to 1.12.0.
- [Release notes](https://github.com/mockk/mockk/releases )
- [Commits](https://github.com/mockk/mockk/compare/1.11.0...v1.12.0 )
---
updated-dependencies:
- dependency-name: io.mockk:mockk
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
2021-06-30 23:06:35 +00:00
2ebfeb1709
Bump androidxTest_version from 1.3.0 to 1.4.0
...
Bumps `androidxTest_version` from 1.3.0 to 1.4.0.
Updates `core` from 1.3.0 to 1.4.0
Updates `runner` from 1.3.0 to 1.4.0
Updates `rules` from 1.3.0 to 1.4.0
---
updated-dependencies:
- dependency-name: androidx.test:core
dependency-type: direct:production
update-type: version-update:semver-minor
- dependency-name: androidx.test:runner
dependency-type: direct:production
update-type: version-update:semver-minor
- dependency-name: androidx.test:rules
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
2021-06-30 23:06:24 +00:00
3378be935b
Bump orchestrator from 1.3.0 to 1.4.0
...
Bumps orchestrator from 1.3.0 to 1.4.0.
---
updated-dependencies:
- dependency-name: androidx.test:orchestrator
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
2021-06-30 23:06:02 +00:00
ec515ced66
PR review part 1
2021-06-30 18:54:13 +02:00
3e53fa710a
Merge branch 'develop' into feature/bca/room_upgrade
2021-06-30 17:56:32 +02:00
7292c4e13d
Code quality
2021-06-30 13:57:42 +02:00
14ac5a292c
Auto review
2021-06-30 12:32:43 +02:00
8f3db11693
Perform .well-known request first, even if the entered URL is a valid homeserver base url
2021-06-30 11:52:04 +02:00
a61917f2b4
Also change base URL for federationAPI
2021-06-30 11:19:22 +02:00
38cb8bd33e
Store homeServerUriBase independently that the base URL for client-server API
...
Also handle the migration for the specific matrix-client.matrix.org URL
2021-06-30 11:07:24 +02:00
984b1dd6a8
RawService.getWellknown() now takes a domain instead of a matrixId as parameter
2021-06-30 09:20:08 +02:00
SpiritCroc
Benoit Marty
Benoit Marty
Paulo Pinto
dependabot[bot]
TheWayOfTheWarrior
Valere