Commit Graph

3627 Commits

Author SHA1 Message Date
Benoit Marty 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
Benoit Marty 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
SpiritCroc 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
Benoit Marty 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
dependabot[bot] 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
Valere adcd1a64df empty migration to fix big flattenParentIds for DM 2021-07-01 15:28:26 +02:00
Benoit Marty ef31aad42c Fix copyright 2021-07-01 14:47:04 +02:00
Benoit Marty ed7be13ea3 PR review part 2 2021-07-01 12:51:33 +02:00
Onuray Sahin 9d48b399df Voice message playback implementation. 2021-07-01 10:49:04 +03:00
dependabot[bot] 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
dependabot[bot] 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
dependabot[bot] 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
dependabot[bot] 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
dependabot[bot] 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
Benoit Marty ec515ced66 PR review part 1 2021-06-30 18:54:13 +02:00
Benoit Marty 3e53fa710a
Merge branch 'develop' into feature/bca/room_upgrade 2021-06-30 17:56:32 +02:00
Benoit Marty 7292c4e13d Code quality 2021-06-30 13:57:42 +02:00
Benoit Marty 14ac5a292c Auto review 2021-06-30 12:32:43 +02:00
Benoit Marty 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
Benoit Marty a61917f2b4 Also change base URL for federationAPI 2021-06-30 11:19:22 +02:00
Benoit Marty 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
Benoit Marty 984b1dd6a8 RawService.getWellknown() now takes a domain instead of a matrixId as parameter 2021-06-30 09:20:08 +02:00
Valere 1d8b95560b Fix / dm flattenParents always growing 2021-06-29 14:57:43 +02:00
Benoit Marty 7f70a03f41 Use interface field 2021-06-29 10:58:28 +02:00
Benoit Marty 0d02a197a5 Remove redundant mimetype (vector-im/element-web#2547) 2021-06-29 10:58:28 +02:00
Benoit Marty 9bbe002988
Merge pull request #3531 from vector-im/feature/fga/auto_accept_invite
Feature/fga/auto accept invite
2021-06-28 16:40:10 +02:00
Valere 4aa93d79fe cleaning 2021-06-28 09:42:54 +02:00
Benoit Marty 060e9d7a7e
Merge pull request #3568 from vector-im/dependabot/gradle/kotlin_version-1.5.20
Bump kotlin_version from 1.5.10 to 1.5.20
2021-06-25 19:11:34 +02:00
Benoit Marty 631e7881ef Fix warning about implicit type, introduced in Kotlin 1.5.20.
"Returning type parameter has been inferred to Nothing implicitly. Please specify type arguments explicitly to hide this warning. Nothing can produce an exception at runtime."
2021-06-25 17:42:38 +02:00
Benoit Marty 2e37b5efa3
Merge pull request #3565 from vector-im/feature/fga/fix_call_notification
Fix call invite processed after call is ended because of fastlane mode.
2021-06-25 16:47:54 +02:00
dependabot[bot] 9e2f2f2372
Bump libphonenumber from 8.12.25 to 8.12.26
Bumps [libphonenumber](https://github.com/google/libphonenumber) from 8.12.25 to 8.12.26.
- [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.25...v8.12.26)

---
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-06-24 23:05:19 +00:00
ganfra a2c8680d7a Fix call invite processed after call is ended because of fastlane mode. 2021-06-24 20:49:35 +02:00
Benoit Marty ca3e5cdf90
Merge pull request #3544 from vector-im/dependabot/gradle/org.amshove.kluent-kluent-android-1.67
Bump kluent-android from 1.65 to 1.67
2021-06-24 14:49:53 +02:00
Benoit Marty 14184aae6f
Merge pull request #3506 from vector-im/dependabot/gradle/com.googlecode.libphonenumber-libphonenumber-8.12.25
Bump libphonenumber from 8.12.24 to 8.12.25
2021-06-24 14:34:45 +02:00
Benoit Marty f0fd40b189
Merge pull request #3505 from vector-im/dependabot/gradle/io.realm-realm-gradle-plugin-10.6.0
Bump realm-gradle-plugin from 10.5.0 to 10.6.0
2021-06-24 14:32:35 +02:00
SpiritCroc d11c1fcc62 Merge tag 'v1.1.11' into sc
Change-Id: I15d6e584f1594764f956c129003b2a459b5d24a6
2021-06-24 10:19:24 +02:00
Valere 57c75f8039 Ugrade unstable room notice in settings
default update parent, clean migrate bottomsheet layout
2021-06-24 09:38:52 +02:00
SpiritCroc 72aa4bb999 Merge tag 'v1.1.10' into sc
Change-Id: I01e7b61adf9444e6894232235ee71ac8295b00ab

Conflicts:
	library/ui-styles/src/main/res/color/bottom_navigation_icon_tint_selector.xml
	library/ui-styles/src/main/res/drawable/splash.xml
	library/ui-styles/src/main/res/values/theme_light.xml
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/accountdata/RoomAccountDataTypes.kt
	vector/src/main/AndroidManifest.xml
	vector/src/main/java/im/vector/app/features/home/HomeDetailFragment.kt
	vector/src/main/java/im/vector/app/features/home/HomeDetailViewModel.kt
	vector/src/main/java/im/vector/app/features/home/HomeDetailViewState.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/composer/TextComposerView.kt
	vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomController.kt
	vector/src/main/java/im/vector/app/features/spaces/SpaceSettingsMenuBottomSheet.kt
	vector/src/main/java/im/vector/app/features/spaces/SpaceSummaryController.kt
	vector/src/main/java/im/vector/app/features/spaces/SpacesListViewModel.kt
	vector/src/main/java/im/vector/app/features/themes/ActivityOtherThemes.kt
	vector/src/main/java/im/vector/app/features/themes/ThemeUtils.kt
	vector/src/main/res/drawable/ic_attachment.xml
	vector/src/main/res/drawable/ic_insert_emoji.xml
	vector/src/main/res/drawable/ic_keyboard.xml
	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
	vector/src/main/res/layout/fragment_home_detail.xml
	vector/src/main/res/layout/fragment_login_server_url_form.xml
	vector/src/main/res/layout/fragment_user_list.xml
	vector/src/main/res/layout/item_bottom_sheet_message_preview.xml
	vector/src/main/res/layout/item_keys_backup_settings_button_footer.xml
	vector/src/main/res/layout/item_room.xml
	vector/src/main/res/layout/item_space_beta_header.xml
	vector/src/main/res/layout/item_suggested_room.xml
	vector/src/main/res/layout/item_timeline_event_redacted_stub.xml
	vector/src/main/res/layout/item_timeline_event_text_message_stub.xml
	vector/src/main/res/values/styles_riot.xml
2021-06-23 13:38:41 +02:00
SpiritCroc f66747e972 Merge commit '0f4e546e1e96c76219649d27eca38a98e6c04c5f' into sc
Change-Id: I782ef7ae26d7a3c168d26a1458f84fbfe80e9767

Conflicts:
	vector/src/debug/res/layout/activity_debug_menu.xml
	vector/src/main/java/im/vector/app/core/epoxy/bottomsheet/BottomSheetRoomPreviewItem.kt
	vector/src/main/java/im/vector/app/core/ui/views/BottomSheetActionButton.kt
	vector/src/main/java/im/vector/app/features/home/HomeActivity.kt
	vector/src/main/java/im/vector/app/features/home/HomeDetailFragment.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.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/actions/RoomListQuickActionsEpoxyController.kt
	vector/src/main/java/im/vector/app/features/rageshake/BugReporter.kt
	vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomController.kt
	vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileController.kt
	vector/src/main/java/im/vector/app/features/userdirectory/UserDirectoryUserItem.kt
	vector/src/main/res/color/bottom_navigation_icon_tint_selector.xml
	vector/src/main/res/color/button_positive_background_selector.xml
	vector/src/main/res/color/button_positive_text_color_selector.xml
	vector/src/main/res/color/checked_accent_color_selector.xml
	vector/src/main/res/color/login_button_tint.xml
	vector/src/main/res/drawable/bg_breadcrumbs_typing.xml
	vector/src/main/res/drawable/bg_login_server_checked.xml
	vector/src/main/res/drawable/bg_send.xml
	vector/src/main/res/drawable/highlighted_message_background.xml
	vector/src/main/res/drawable/ic_settings_root_advanced.xml
	vector/src/main/res/drawable/ic_settings_root_call.xml
	vector/src/main/res/drawable/ic_settings_root_flair.xml
	vector/src/main/res/drawable/ic_settings_root_general.xml
	vector/src/main/res/drawable/ic_settings_root_help_about.xml
	vector/src/main/res/drawable/ic_settings_root_ignored_users.xml
	vector/src/main/res/drawable/ic_settings_root_labs.xml
	vector/src/main/res/drawable/ic_settings_root_notification.xml
	vector/src/main/res/drawable/ic_settings_root_preferences.xml
	vector/src/main/res/drawable/ic_settings_root_security_privacy.xml
	vector/src/main/res/drawable/reaction_rounded_rect_shape.xml
	vector/src/main/res/drawable/splash.xml
	vector/src/main/res/drawable/vector_tabbar_selected_background.xml
	vector/src/main/res/layout/alerter_incoming_call_layout.xml
	vector/src/main/res/layout/custom_action_item_layout_badge.xml
	vector/src/main/res/layout/dialog_export_e2e_keys.xml
	vector/src/main/res/layout/dialog_import_e2e_keys.xml
	vector/src/main/res/layout/fragment_home_drawer.xml
	vector/src/main/res/layout/fragment_keys_backup_restore_from_key.xml
	vector/src/main/res/layout/fragment_keys_backup_restore_from_passphrase.xml
	vector/src/main/res/layout/fragment_keys_backup_restore_success.xml
	vector/src/main/res/layout/fragment_keys_backup_setup_step1.xml
	vector/src/main/res/layout/fragment_keys_backup_setup_step2.xml
	vector/src/main/res/layout/fragment_keys_backup_setup_step3.xml
	vector/src/main/res/layout/fragment_login_server_selection.xml
	vector/src/main/res/layout/fragment_login_server_url_form.xml
	vector/src/main/res/layout/fragment_login_server_url_form_2.xml
	vector/src/main/res/layout/fragment_login_splash.xml
	vector/src/main/res/layout/fragment_public_rooms.xml
	vector/src/main/res/layout/fragment_qr_code_scanner.xml
	vector/src/main/res/layout/fragment_qr_code_scanner_with_button.xml
	vector/src/main/res/layout/fragment_review_terms.xml
	vector/src/main/res/layout/fragment_room_detail.xml
	vector/src/main/res/layout/fragment_space_add_rooms.xml
	vector/src/main/res/layout/fragment_space_create_generic_epoxy_form.xml
	vector/src/main/res/layout/item_bottom_sheet_action.xml
	vector/src/main/res/layout/item_bottom_sheet_message_preview.xml
	vector/src/main/res/layout/item_form_submit_button.xml
	vector/src/main/res/layout/item_generic_list.xml
	vector/src/main/res/layout/item_generic_with_value.xml
	vector/src/main/res/layout/item_keys_backup_settings_button_footer.xml
	vector/src/main/res/layout/item_notification_troubleshoot.xml
	vector/src/main/res/layout/item_room.xml
	vector/src/main/res/layout/item_settings_centered_image.xml
	vector/src/main/res/layout/item_timeline_event_merged_room_creation_stub.xml
	vector/src/main/res/layout/item_timeline_event_poll_stub.xml
	vector/src/main/res/layout/item_timeline_event_redacted_stub.xml
	vector/src/main/res/layout/item_verification_action.xml
	vector/src/main/res/layout/view_attachment_type_selector.xml
	vector/src/main/res/layout/view_bottom_sheet_action_button.xml
	vector/src/main/res/layout/view_call_controls.xml
	vector/src/main/res/menu/menu_submit.xml
	vector/src/main/res/menu/menu_timeline.xml
	vector/src/main/res/values/styles_riot.xml
	vector/src/main/res/values/theme_dark.xml
2021-06-23 11:08:10 +02:00
Valere 171793d190 room version cap support + room upgrade 2021-06-22 17:35:39 +02:00
dependabot[bot] e2e3e2de86
Bump kluent-android from 1.65 to 1.67
Bumps [kluent-android](https://github.com/MarkusAmshove/Kluent) from 1.65 to 1.67.
- [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-06-21 23:06:17 +00:00
ganfra d8327a5161 Fix crash on signout: release session at the end so you clean up files first. 2021-06-21 11:10:10 +02:00
ganfra 4b6484d317 Merge branch 'develop' into feature/fga/auto_accept_invite 2021-06-18 17:37:24 +02:00
ganfra c551cf3058 Clean and add towncrier 2021-06-18 17:30:32 +02:00
ganfra 6b10406622 AutoAcceptInvite: refact and hide behind flag 2021-06-18 17:24:51 +02:00
Valere 4180b4ccd3 Code review 2021-06-18 10:47:21 +02:00
Valere 19a2b56011 Code review AliasAvailabilityResult 2021-06-18 10:41:24 +02:00
Valere b1ab6eb58f Add alias management in space settings 2021-06-18 10:41:13 +02:00
Valere fb337dacd6 Add space alias in creation wizard 2021-06-18 10:41:13 +02:00
Benoit Marty 5325c761f4
Merge pull request #3502 from vector-im/feature/bca/spaces_dnd
Feature/bca/spaces dnd
2021-06-18 10:28:59 +02:00
Benoit Marty bffa96ae10 Import sas strings 2021-06-18 10:25:37 +02:00
Valere 3dc7a6dc34 cleaning, quality 2021-06-17 17:00:28 +02:00
Valere 682e926965 Dnd enhancement
+ klint fix
2021-06-17 15:53:35 +02:00
Onuray Sahin cb96886568 Send voice message. 2021-06-17 16:18:20 +03:00
Valere 944c9641a9 Code review 2021-06-17 14:44:24 +02:00
Valere a1aad53769 Space top level ordering 2021-06-17 14:44:24 +02:00
dependabot[bot] dd74b8a755
Bump libphonenumber from 8.12.24 to 8.12.25
Bumps [libphonenumber](https://github.com/google/libphonenumber) from 8.12.24 to 8.12.25.
- [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.24...v8.12.25)

---
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-06-15 06:25:21 +00:00
dependabot[bot] 6e83f0510e
Bump realm-gradle-plugin from 10.5.0 to 10.6.0
Bumps [realm-gradle-plugin](https://github.com/realm/realm-java) from 10.5.0 to 10.6.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.5.0...v10.6.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-06-15 06:24:33 +00:00
Benoit Marty e9db1dbb08
Merge pull request #3488 from vector-im/dependabot/gradle/daggerVersion-2.37
Bump daggerVersion from 2.36 to 2.37
2021-06-11 12:24:49 +02:00
Benoit Marty dfb01a462e
Merge pull request #3456 from vector-im/feature/fga/dial_pad_tab
Feature/fga/dial pad tab
2021-06-11 12:23:19 +02:00
dependabot[bot] cc67e83b21
Bump daggerVersion from 2.36 to 2.37
Bumps `daggerVersion` from 2.36 to 2.37.

Updates `dagger` from 2.36 to 2.37
- [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.36...dagger-2.37)

Updates `dagger-compiler` from 2.36 to 2.37
- [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.36...dagger-2.37)

---
updated-dependencies:
- dependency-name: com.google.dagger:dagger
  dependency-type: direct:production
  update-type: version-update:semver-minor
- dependency-name: com.google.dagger:dagger-compiler
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-06-11 05:54:29 +00:00
ganfra 68143ab2cf Merge branch 'develop' into feature/fga/voip_asserted_identity 2021-06-10 16:01:48 +02:00
ganfra 880da9ecd5 Merge branch 'develop' into feature/fga/dial_pad_tab
# Conflicts:
#	vector/src/main/java/im/vector/app/features/call/dialpad/DialPadFragment.kt
#	vector/src/main/java/im/vector/app/features/home/HomeDetailFragment.kt
2021-06-10 15:37:24 +02:00
ganfra dfcffb9464 Merge branch 'develop' into feature/fga/account_data_rework 2021-06-09 18:58:47 +02:00
ganfra d19dffe45f Clean and add towncrier file 2021-06-09 18:57:35 +02:00
ganfra e368ba606b Account data: allow querying room account data globally from session) 2021-06-09 18:44:30 +02:00
ganfra 0c6506da8c Account data : define 2 services 2021-06-09 16:20:21 +02:00
Benoit Marty f7f4ec3ecc Dominaezzz review 2021-06-09 15:41:06 +02:00
Benoit Marty 04f06b2803 Convert KeysImporter to coroutines 2021-06-09 15:41:06 +02:00
Benoit Marty 3be95ca442 Convert KeysExporter to coroutines 2021-06-09 15:39:46 +02:00
Benoit Marty f99600f115 Convert DefaultTypingService to coroutines 2021-06-09 15:38:50 +02:00
Benoit Marty 209792a9ec Cleanup 2021-06-09 15:38:50 +02:00
Benoit Marty 047c59eba0 Rework colors management 2021-06-09 15:36:20 +02:00
ganfra a421f37e70 VoIP : clean and add changelog 2021-06-03 19:50:09 +02:00
ganfra 1b8b59076c Should fix issue with DM creation where we can ends up with DM in rooms 2021-06-03 19:36:58 +02:00
ganfra 771b9b8d78 Dial pad tab: second step, add to home 2021-06-02 19:43:39 +02:00
SpiritCroc c00600666e Merge tag 'v1.1.9' into sc
Change-Id: I75baba645677d13f9937643a29630070f1470f9c

Conflicts:
	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/sync/RoomSyncHandler.kt
	vector/build.gradle
	vector/src/main/java/im/vector/app/features/media/ImageContentRenderer.kt
	vector/src/main/java/im/vector/app/features/ui/SharedPreferencesUiStateRepository.kt
2021-06-02 17:49:34 +02:00
Benoit Marty 701f549881
Merge pull request #3405 from vector-im/feature/bma/olm_upgrade
Upgrade Olm dependency to 3.2.4
2021-06-02 11:29:23 +02:00
Benoit Marty 68833b0180 Upgrade Olm dependency to 3.2.4 2021-06-02 10:05:14 +02:00
Valere 00ee61a2a0 stable ids for MSC 2858 2021-06-01 12:13:06 +02:00
Benoit Marty 90a16ebbaf /snow -> /snowfall and update wording (iso Element Web) (#3430) 2021-05-31 11:03:02 +02:00
ganfra 0098d435b3 Asserted identity: process event 2021-05-28 18:42:29 +02:00
ganfra c90717a2c8 Asserted identity: introduce new content 2021-05-28 18:17:14 +02:00
Benoit Marty 575ebdc3e8
Merge pull request #3421 from vector-im/feature/fga/call_transfer
Feature/fga/call transfer
2021-05-28 16:48:01 +02:00
Benoit Marty fca74e9eb4 Small cleanup during review 2021-05-28 16:36:03 +02:00
Benoit Marty 270a195478
Merge pull request #3425 from vector-im/feature/fga/fix_crash_signout
Fix crash on signout
2021-05-28 15:44:02 +02:00
Benoit Marty 5657da3493
Merge pull request #3401 from vector-im/feature/bca/spaces_fix_3386
Fixes #3386 show space description in explore header
2021-05-28 15:27:49 +02:00
Valere 871360754e Code review 2021-05-28 11:12:10 +02:00
SpiritCroc d13891d556 Also count DMs in space unread counts
Change-Id: I494e6d6a8f5522b666dc9e573b19e3fc4737bc76
2021-05-28 10:48:34 +02:00
ganfra cc6263b20f Fix crash on signout 2021-05-28 10:29:21 +02:00
Benoit Marty 0db5dd3d50
Merge pull request #3419 from vector-im/feature/bma/gitter
Feature/bma/gitter
2021-05-27 21:23:05 +02:00
Benoit Marty 302e29831e Compress thumbnail: change Jpeg quality from 100 to 80 (#3396) 2021-05-27 18:42:07 +02:00
Benoit Marty d2fd652fb5
Merge pull request #3414 from vector-im/feature/bma/wording_homeserver
Feature/bma/wording homeserver
2021-05-27 17:32:27 +02:00
ganfra 8e8bc0055d Call transfer: clean & add changelog 2021-05-27 16:32:14 +02:00
Benoit Marty 3df8af27a6
Merge pull request #3416 from vector-im/dependabot/gradle/com.googlecode.libphonenumber-libphonenumber-8.12.24
Bump libphonenumber from 8.12.23 to 8.12.24
2021-05-27 16:05:37 +02:00
ganfra bcc360692e Call transfer: makes call transfer working properly 2021-05-27 16:00:32 +02:00
ganfra 90ccc3006d Merge develop into feature/fga/call_transfer 2021-05-27 14:40:06 +02:00
Benoit Marty 72b1bd354e
Merge pull request #3355 from vector-im/feature/fga/voip_virtual_room
Feature/fga/voip virtual room
2021-05-27 13:24:34 +02:00
Benoit Marty ea4b5e19fe VoIP: add protocols checks and third party lookups
Add RoomAccountData and handle RoomSyncAccountData
Virtual rooms: add CallUserMapper, branch onNewInvite and mapping, hide them on sdk side (not ideal solution)
Introduce SessionScopedProperty to handle session dependency in the app
Author: ganfra (rebased by Benoit)
2021-05-27 10:28:32 +02:00
dependabot[bot] 7fb76b2541
Bump libphonenumber from 8.12.23 to 8.12.24
Bumps [libphonenumber](https://github.com/google/libphonenumber) from 8.12.23 to 8.12.24.
- [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.23...v8.12.24)

Signed-off-by: dependabot[bot] <support@github.com>
2021-05-27 06:23:10 +00:00
Benoit Marty 64222ff704 Move the class RoomDirectoryData form the SDK to the app 2021-05-26 16:08:56 +02:00
Benoit Marty 535f3ad02d Clean doc 2021-05-26 16:03:13 +02:00
Benoit Marty 898c8cc3a7 Refact: inject ThumbnailExtractor 2021-05-26 14:42:09 +02:00
Valere d04cbadd04 Compute via param from list utility method 2021-05-26 14:25:21 +02:00
Valere b75d0cbfc6 Introduce SpaceItem 2021-05-26 14:25:21 +02:00
Valere 432fd67ce2 Fixes #3406 2021-05-26 14:25:21 +02:00
Valere 447bd98a78 Fixes #3386 show space description in explore header 2021-05-26 14:25:21 +02:00
Benoit Marty 2bea2de0c5
Merge pull request #3365 from vector-im/dependabot/gradle/androidx.core-core-ktx-1.5.0
Bump core-ktx from 1.3.2 to 1.5.0
2021-05-26 14:22:26 +02:00
ganfra e67cb0eae7 Merge branch 'develop' into feature/fga/call_transfer 2021-05-26 12:26:34 +02:00
SpiritCroc 6c06462ec9 Merge tag 'v1.1.8' into sc
Change-Id: Ied7cd01e47a76e9d8f546ae1c2d6f10b083c4480

Conflicts:
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.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/item/MessageTextItem.kt
	vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomController.kt
	vector/src/main/java/im/vector/app/features/spaces/SpaceSummaryController.kt
2021-05-26 10:44:19 +02:00
dependabot[bot] 2703097294
Bump daggerVersion from 2.35.1 to 2.36
Bumps `daggerVersion` from 2.35.1 to 2.36.

Updates `dagger` from 2.35.1 to 2.36
- [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.35.1...dagger-2.36)

Updates `dagger-compiler` from 2.35.1 to 2.36
- [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.35.1...dagger-2.36)

Signed-off-by: dependabot[bot] <support@github.com>
2021-05-26 06:00:27 +00:00
ganfra 8eeae51cc6 Call transfer: prepare code for consult feature 2021-05-25 15:21:54 +02:00
Benoit Marty b44c1a1c77
Merge pull request #3383 from vector-im/feature/fga/authenticated_jitsi
Feature/fga/authenticated jitsi
2021-05-25 10:24:54 +02:00
Benoit Marty 6706a88a21
Merge pull request #3188 from vector-im/feature/bma/login_v2
Login v2 - WIP
2021-05-21 14:55:22 +02:00
Benoit Marty 40bb58c9cb
Merge branch 'develop' into feature/bca/fix_3371 2021-05-21 14:53:21 +02:00
Benoit Marty 697b9ff535
Merge branch 'develop' into feature/bca/spaces_quick_fixes 2021-05-21 14:49:12 +02:00
Benoit Marty fb5dda30bd Better handling of filename 2021-05-21 13:22:47 +02:00
Benoit Marty 762eb0db12 Format update 2021-05-21 13:00:37 +02:00
Valere ae5a5ec92b Spaces | Personal spaces add DM - Web Parity #3271 2021-05-21 11:46:13 +02:00
Valere 877a64fbce Don't create private spaces with encryption enabled #3363 2021-05-21 11:46:13 +02:00
Valere 8d3167cb66 Code review 2021-05-21 11:42:01 +02:00
Valere cb6f414c60 Fix | Explore room list: the RoomId is displayed instead of name (#3371) 2021-05-21 11:40:09 +02:00
ganfra 03f81258c4 Jitsi auth: clean after Benoits review 2021-05-20 20:16:37 +02:00
ganfra 894af10934 Jitsi auth: fix some mistakes and gives the jwt to Jitsi 2021-05-20 18:53:56 +02:00
ganfra e4b65053d4 Jitsi auth: fix openId API 2021-05-20 18:41:27 +02:00
Benoit Marty 8d94b5548d
Merge pull request #3316 from vector-im/feature/bma/secretstoring_migration
Feature/bma/secretstoring migration
2021-05-20 15:45:58 +02:00
Benoit Marty a7c1dc5cd9
Merge branch 'develop' into feature/bma/login_v2 2021-05-20 15:18:18 +02:00
dependabot[bot] 9b6a2c91f4
Bump core-ktx from 1.3.2 to 1.5.0
Bumps core-ktx from 1.3.2 to 1.5.0.

Signed-off-by: dependabot[bot] <support@github.com>
2021-05-20 13:08:12 +00:00
SpiritCroc d3ca5d0db0 Invalidate the timeline when the DM state changes for a room
We need to redraw messages when this changes, since we use different
layouts for DMs and non-direct chats.

Change-Id: Icf2df3a14655f7c9b6e5f7cdb29b590f393de4fd
2021-05-20 13:22:37 +02:00
ganfra ca2f671286 Jitsi auth: introduce openid token 2021-05-19 19:34:06 +02:00
dependabot[bot] 5629d30932
Bump appcompat from 1.2.0 to 1.3.0
Bumps appcompat from 1.2.0 to 1.3.0.

Signed-off-by: dependabot[bot] <support@github.com>
2021-05-19 06:20:33 +00:00
Benoit Marty 448eda8624 Replace unbreakable space by a regular space 2021-05-18 19:11:57 +02:00
Benoit Marty 36f397be48
Merge branch 'develop' into dependabot/gradle/kotlin_version-1.5.0 2021-05-17 12:15:19 +02:00
SpiritCroc d6b05925a9 Fix counting unread chats in spaces
Change-Id: Ibd39e18e92b28105d6b4289eb5ecaf7caeca7574
2021-05-16 10:39:37 +02:00
Benoit Marty 640b86ca9e
Merge pull request #3341 from vector-im/feature/bma/fix_migration_nightly
Fix a problem with database migration on nightly builds (#3335)
2021-05-14 16:32:28 +02:00
Benoit Marty 08aefa270e internal 2021-05-14 13:15:35 +02:00
Benoit Marty 4a94426d38 Fix warning 1.5: 'sumBy((T) -> Int): Int' is deprecated 2021-05-14 13:10:16 +02:00
Benoit Marty babbcedd87 Fix warning 1.5: 'Char.toByte(): Byte' is deprecated 2021-05-14 12:49:38 +02:00
Benoit Marty c70445a9a1 Fix warning 1.5: 'toUpperCase(Locale): String' and 'toLowerCase(Locale): String' are deprecated 2021-05-14 12:48:57 +02:00
Benoit Marty 7a28be941c Fix warning 1.5: 'Char.toInt(): Int' is deprecated 2021-05-14 12:47:09 +02:00
Benoit Marty 58a2fd8c77 Fix warning 1.5: String.capitalize is now deprecated 2021-05-14 12:45:33 +02:00
Benoit Marty 95714e55b0
Merge pull request #3324 from vector-im/feature/bma/doc_register
Add documentation on LoginWizard and RegistrationWizard (#3303)
2021-05-14 12:29:10 +02:00
Benoit Marty c27b7aec26 Add more doc 2021-05-14 11:44:44 +02:00
Benoit Marty d6e3bb59f4 Minor cleanup on the doc 2021-05-14 11:39:12 +02:00
Benoit Marty 946208a84d Add documentation on LoginWizard and RegistrationWizard (#3303)
ee
2021-05-14 11:39:12 +02:00
Benoit Marty dca4a31fc6 Fix a problem with database migration on nightly builds (#3335) 2021-05-14 11:26:24 +02:00
Benoit Marty 393ef3845e
Merge pull request #3330 from vector-im/dependabot/gradle/com.googlecode.libphonenumber-libphonenumber-8.12.23
Bump libphonenumber from 8.12.22 to 8.12.23
2021-05-13 11:15:14 +02:00
dependabot[bot] 90f6f9f7c1
Bump libphonenumber from 8.12.22 to 8.12.23
Bumps [libphonenumber](https://github.com/google/libphonenumber) from 8.12.22 to 8.12.23.
- [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.22...v8.12.23)

Signed-off-by: dependabot[bot] <support@github.com>
2021-05-13 06:30:31 +00:00
dependabot[bot] cd9b8c55f4
Bump realm-gradle-plugin from 10.4.0 to 10.5.0
Bumps [realm-gradle-plugin](https://github.com/realm/realm-java) from 10.4.0 to 10.5.0.
- [Release notes](https://github.com/realm/realm-java/releases)
- [Changelog](https://github.com/realm/realm-java/blob/v10.5.0/CHANGELOG.md)
- [Commits](https://github.com/realm/realm-java/compare/v10.4.0...v10.5.0)

Signed-off-by: dependabot[bot] <support@github.com>
2021-05-13 06:27:41 +00:00
dependabot[bot] 58dfe0f924
Bump daggerVersion from 2.35 to 2.35.1
Bumps `daggerVersion` from 2.35 to 2.35.1.

Updates `dagger` from 2.35 to 2.35.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.35...dagger-2.35.1)

Updates `dagger-compiler` from 2.35 to 2.35.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.35...dagger-2.35.1)

Signed-off-by: dependabot[bot] <support@github.com>
2021-05-12 14:50:20 +00:00