Commit Graph

3765 Commits

Author SHA1 Message Date
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
SpiritCroc db6cfd3054 Merge tag 'v1.1.7' into sc
Change-Id: Icefe721894c7cd3d0702d07efbd0452f95775d32

Conflicts:
	.idea/codeStyles/Project.xml
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt
	vector/src/main/java/im/vector/app/features/grouplist/HomeSpaceSummaryItem.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/list/SpaceRoomListSectionBuilder.kt
	vector/src/main/java/im/vector/app/features/rageshake/BugReporter.kt
	vector/src/main/java/im/vector/app/features/settings/VectorSettingsLabsFragment.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/res/layout/item_timeline_event_base.xml
	vector/src/main/res/values-ca/strings.xml
	vector/src/main/res/values-cs/strings.xml
	vector/src/main/res/values-de/strings.xml
	vector/src/main/res/values-et/strings.xml
	vector/src/main/res/values-fa/strings.xml
	vector/src/main/res/values-fr/strings.xml
	vector/src/main/res/values-it/strings.xml
	vector/src/main/res/values-sq/strings.xml
	vector/src/main/res/values-sv/strings.xml
	vector/src/main/res/values-vi/strings.xml
	vector/src/main/res/values-zh-rTW/strings.xml
	vector/src/main/res/values/strings.xml
	vector/src/main/res/xml/vector_settings_labs.xml
2021-05-12 16:01:36 +02:00
Benoit Marty 824a8a5c66 Fix copyright 2021-05-11 14:06:49 +02:00
Benoit Marty 91be2b6f3f Add test and handle system upgrade 2021-05-11 14:06:49 +02:00
Benoit Marty cef4cf09ec Create a BuildVersionSdkIntProvider to be able to inject it and do some test
To merge with BuildVersionSdkIntProvider

To merge with fix add module

To merge with fix buildVersionSdkIntProvider
2021-05-11 13:52:08 +02:00
Benoit Marty f31c44963b Cleanup the existing code 2021-05-11 13:52:08 +02:00
Valere f9820cde58 Fixes on unread badges 2021-05-11 11:36:17 +02:00
Valere 1ec08bec07 Fix spaces add room via server 2021-05-11 08:18:37 +02:00
Valere 80366ee938 Code review 2021-05-10 20:01:17 +02:00
Valere f9e608a790 Manage Spaces as Admin 2021-05-10 20:01:17 +02:00
Benoit Marty e6d4f9a1dc
Merge pull request #3298 from vector-im/feature/ypi/join_rules
Add joinRules field to RoomSummary
2021-05-10 19:54:44 +02:00
Benoit Marty 7ec44a5542
Merge pull request #3290 from vector-im/feature/bca/spaces_various_fixes
Various fixes on spaces explore
2021-05-10 19:52:45 +02:00
ganfra bea67bd7fd Join rules: fix migration 2021-05-10 19:03:34 +02:00
Benoit Marty 711ee24c4f
Merge pull request #3307 from vector-im/feature/ons/fix_user_profile_search
Allow inviting users even if profile information cannot be retrieved
2021-05-10 17:26:54 +02:00
Onuray Sahin 0f8a641510 Code review fixes. 2021-05-10 17:38:40 +03:00
Onuray Sahin 87d35958c6 Allow inviting users even if profile information cannot be retrieved. 2021-05-10 16:34:30 +03:00
Valere 981626a0f7 cleaning 2021-05-10 13:53:43 +02:00
Benoit Marty 20f86a30e8 Upgrade Realm to version 10.4.0
Migration with isEmbedded tested OK
2021-05-10 13:31:38 +02:00
Valere 5e2c3239ea Code review 2021-05-10 10:21:43 +02:00
Benoit Marty 87b12b7e11 Add the public icon on the rooms in the room list (#3292) 2021-05-07 16:41:30 +02:00
Benoit Marty bbabfdabd0 Handle database migration 2021-05-07 13:22:55 +02:00
Benoit Marty e969d663a5 Code review 2021-05-07 12:33:01 +02:00
yostyle 64f1834913 Add joinRules to RoomSummary 2021-05-06 18:41:26 +02:00
Valere 19223826fe Various fixes on spaces explore
+ MxTo bottom sheet Fix regression when using state button
2021-05-06 11:54:26 +02:00
Benoit Marty f704539c89
Merge pull request #3284 from vector-im/feature/bca/spaces_stable_prefixes
stable prefix for msc1772
2021-05-06 11:09:21 +02:00
Valere efe5176286 rename activeSpaceId to activeSpaceFilter 2021-05-05 22:36:27 +02:00
Valere 3cbdf4ad5c stable prefix for msc1772 2021-05-05 22:30:38 +02:00
Valere 4abfc1fd2b Fix space test + room history visibility bug 2021-05-05 17:46:58 +02:00
Benoit Marty 64a37c251d
Merge pull request #3264 from vector-im/feature/bma/fix_3245
Compress video and improve file too big error detection
2021-05-05 15:50:21 +02:00
Benoit Marty 080bdf1495 Fix long line 2021-05-05 15:48:11 +02:00
SpiritCroc 2f4e9e3017 Ensure proper grouping for notifications tab query
Change-Id: I58e8a85fd5e2c938d55189825daf7820f826da1e
2021-05-05 12:31:20 +02:00
Benoit Marty e28556dd1b Create TemporaryFileCreator to avoid code duplication 2021-05-05 11:26:36 +02:00
Benoit Marty 590d8fc849 Also test the effect of completeExceptionally() 2021-05-05 11:12:06 +02:00
Benoit Marty 62207f02f0 Properly handle the compression cancellation
It should never occur though
2021-05-05 10:53:52 +02:00
Benoit Marty 8d52829918 Fix issue in logs 2021-05-05 10:49:57 +02:00
Benoit Marty 2a411ccf6c Handle properly the case where the video compression is not necessary 2021-05-04 23:14:18 +02:00
Benoit Marty efc08b376b Transcoder.transcode() already operated on a background thread 2021-05-04 22:50:42 +02:00
Benoit Marty dd325c4e91
Merge pull request #3270 from vector-im/feature/bma/remove_jcenter
https://github.com/Piasy/BigImageViewer is now hosted on mavenCentral()
2021-05-04 17:32:23 +02:00
Benoit Marty 61380bf48a Use Junit import 2021-05-04 15:28:52 +02:00
Benoit Marty c502e971a1 Use Long for size like for the other models (FileInfo, AudioInfo, VideoInfo) 2021-05-04 13:35:03 +02:00
Benoit Marty bcf6dcbf70 Compute new video dimension after compression 2021-05-04 12:47:21 +02:00
Benoit Marty 6347564365 Change the library to compress video for licensing reason 2021-05-04 12:17:43 +02:00
Benoit Marty ee7518bf51 Dependabot missed this one (?) 2021-05-04 10:51:07 +02:00
Benoit Marty 4189db0f89 Use Junit import 2021-05-04 10:50:31 +02:00
Benoit Marty 9d225b7826 Fixed! 2021-05-03 21:14:06 +02:00
Benoit Marty 12c4f3c6f7 Fix video thumbnail not displayed in when replying and in bottom sheet
Also create some extensions for future use
2021-05-03 21:14:06 +02:00
Benoit Marty d7cbae7c47 Fix a regression with video size 2021-05-03 21:13:47 +02:00
Benoit Marty e510de1ccc Display video/image compression progress 2021-05-03 21:13:47 +02:00
Benoit Marty 765380ab95 Fix potential issue with video message conten 2021-05-03 21:13:47 +02:00
Benoit Marty d6b6768f41 Cleanup 2021-05-03 21:13:47 +02:00
Benoit Marty 5213309587 Send the Thumbnail after the main content, for the case the main content fails if too large. 2021-05-03 21:13:47 +02:00
Benoit Marty e1e4b03532 Do not serialize "soft_logout" 2021-05-03 21:13:47 +02:00
Benoit Marty e108534a2a Improve file too big error detection and rendering (#3245) 2021-05-03 21:13:47 +02:00
Benoit Marty 5e1c503d2e Compress video before sending (#442) 2021-05-03 21:13:47 +02:00
Benoit Marty 75a4455d15 reorder methods 2021-05-03 21:13:25 +02:00
SpiritCroc 39359f7d24 Merge remote-tracking branch 'upstream/develop' into spaces
Change-Id: I10235a7a808ae66f5b00ad2e58c2aedf395e8e25

Conflicts:
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/summary/RoomAggregateNotificationCount.kt
	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/room/summary/RoomSummaryDataSource.kt
	vector/build.gradle
	vector/src/main/java/im/vector/app/core/extensions/TimelineEvent.kt
	vector/src/main/java/im/vector/app/features/configuration/VectorConfiguration.kt
	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/HomeDrawerFragment.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/action/MessageActionsViewModel.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/RoomListAction.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/SectionHeaderAdapter.kt
	vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomController.kt
	vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileActivity.kt
	vector/src/main/java/im/vector/app/features/ui/SharedPreferencesUiStateRepository.kt
2021-05-02 12:12:52 +02:00
SpiritCroc 2605c6ac9b Properly sort rooms according to events previewed in summary
Change-Id: Id17385a4d17869b0356aa7242407581e2193845e
2021-05-01 11:56:03 +02:00
SpiritCroc 3ee98f3c94 Fix missing sender information after edits
Fixes https://github.com/vector-im/element-android/issues/3184

Change-Id: I27de01c29b31fbd49c8d2b0d4dacf13ba932d5b9
2021-05-01 11:56:03 +02:00
SpiritCroc 47aa787ecb Fix missing sender information after edits
Fixes https://github.com/vector-im/element-android/issues/3184
2021-05-01 10:11:15 +02:00
Benoit Marty 5d9d984c73
Merge pull request #3235 from vector-im/feature/bca/spaces_justme_beta
Just me spaces support
2021-04-29 17:47:19 +02:00
Benoit Marty 4486181669 Sort social logins buttons 2021-04-29 15:57:52 +02:00
Benoit Marty 344a7e5b3d Add facility to get profile info to the login wizard 2021-04-29 15:56:25 +02:00
Benoit Marty 9972ab5d2e Cleanup 2021-04-29 15:56:25 +02:00
Benoit Marty 98177da6b1
Merge pull request #3197 from vector-im/feature/bma/crashfix
WIP - introduce sessionScope
2021-04-29 15:34:42 +02:00
Valere 31ffa65fd0 Update add room screen as per design 2021-04-29 11:51:07 +02:00
Benoit Marty 264eb3b0a2
Merge pull request #3246 from vector-im/dependabot/gradle/com.googlecode.libphonenumber-libphonenumber-8.12.22
Bump libphonenumber from 8.12.21 to 8.12.22
2021-04-29 11:12:29 +02:00
Benoit Marty e073563a67 Cleanup 2021-04-29 11:10:41 +02:00
ganfra 80b155e042 Refact coroutine session scope 2021-04-29 11:10:41 +02:00
Benoit Marty bd0fcce572 Return Job 2021-04-29 11:10:41 +02:00
Benoit Marty a5c0c23bae Inject constructor... 2021-04-29 11:10:41 +02:00
Benoit Marty e5d0a8f3d8 Cleanup 2021-04-29 11:10:41 +02:00
Benoit Marty dc69d5c68a Create a holder 2021-04-29 11:10:41 +02:00
Benoit Marty ecd2d0fb76 Use session scope 2021-04-29 11:10:41 +02:00
Benoit Marty 82ee2567b7 Provide a session scope, to launch coroutines without using the ViewModelScope
It could be used elsewhere, will change other location in another commit.
2021-04-29 11:10:41 +02:00
Benoit Marty 4acc308864
Merge pull request #3190 from vector-im/feature/bma/fix_troubleshoot
Fix a race condition
2021-04-29 11:08:00 +02:00
Benoit Marty 751efb57fc
Merge pull request #2840 from vector-im/feature/bca/spaces_sdk
Spaces support - beta
2021-04-29 10:18:31 +02:00
dependabot[bot] 7593c3f03d
Bump libphonenumber from 8.12.21 to 8.12.22
Bumps [libphonenumber](https://github.com/google/libphonenumber) from 8.12.21 to 8.12.22.
- [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.21...v8.12.22)

Signed-off-by: dependabot[bot] <support@github.com>
2021-04-29 07:18:14 +00:00
Benoit Marty 7beb483972
Merge pull request #3238 from vector-im/feature/bma/android11
Android 11 fixes an other fixes for attachement
2021-04-28 16:57:51 +02:00
Benoit Marty b86fd37c15
Merge branch 'develop' into feature/bca/spaces_sdk 2021-04-28 16:57:02 +02:00
Benoit Marty c40476aa94 Add ability to install APK from directly from Element (#2381)
And cleanup `data class OpenFile`
2021-04-28 15:55:21 +02:00
Benoit Marty 195bc8e914 Fix issue when opening encrypted files (#3186)
Also always open the file after a successful download
2021-04-28 15:11:48 +02:00
Yoan Pintas ba641a6e76
Merge pull request #3178 from vector-im/expose_directUserId
Expose directUserId in RoomSummary
2021-04-28 13:45:21 +02:00
yostyle 506bdd8eb0 directUserId can be null 2021-04-28 12:22:43 +02:00
Valere 32605be6e8 Fix / migration recover room type 2021-04-28 11:42:08 +02:00
Valere 70476b912f Fix / placeholder in dark time 2021-04-28 11:15:58 +02:00
Valere 7d3d080603 Code review 2021-04-28 11:15:58 +02:00
Valere aa74646ddf Fix invited spaced filters rooms out of home + invite not working 2021-04-28 11:15:58 +02:00
Valere d30ba9c749 Spaces quick fixes and updates
Make drawer menu more obvious + fix notification count
2021-04-28 11:15:58 +02:00
Valere 4d7aeff54a Code review 2021-04-28 11:15:58 +02:00
Valere 8146d8ab1e Add Rooms to space 2021-04-28 11:15:58 +02:00
Valere 5a84456f1f Set guest access in developer mode 2021-04-28 11:15:58 +02:00
Valere 1deb44f91f Better DM filtering + fix space member loading 2021-04-28 11:15:58 +02:00
Valere 7910e84d8e Fix test compilation 2021-04-28 11:15:58 +02:00
Valere 57e9e4474e fix warning 2021-04-28 11:15:58 +02:00
Valere e735aee724 Fix / group switch + refactoring 2021-04-28 11:15:58 +02:00
Valere 6aaf6bdf9b Fix rebase 2021-04-28 11:15:58 +02:00
Valere 49381db2e3 cleaning 2021-04-28 11:15:58 +02:00
Valere 79bde6ee91 Private (me and teamates) space support 2021-04-28 11:15:58 +02:00
Valere 02c2fea99e cleaning 2021-04-28 11:15:58 +02:00
Valere 886cc7fb5b Sort summaries by default 2021-04-28 11:15:58 +02:00
Valere 0d3c2b4bef Fix space filtering 2021-04-28 11:15:58 +02:00
Valere 8a35a786b4 Post rebase fixes 2021-04-28 11:15:58 +02:00
Benoit Marty 715bd29c75 Cleanup and add URL 2021-04-28 11:15:58 +02:00
Benoit Marty 66ac298e95 Benoit Review: cleanup 2 2021-04-28 11:15:58 +02:00
Benoit Marty 2cccbb3fce Benoit Review: avoid duplicate (again) class PowerLevelsContent 2021-04-28 11:15:58 +02:00
Benoit Marty 46290f1ed4 Benoit Review: cleanup 2021-04-28 11:15:58 +02:00
Valere 815cae4d84 remove enum from rest model 2021-04-28 11:15:58 +02:00
Valere 6b8b03e162 Show people you may no in space bottomsheet 2021-04-28 11:15:58 +02:00
Valere dda45f1c2a Fix public space guest access & history visibility 2021-04-28 11:15:58 +02:00
Valere 201b914304 Fix invite power level for public space 2021-04-28 11:15:58 +02:00
Valere 55083a5602 Design review changes 2021-04-28 11:15:58 +02:00
Valere ea5e48b940 1 depth hierarchy support in space panel 2021-04-28 11:15:58 +02:00
Valere 06a84d985a Basic support to browse space directory 2021-04-28 11:15:58 +02:00
Valere 802853d205 Suggested Space support 2021-04-28 11:15:58 +02:00
Valere e364a36ee6 cleaning 2021-04-28 11:15:58 +02:00
Valere 48fef45ce3 Code quality 2021-04-28 11:15:58 +02:00
Valere 0c5ca9f51b Space hierachy SDK updates 2021-04-28 11:15:58 +02:00
Valere ef42591534 Open Space Link initial commit 2021-04-28 11:15:58 +02:00
Valere 7d2d7b411e Space Create Wizard Flow 2021-04-28 11:15:58 +02:00
Valere 6c69a6055d Support retry after M_LIMIT_EXCEEDED 2021-04-28 11:15:58 +02:00
Valere 883f70306f Rebase Fixes 2021-04-28 11:15:58 +02:00
Valere 5aa698768a Support update of order/autojoin of child 2021-04-28 11:15:58 +02:00
Valere c8916ee83c Udpate since msc 1772 2021-04-28 11:15:58 +02:00
Valere 186024b271 MSC 2946 WIP 2021-04-28 11:15:58 +02:00
Valere 57f17620b5 Fix Dendrite sync response support 2021-04-28 11:15:58 +02:00
Valere b7a89f4055 Fix / Syncs breaking on dendrite 2021-04-28 11:15:58 +02:00
Valere 7521a0d3ae Fix / post rebase issues 2021-04-28 11:15:58 +02:00
Valere e2578a29ed Basic space join / use tmp msc id / db model update 2021-04-28 11:15:58 +02:00
Valere ab4f2429c4 Use unstable prefixes 2021-04-28 11:15:58 +02:00
Valere df341d8ea3 Basic peeking preview and join and filter 2021-04-28 11:15:58 +02:00
Valere c5fa0a413f Space first commit 2021-04-28 11:15:58 +02:00
Benoit Marty e3a667cbc6
Merge pull request #3220 from vector-im/dependabot/gradle/daggerVersion-2.35
Bump daggerVersion from 2.34.1 to 2.35
2021-04-26 16:27:39 +02:00
Benoit Marty 0a72cc4c93
Merge branch 'develop' into feature/bma/crashRxSingle 2021-04-26 15:17:32 +02:00
dependabot[bot] 7575959c4a
Bump daggerVersion from 2.34.1 to 2.35
Bumps `daggerVersion` from 2.34.1 to 2.35.

Updates `dagger` from 2.34.1 to 2.35
- [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.34.1...dagger-2.35)

Updates `dagger-compiler` from 2.34.1 to 2.35
- [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.34.1...dagger-2.35)

Signed-off-by: dependabot[bot] <support@github.com>
2021-04-23 07:05:44 +00:00
Benoit Marty fe9bd38115
Merge pull request #3175 from vector-im/dependabot/gradle/daggerVersion-2.34.1
Bump daggerVersion from 2.34 to 2.34.1
2021-04-20 19:58:48 +02:00
Benoit Marty ff3a916cab Do not invite the current user when creating a room (#3123) 2021-04-20 18:59:49 +02:00
Benoit Marty f4c1de3c30 Fix exception in rxSingle (#3180)
Do not wrap CancellationException to Failure.Cancelled, else RxCancellable will throw.
2021-04-20 18:49:16 +02:00
Benoit Marty f8be814079 RegistrationWizard.createAccount() parameters are now all optional, following Matrix spec (#3205) 2021-04-20 12:32:03 +02:00
Benoit Marty c6a493848e Fix a race condition: Push can be received before the Gateway API returns 2021-04-16 16:13:16 +02:00
SpiritCroc 28c5f036c8 Merge tag 'v1.1.5' into sc
Change-Id: I263852c42cfa21935890bee435f063d7fa43edfa
2021-04-15 12:29:59 +02:00
Benoit Marty 9565e8975e merge hotfix to develop 2021-04-15 11:09:58 +02:00
Benoit Marty 59637c4a6b Revert to Realm 10.3.1 to fix issue with migration
Waiting for https://github.com/realm/realm-java/issues/7402
2021-04-14 21:54:07 +02:00
SpiritCroc 20e185ef48 Restore setting functionality for unimportant unread type and count
Change-Id: Ied403f8fad4a7fa4e9dd1422c9ca08690183c1b1
2021-04-14 13:58:37 +02:00
SpiritCroc 04c0d7c121 Add back chats marked unread to notifications tab
Likely also required for the "mark all as read" feature to work properly
since v1.1.4

Change-Id: I375860e55e3f188526f90cf7ffdccf192871e745
2021-04-14 13:26:35 +02:00
SpiritCroc 811950cb18 Various fixes after merge
- Fix compile
- Fix counting chats marked unread
- Fix counting chats with unread messages

Change-Id: Ibf928c5380a1b7ec25f2c510b97ee4f726fe7c0d
2021-04-14 13:20:50 +02:00
Benoit Marty 699b1429b7 Simplify `LoginFlowResult` model 2021-04-14 12:42:47 +02:00
yostyle e467e2ca08 Expose directUserId in RoomSummary 2021-04-14 11:35:21 +02:00
dependabot[bot] 30b415e77e
Bump daggerVersion from 2.34 to 2.34.1
Bumps `daggerVersion` from 2.34 to 2.34.1.

Updates `dagger` from 2.34 to 2.34.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.34...dagger-2.34.1)

Updates `dagger-compiler` from 2.34 to 2.34.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.34...dagger-2.34.1)

Signed-off-by: dependabot[bot] <support@github.com>
2021-04-14 07:09:19 +00:00
SpiritCroc 0e601aa8f0 Merge tag 'v1.1.4' into sc
Note: this merge needs more work, since upstream changed implementations
affecting following features:
- Mark unread
- Notification count badges
- Overview list filtering / combined overview
- Remember expanded categories
- Read receipt layout

Change-Id: If728bb54dd7c423b57bd3f59d23d86a1a0e5e435

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/database/model/RoomSummaryEntity.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/RoomAvatarResolver.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/read/DefaultReadService.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/accountdata/AccountDataAPI.kt
	vector/src/main/java/im/vector/app/core/resources/UserPreferencesProvider.kt
	vector/src/main/java/im/vector/app/core/utils/Emoji.kt
	vector/src/main/java/im/vector/app/features/home/HomeDetailViewModel.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/timeline/helper/MessageInformationDataFactory.kt
	vector/src/main/java/im/vector/app/features/home/room/list/RoomListAction.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/RoomListViewState.kt
	vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryController.kt
	vector/src/main/res/layout/item_timeline_event_base.xml
	vector/src/main/res/layout/item_timeline_event_base_state.xml
2021-04-13 09:28:13 +02:00
Benoit Marty 288aed3252
Merge pull request #3151 from vector-im/feature/bma/cleanup_resources
Store description update
2021-04-12 10:47:18 +02:00
Dominic Fischer 7ee87a0d4b Merge branch 'develop' into suspend_functions_1
# Conflicts:
#	matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/RoomService.kt
#	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/DefaultRoomService.kt
#	vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewModel.kt
2021-04-10 16:50:30 +01:00
Benoit Marty 37226a1641 Small cleanup 2021-04-09 16:58:41 +02:00
Benoit Marty 388e4eb112
Merge pull request #3137 from vector-im/dependabot/gradle/daggerVersion-2.34
Bump daggerVersion from 2.33 to 2.34
2021-04-09 16:38:25 +02:00
SpiritCroc 6aa6f3e01b Merge tag 'v1.1.3' into sc
Change-Id: I50f78eeec11fc4d606ddabb68d08a5ff97bbad13

Conflicts:
	vector/src/main/res/layout/item_bottom_sheet_message_preview.xml
2021-04-09 11:57:11 +02:00
Benoit Marty ee3eb8e1d6 Cleanup 2021-04-08 18:52:53 +02:00
Benoit Marty 2a1e52745f Some cleanup after merge of #3084 2021-04-08 18:50:28 +02:00
Aleks 9d96f90e49 keyword-spacing fix + wildcard-imports fix 2021-04-08 18:50:28 +02:00
Aleks 4451b682b1 merge + register/available endpoint corrections 2021-04-08 18:50:28 +02:00
Aleks 2e9f8ae6ae registration availability endpoint added 2021-04-08 18:50:05 +02:00
Benoit Marty 7b1d313e8e Small cleanup 2021-04-08 12:46:55 +02:00
Benoit Marty 8dead986a5 Always try to retry Http requests in case of 429 (#1300) 2021-04-08 10:59:51 +02:00
Benoit Marty 9b5bc60fa9 Remove unused parameter and use same value than the JS SDK 2021-04-08 09:54:51 +02:00
dependabot[bot] 505b01ad97
Bump daggerVersion from 2.33 to 2.34
Bumps `daggerVersion` from 2.33 to 2.34.

Updates `dagger` from 2.33 to 2.34
- [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.33...dagger-2.34)

Updates `dagger-compiler` from 2.33 to 2.34
- [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.33...dagger-2.34)

Signed-off-by: dependabot[bot] <support@github.com>
2021-04-08 07:19:20 +00:00