mirrors/SchildiChat-android
1
0
Fork 0
mirror of https://github.com/SchildiChat/SchildiChat-android.git synced 2024-11-25 19:05:56 +03:00
Code Issues Projects Releases Packages Wiki Activity
17797 commits 6 branches 120 tags 229 MiB
Commit graph

103 commits

Author SHA1 Message Date
SpiritCroc
d5d555d07f Merge tag 'v1.4.8' into merge-v1.4.8 
Change-Id: Ic6338fef4f27ca95016eb11ab07a10d3f3a8986e

Conflicts:
	library/ui-styles/src/main/res/values/dimens.xml
	library/ui-styles/src/main/res/values/styles_buttons.xml
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/summary/RoomSummaryConstants.kt
	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/room/summary/RoomSummaryUpdater.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/LoadTimelineStrategy.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/TimelineChunk.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/TimelineFragment.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/MessageActionsViewModel.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/AbsMessageItem.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/style/TimelineMessageLayout.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/view/MessageBubbleView.kt
	vector/src/main/java/im/vector/app/features/home/room/list/RoomCategoryItem.kt
	vector/src/main/java/im/vector/app/features/home/room/list/RoomListFragment.kt
	vector/src/main/java/im/vector/app/features/home/room/list/RoomListSectionBuilderSpace.kt
	vector/src/main/java/im/vector/app/features/home/room/list/RoomsSection.kt
	vector/src/main/java/im/vector/app/features/home/room/list/SectionHeaderAdapter.kt
	vector/src/main/java/im/vector/app/features/roomprofile/notifications/RoomNotificationSettingsViewState.kt
	vector/src/main/res/drawable/ic_home_bottom_catchup.xml
	vector/src/main/res/drawable/ic_shield_custom.xml
	vector/src/main/res/drawable/ic_shield_trusted.xml
	vector/src/main/res/drawable/ic_shield_trusted_no_border.xml
	vector/src/main/res/layout/fragment_ftue_account_created.xml
	vector/src/main/res/layout/fragment_timeline.xml
	vector/src/main/res/layout/item_timeline_event_code_block_stub.xml
	vector/src/main/res/layout/view_attachment_type_selector.xml
	vector/src/main/res/layout/view_room_detail_toolbar.xml
	vector/src/main/res/menu/menu_submit.xml
 2022-03-30 15:53:51 +02:00
Benoit Marty
fa104adefc Fix all warnings in file E2eeSanityTests.kt 2022-03-11 15:35:21 +01:00
SpiritCroc
2f5df9133f Merge tag 'v1.4.2' into sc 
Change-Id: I8a96211645ff31284897d818ce93c7b5571fbd0f

Conflicts:
	library/ui-styles/src/main/res/values/styles_timeline.xml
	library/ui-styles/src/main/res/values/theme_black.xml
	library/ui-styles/src/main/res/values/theme_dark.xml
	library/ui-styles/src/main/res/values/theme_light.xml
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/RealmCryptoStoreMigration.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt
	vector/src/main/java/im/vector/app/features/home/HomeDrawerFragment.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewState.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/factory/MergedHeaderItemFactory.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/detail/timeline/item/AbsBaseMessageItem.kt
	vector/src/main/java/im/vector/app/features/html/PillImageSpan.kt
	vector/src/main/java/im/vector/app/features/navigation/DefaultNavigator.kt
	vector/src/main/java/im/vector/app/features/navigation/Navigator.kt
	vector/src/main/res/layout/item_room.xml
	vector/src/main/res/values/config.xml
 2022-03-04 11:42:30 +01:00
Benoit Marty
f57ece5ca8 Add icon to the project! 2022-02-17 18:06:55 +01:00
Benoit Marty
6e68f9a224 Remove piwik configuration, it was not used. 2022-02-17 18:06:55 +01:00
SpiritCroc
a9d5700d2b Merge tag 'v1.3.16' into sc 
Change-Id: I8b3937f4ac30d3e72e2cb694eee2dc5bf034cb75

Conflicts:
	gradle.properties
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/pushrules/EventMatchCondition.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/timeline/Timeline.kt
	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/di/NetworkModule.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/LocalEchoEventFactory.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryUpdater.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/DefaultTimeline.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/TokenChunkEventPersistor.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/job/SyncThread.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/job/SyncWorker.kt
	vector/src/main/AndroidManifest.xml
	vector/src/main/java/im/vector/app/features/home/HomeDrawerFragment.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewState.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/composer/ComposerEditText.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/composer/MessageComposerViewState.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/action/MessageActionsViewModel.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/MatrixItemColorProvider.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/TimelineEventVisibilityHelper.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageTextItem.kt
	vector/src/main/java/im/vector/app/features/home/room/list/RoomListSectionBuilderSpace.kt
	vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryItem.kt
	vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryItemFactory.kt
	vector/src/main/java/im/vector/app/features/html/EventHtmlRenderer.kt
	vector/src/main/java/im/vector/app/features/rageshake/BugReportActivity.kt
	vector/src/main/java/im/vector/app/features/rageshake/BugReporter.kt
	vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileController.kt
	vector/src/main/java/im/vector/app/features/settings/VectorSettingsBaseFragment.kt
	vector/src/main/java/im/vector/app/features/settings/VectorSettingsLabsFragment.kt
	vector/src/main/res/layout/activity_call.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/item_timeline_event_base.xml
	vector/src/main/res/layout/view_voice_message_recorder.xml
	vector/src/main/res/values/config.xml
	vector/src/main/res/xml/vector_settings_labs.xml
 2022-01-29 12:18:19 +01:00
Valere
be119ea161 Support for lab auto rageshake UISI 2022-01-10 09:41:51 +01:00
SpiritCroc
acdd4e24b9 Merge tag 'v1.3.12' into sc 
Change-Id: I66c0120371c3f52295f033ec21702c08381b5b10

Conflicts:
	build.gradle
	vector/build.gradle
	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/TimelineEventVisibilityHelper.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageTextItem.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/url/PreviewUrlView.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/actions/RoomListQuickActionsEpoxyController.kt
	vector/src/main/java/im/vector/app/features/navigation/DefaultNavigator.kt
	vector/src/main/java/im/vector/app/features/navigation/Navigator.kt
	vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileActivity.kt
	vector/src/main/java/im/vector/app/features/settings/VectorPreferences.kt
	vector/src/main/java/im/vector/app/features/settings/VectorSettingsBaseFragment.kt
	vector/src/main/java/im/vector/app/features/spaces/SpaceSummaryController.kt
	vector/src/main/res/drawable/highlighted_message_background.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_selection.xml
	vector/src/main/res/layout/fragment_room_detail.xml
	vector/src/main/res/layout/item_bottom_sheet_message_preview.xml
	vector/src/main/res/layout/item_expandable_textview.xml
	vector/src/main/res/layout/item_login_header.xml
	vector/src/main/res/layout/item_radio.xml
	vector/src/main/res/layout/item_room.xml
	vector/src/main/res/layout/item_timeline_event_base.xml
	vector/src/main/res/layout/item_timeline_event_call_tile_stub.xml
	vector/src/main/res/layout/item_timeline_event_code_block_stub.xml
	vector/src/main/res/layout/item_timeline_event_media_message_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_timeline_event_voice_stub.xml
	vector/src/main/res/layout/view_stub_room_profile_header.xml
	vector/src/main/res/layout/view_url_preview.xml
	vector/src/main/res/xml/vector_settings_labs.xml
	vector/src/main/res/xml/vector_settings_root.xml
 2021-12-23 14:36:13 +01:00
Benoit Marty
8608230fa0 Analytics: add config to build.gradle 2021-12-02 14:10:03 +01:00
SpiritCroc
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
Benoit Marty
984b1dd6a8 RawService.getWellknown() now takes a domain instead of a matrixId as parameter 2021-06-30 09:20:08 +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
Benoit Marty
047c59eba0 Rework colors management 2021-06-09 15:36:20 +02: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
53b20a89ca Change with Android Studio 4.2 2021-05-07 16:41:51 +02:00
SpiritCroc
699ad4eaeb Merge tag 'v1.1.1' into sc 
Conflicts:
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt
	vector/src/main/AndroidManifest.xml
	vector/src/main/java/im/vector/app/core/epoxy/bottomsheet/BottomSheetRoomPreviewItem.kt
	vector/src/main/java/im/vector/app/features/home/HomeActivity.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/MessageInformationDataFactory.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/AbsMessageItem.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageFileItem.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageImageVideoItem.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageInformationData.kt
	vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileController.kt
	vector/src/main/res/drawable/rounded_rect_shape.xml
	vector/src/main/res/menu/menu_timeline.xml
	vector/src/main/res/values/array.xml
	vector/src/main/res/xml/vector_settings_preferences.xml
 2021-03-14 10:58:57 +01:00
Benoit Marty
8356d18a67 Improve Snackbar duration (Fixes #2929) 2021-03-10 14:49:52 +01:00
SpiritCroc
ca0b360875 Merge tag 'v1.1.0' into sc 
Change-Id: I73be281134a8a7ea7fdeffa9356ffae0dda8b0d6

Conflicts:
	vector/build.gradle
	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/breadcrumbs/BreadcrumbsItem.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/AbsBaseMessageItem.kt
	vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryItem.kt
	vector/src/main/java/im/vector/app/features/roomprofile/settings/RoomSettingsController.kt
	vector/src/main/java/im/vector/app/features/widgets/WidgetArgsBuilder.kt
	vector/src/main/res/drawable/oval_positive.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/dialog_disclaimer_content.xml
	vector/src/main/res/layout/fragment_login_splash.xml
	vector/src/main/res/layout/item_generic_with_value.xml
	vector/src/main/res/layout/item_timeline_event_media_message_stub.xml
	vector/src/main/res/menu/menu_timeline.xml
	vector/src/main/res/values/array.xml
 2021-02-20 15:41:01 +01:00
Benoit Marty
373586c23e Cleanup 2021-02-17 10:25:06 +01:00
SpiritCroc
38b82fb823 Merge tag 'v1.0.12' into sc 
Conflicts:
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt
	vector/src/main/java/im/vector/app/features/home/HomeActivity.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/roomprofile/settings/RoomSettingsController.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/layout/item_bottom_sheet_action.xml
	vector/src/main/res/layout/item_timeline_event_base.xml
	vector/src/main/res/layout/item_timeline_event_text_message_stub.xml
	vector/src/main/res/values-v23/theme_status.xml
	vector/src/main/res/values/array.xml
	vector/src/main/res/values/theme_status.xml

Note to self: need to check if URL preview works with wrap_content

Change-Id: I028b2873a33bb1a770f2da96d576b97202b5bcf9
 2020-12-15 15:55:14 +01:00
Benoit Marty
439029467a Attachment preview also for Gif files 2020-12-11 11:22:36 +01:00
Benoit Marty
c5e6e004dd Room alias detail 2020-11-30 10:59:07 +01:00
SpiritCroc
44d3c0118a Merge remote-tracking branch 'upstream/master' into sc 
Change-Id: If0e38334e7e479134cd05283f857e4871bb7692f

Conflicts:
	vector/build.gradle
	vector/src/main/AndroidManifest.xml
	vector/src/main/java/im/vector/app/features/home/RoomListDisplayMode.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageInformationData.kt
	vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewModel.kt
	vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileActivity.kt
	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_legacy.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/layout/fragment_home_drawer.xml
	vector/src/main/res/layout/fragment_login_splash.xml
	vector/src/main/res/layout/item_bottom_sheet_action.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/view_avatar_selector.xml
 2020-10-17 15:28:18 +02:00
Benoit Marty
17d1a4b6fb revert change from AS 2020-10-13 22:15:23 +02:00
Benoit Marty
ede5bb0e90 Format files, in particular align -> 2020-10-13 14:57:45 +02:00
Benoit Marty
7d53dfeca4 Add Sygnal API implementation to test is Push are correctly received 2020-10-08 22:08:48 +02:00
SpiritCroc
83edf15727 Android-studio keeps changing this 2020-08-22 15:02:25 +02:00
Benoit Marty
a6150beed2 Stuff added by AS 4.0.1 2020-08-20 15:32:45 +02:00
Valere
42a24300a1 Initial commit jitsi 2020-08-14 09:31:24 +02:00
Benoit Marty
19ed5a2d3d Keys Backup API now use the unstable prefix (#1503) 2020-06-26 15:54:50 +02:00
ganfra
f28e3ca504 Merge branch 'develop' into feature/improve_perf 2020-06-25 10:57:46 +02:00
Benoit Marty
9754e26e5f Add capability to change the display name (#1529) 2020-06-22 20:50:31 +02:00
ganfra
f762c4c7a2 Makes sure bind and unbind are calling super in items 2020-06-22 11:19:53 +02:00
Benoit Marty
0fd50892af Temporary fix to show error when user is creating an account on matrix.org with userId containing only digits (#1410) 2020-06-03 18:41:07 +02:00
ganfra
dea903bcb5 Merge branch 'develop' into feature/integration_manager 2020-05-19 16:08:46 +02:00
Benoit Marty
af3fc22e2d Identity: correctly handle terms update 2020-05-18 17:22:40 +02:00
Benoit Marty
f489265ce7 Create AccessTokenProvider 2020-05-18 17:21:59 +02:00
ganfra
91301197ea Try to communicate with WidgetPostAPI 2020-05-13 20:04:08 +02:00
Benoit Marty
0cb43eef51 Add test for Unwedging (before implementing it) 2020-04-20 18:07:14 +02:00
Benoit Marty
23862cb3d0
Merge branch 'develop' into feature/notif 2020-03-06 14:43:23 +01:00
Benoit Marty
78bc2bbaa5 AndroidStudio cleanup 2020-03-04 12:15:33 +01:00
Benoit Marty
a05caf6f0e Update the 2 notification settings screens by moving some pref to the root notification screen 2020-02-29 09:49:21 +01:00
Valere
bdb1df75d4 Check trust on crypto thread 2020-02-26 12:20:03 +01:00
Benoit Marty
076ac23b38 Modification done by AndroidStudio 3.6 2020-02-26 07:59:54 +01:00
Benoit Marty
4c3b754de4 Use const from DefaultSharedSecretStorageService 2020-02-14 18:33:15 +01:00
Benoit Marty
7d00aabc85 Share the same Copyright header. Disabled for XML files 2020-02-05 17:48:59 +01:00
Benoit Marty
a17ec14dd7 Cleanup and little change on Throwable logging 2020-02-05 11:39:23 +01:00
Ganard
f454078c6b Clean code 2020-02-03 16:14:36 +01:00
Benoit Marty
3c2fa40b58 Sharing things to RiotX: sort list by recent room first (#771) 2020-01-22 11:49:04 +01:00
Benoit Marty
f5e6b4b857 F-Droid: fix the "-dev" issue in version name (#815) 2020-01-20 16:08:57 +01:00