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

84 commits

Author SHA1 Message Date
SpiritCroc
b625b2890f Merge tag 'v1.6.24' into sc 
tag

Change-Id: Ie90b0878e14be3ef0cc29fe45fedcc130f1eb0a7
 2024-11-20 18:09:48 +01:00
Benoit Marty
5c333aeafc Update licence header. 
Using `uv run license-editor --repository ../element-android`
 2024-09-24 12:02:33 +02:00
SpiritCroc
3291517b8b Merge tag 'v1.6.20' into sc 
Change-Id: Ibf61668b312b1f4b1867ccc6ba4d3174e37550a5

Conflicts:
	library/attachment-viewer/build.gradle
	library/ui-styles/build.gradle
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt
	vector/src/main/java/im/vector/app/core/glide/ImageContentRendererDataLoader.kt
	vector/src/main/java/im/vector/app/core/pushers/UnifiedPushHelper.kt
	vector/src/main/java/im/vector/app/core/ui/views/JoinConferenceView.kt
	vector/src/main/java/im/vector/app/features/crypto/verification/IncomingVerificationRequestHandler.kt
	vector/src/main/java/im/vector/app/features/crypto/verification/user/VerificationEpoxyExt.kt
	vector/src/main/java/im/vector/app/features/home/HomeDetailFragment.kt
	vector/src/main/java/im/vector/app/features/home/HomeDetailViewState.kt
	vector/src/main/java/im/vector/app/features/home/RoomListDisplayMode.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/composer/PlainTextComposerLayout.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/composer/voice/VoiceMessageViews.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/edithistory/ViewEditHistoryEpoxyController.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/EncryptedItemFactory.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/format/DisplayableEventFormatter.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/TimelineMediaSizeProvider.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/BasedMergedItem.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageAudioItem.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/MessageVoiceItem.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/reactions/ViewReactionsEpoxyController.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/RoomListFooterController.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/RoomListSectionBuilder.kt
	vector/src/main/java/im/vector/app/features/home/room/list/SectionHeaderAdapter.kt
	vector/src/main/java/im/vector/app/features/home/room/list/actions/RoomListQuickActionsEpoxyController.kt
	vector/src/main/java/im/vector/app/features/home/room/threads/list/model/ThreadListItem.kt
	vector/src/main/java/im/vector/app/features/link/LinkHandlerActivity.kt
	vector/src/main/java/im/vector/app/features/login/LoginFragment.kt
	vector/src/main/java/im/vector/app/features/login/LoginServerSelectionFragment.kt
	vector/src/main/java/im/vector/app/features/login/LoginSplashFragment.kt
	vector/src/main/java/im/vector/app/features/media/ImageContentRenderer.kt
	vector/src/main/java/im/vector/app/features/notifications/NotificationUtils.kt
	vector/src/main/java/im/vector/app/features/poll/create/CreatePollController.kt
	vector/src/main/java/im/vector/app/features/rageshake/BugReportActivity.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/roomprofile/members/RoomMemberListViewState.kt
	vector/src/main/java/im/vector/app/features/roomprofile/notifications/RoomNotificationSettingsController.kt
	vector/src/main/java/im/vector/app/features/settings/VectorPreferences.kt
	vector/src/main/java/im/vector/app/features/settings/VectorSettingsAdvancedSettingsFragment.kt
	vector/src/main/java/im/vector/app/features/settings/VectorSettingsPreferencesFragment.kt
	vector/src/main/java/im/vector/app/features/settings/labs/VectorSettingsLabsFragment.kt
	vector/src/main/java/im/vector/app/features/spaces/NewSpaceSummaryController.kt
	vector/src/main/java/im/vector/app/features/spaces/SpaceSummaryController.kt
 2024-07-30 20:56:50 +02:00
Benoit Marty
19500a8cd9 Upgrade a few dependencies and update the codebase 
Use fully qualified R classes
Fix or ignore deprecation
Update github actions and ensure JDK 17 is used
Add group for paparazzi
Fixes Lint issues
Fix Jacoco configuration
 2024-07-15 18:12:20 +02:00
SpiritCroc
4573a4235e Merge tag 'v1.6.10' into sc 
Change-Id: If32b84a60de38eab046bbedeb2b1e8d9c6094bb3

Conflicts:
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/timeline/TimelineEvent.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/util/ContentUtils.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/send/LocalEchoEventFactory.kt
	vector/src/main/java/im/vector/app/core/pushers/UnifiedPushHelper.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/composer/PlainTextComposerLayout.kt
 2024-01-10 19:57:20 +01:00
Benoit Marty
778dab7bb7 Cleanup and safer Json model. 2023-12-04 09:20:25 +01:00
Benoit Marty
8e0c503b45 Support Functional members #3736 2023-12-04 09:16:26 +01:00
SpiritCroc
d9c1ec588d Merge tag 'v1.6.0' into sc 
v1.6.0

Change-Id: Iaca4b437bc5a267c40b83a87a98eb7761dae345b

Conflicts:
	library/ui-styles/src/main/res/values/styles_app_bar_layout.xml
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt
	vector-app/build.gradle
	vector/src/main/java/im/vector/app/core/di/ConfigurationModule.kt
	vector/src/main/java/im/vector/app/features/crypto/verification/emoji/VerificationEmojiCodeController.kt
	vector/src/main/java/im/vector/app/features/disclaimer/DisclaimerDialog.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/MessageInformationDataFactory.kt
	vector/src/main/java/im/vector/app/features/settings/VectorPreferences.kt
	vector/src/main/java/im/vector/app/features/settings/VectorSettingsHelpAboutFragment.kt
	vector/src/main/java/im/vector/app/features/settings/VectorSettingsPinFragment.kt
	vector/src/main/java/im/vector/app/features/settings/VectorSettingsUrls.kt
	vector/src/main/res/layout/dialog_disclaimer_content.xml
	vector/src/main/res/xml/vector_settings_help_about.xml
 2023-05-22 14:19:46 +02:00
valere
eba31a7216 Add sentry config for rust crypto 
update posthog url
 2023-05-15 11:29:49 +02:00
SpiritCroc
0cc0a191bc Merge remote-tracking branch 'CicadaCinema/fallback-turn-server' into sc 
Change-Id: I07acecb8587ee3bdf6b2eef1e130ffd578739416

Conflicts:
	vector/src/main/java/im/vector/app/features/call/webrtc/WebRtcCall.kt
	vector/src/main/java/im/vector/app/features/call/webrtc/WebRtcCallManager.kt
	vector/src/main/java/im/vector/app/features/settings/VectorPreferences.kt
	vector/src/main/res/xml/vector_settings_voice_video.xml
 2023-04-24 12:02:18 +02:00
valere
3146f5209b Merge branch 'develop' into feature/bca/rust_flavor 2022-12-16 09:33:37 +01:00
SpiritCroc
330f0cf5cc Merge tag 'v1.5.12' into sc 
Change-Id: I4c53d64845ee05ff395e5df436a0739c87798737

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/room/summary/RoomSummaryUpdater.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/accountdata/AccountDataAPI.kt
	vector-app/build.gradle
	vector-app/src/gplay/java/im/vector/app/nightly/FirebaseNightlyProxy.kt
	vector-config/src/main/res/values/config-settings.xml
	vector/src/main/java/im/vector/app/features/home/room/detail/TimelineFragment.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/composer/MessageComposerFragment.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/format/DisplayableEventFormatter.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/format/NoticeEventFormatter.kt
	vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryItemFactory.kt
	vector/src/main/java/im/vector/app/features/notifications/NotificationUtils.kt
 2022-12-15 11:01:52 +01:00
Nikita Fedrunov
3dadebe505
threads are enabled by default end forced to enabled for existing users (#7775) 2022-12-13 14:02:45 +01:00
SpiritCroc
87100a8536 Merge remote-tracking branch 'upstream/develop' into sc 
Change-Id: Ifed09540802774e7b1d3f2ab787a7f42f1030b28

Conflicts:
	vector/src/main/java/im/vector/app/features/home/HomeActivityViewModel.kt
	vector/src/main/java/im/vector/app/features/settings/notifications/VectorSettingsNotificationPreferenceFragment.kt
 2022-12-07 14:56:07 +01:00
valere
ea37029631 Merge branch 'develop' into feature/bca/rust_flavor 2022-12-04 11:13:46 +01:00
SpiritCroc
65be0039a5 Merge tag 'v1.5.10' into merge-v1.5.10 
TODO: re-implement our composer constraint changes

Conflicts:
	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/database/query/ReadQueries.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/room/read/SetReadMarkersTask.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryUpdater.kt
	vector/src/main/AndroidManifest.xml
	vector/src/main/java/im/vector/app/core/session/ConfigureAndStartSessionUseCase.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/TimelineViewModel.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/composer/MessageComposerAction.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/composer/MessageComposerFragment.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/composer/PlainTextComposerLayout.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/composer/RichTextComposerLayout.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/composer/voice/VoiceMessageViews.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/CheckIfCanReplyEventUseCase.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/MessageItemFactory.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/ReadReceiptsItemFactory.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/format/NoticeEventFormatter.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/MessageInformationDataFactory.kt
	vector/src/main/java/im/vector/app/features/html/EventHtmlRenderer.kt
	vector/src/main/java/im/vector/app/features/rageshake/BugReporter.kt
	vector/src/main/res/drawable/ic_voice_mic_recording.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/composer_rich_text_layout_constraint_set_compact.xml
	vector/src/main/res/layout/composer_rich_text_layout_constraint_set_expanded.xml
	vector/src/main/res/layout/composer_rich_text_layout_constraint_set_fullscreen.xml
	vector/src/main/res/layout/fragment_timeline.xml
	vector/src/main/res/layout/view_voice_message_recorder.xml
	vector/src/main/res/xml/vector_settings_preferences.xml
	vector/src/test/java/im/vector/app/core/session/ConfigureAndStartSessionUseCaseTest.kt

Change-Id: I55e95d86b4bb019544d75dcb653afe05194cd224
 2022-12-02 22:03:17 +01:00
valere
e6444fe9c0 enable analytics by default on nightly 2022-12-02 12:39:13 +01:00
Onuray Sahin
821a561235 Add timeout preference for alert. 2022-11-25 14:33:41 +03:00
Onuray Sahin
abea9b686a Code review fixes. 2022-11-22 18:02:48 +03:00
Onuray Sahin
6c45490dd1 Code review fixes. 2022-11-21 18:44:45 +03:00
SpiritCroc
759da1fd09 Merge tag 'v1.5.4' into merge-v1.5.4 
Change-Id: I3028022ed007c35d0ddbd6a859bc71958b8d2146

Conflicts:
	library/ui-styles/src/main/res/values/colors.xml
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/accountdata/UserAccountDataTypes.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/send/LocalEchoEventFactory.kt
	vector-config/src/main/res/values/config-settings.xml
	vector/src/main/java/im/vector/app/SpaceStateHandler.kt
	vector/src/main/java/im/vector/app/SpaceStateHandlerImpl.kt
	vector/src/main/java/im/vector/app/core/di/ActiveSessionHolder.kt
	vector/src/main/java/im/vector/app/features/home/HomeActivity.kt
	vector/src/main/java/im/vector/app/features/home/HomeActivityViewModel.kt
	vector/src/main/java/im/vector/app/features/home/HomeDrawerFragment.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/composer/MessageComposerView.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/composer/MessageComposerViewModel.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/composer/voice/VoiceMessageViews.kt
	vector/src/main/java/im/vector/app/features/settings/labs/VectorSettingsLabsFragment.kt
	vector/src/main/java/im/vector/app/features/settings/notifications/VectorSettingsNotificationPreferenceFragment.kt
	vector/src/main/java/im/vector/app/features/voice/VoiceRecorderL.kt
	vector/src/main/res/drawable/ic_voice_mic.xml
	vector/src/main/res/layout/fragment_timeline.xml
	vector/src/main/res/layout/view_voice_message_recorder.xml
	vector/src/main/res/xml/vector_settings_labs.xml
 2022-10-28 18:02:53 +02:00
Florian Renaud
90803be3ee Voice Broadcast - Move Android API check on fragment 2022-10-18 21:07:45 +02:00
Florian Renaud
036511400e Voice Broadcast - Hide labs setting in Android < 10 2022-10-18 21:07:44 +02:00
Florian Renaud
03ac0f1f03 Move Voice Broadcast feature flag to labs settings 2022-10-18 21:07:44 +02:00
dependabot[bot]
93a346392b
Bump gradle from 7.2.2 to 7.3.1 (#7364) 
* Bump gradle from 7.2.2 to 7.3.1

Bumps gradle from 7.2.2 to 7.3.1.

---
updated-dependencies:
- dependency-name: com.android.tools.build:gradle
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

* Try to fix build issue caused by KSP workaround

* Add missing dependency

* Suppress false positive in linter

* Suppress more false positives, fix 2 possible leaks

* Fix tests

* Ignore flaky test

* Use namespaces instead of packagenames in AndroidManifest files

* Reorder dependency groups

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Jorge Martín <jorgem@element.io>
 2022-10-17 09:14:28 +02:00
Maxime NATUREL
86132219d8 Adding settings for visibility of labs flags 2022-10-14 13:45:23 +02:00
Maxime NATUREL
4fced5bd3e Adding nex entry in labs settings 2022-10-13 09:43:25 +02:00
Maxime NATUREL
3503c24acc Adding new lab flag for session manager 2022-10-11 17:48:17 +02:00
Jorge Martin Espinosa
def67b2e7d
Integrate WYSIWYG editor (#7288) 
* Add WYSIWYG lib dependency

* Replace EditText with RichTextEditor

* Add bold button, fix sending formatting messages issues

* Add missing inline formatting buttons, make scrollview horizontal

* Disable autocomplete for rich text editor

* Add formatted text to messages sent, replies, quotes and edited messages.

* Several fixes

* Add changelog

* Try to fix lint issues

* Address review comments.

* Exclude Epoxy KSP generated files from ktlint checks
 2022-10-11 17:05:47 +02:00
SpiritCroc
282abea98b [merge] Keep new layout disabled until I like it 
Change-Id: Ib1a7318db1191ef2f9d8d81b5999a3c7957b1b62
 2022-10-07 20:33:13 +02:00
SpiritCroc
fe785613e7 Merge tag 'v1.5.2' into sc 
Change-Id: I0fe8262be9f2e5852815ad5f93329ffa17970b0e

Conflicts:
	vector/src/main/java/im/vector/app/SpaceStateHandlerImpl.kt
	vector/src/main/java/im/vector/app/features/disclaimer/DisclaimerDialog.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/NoticeItem.kt
	vector/src/main/java/im/vector/app/features/home/room/list/home/HomeRoomListViewModel.kt
	vector/src/main/java/im/vector/app/features/html/EventHtmlRenderer.kt
	vector/src/main/java/im/vector/app/features/media/ImageContentRenderer.kt
	vector/src/main/java/im/vector/app/features/settings/VectorLocale.kt
	vector/src/main/java/im/vector/app/features/settings/VectorPreferences.kt
	vector/src/main/java/im/vector/app/features/spaces/NewSpaceSummaryController.kt
	vector/src/main/java/im/vector/app/features/spaces/SpaceSummaryController.kt
	vector/src/main/java/im/vector/app/features/themes/ThemeUtils.kt
	vector/src/main/java/im/vector/app/features/voice/VoiceRecorderL.kt
	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
 2022-10-07 20:32:26 +02:00
Amit Kumar
aad2eed396
Add initial Sentry setup for crashes and perf tracking (#7141) 
* Add initial Sentry setup for crashes and perf tracking

* Fix failing analytics tests

* Reformat code to fix style issue

* Close sentry when user signs out

* Add initial unit tests for Sentry

* Remove unused import

* Exclude amitkma from signoff requirements for PRs
 2022-10-05 16:49:14 +05:30
Nikita Fedrunov
e9d1a9e04e
app layout labs flag is enabled by default (#7237) 2022-09-27 09:54:24 +02:00
SpiritCroc
bb6595110b Merge tag 'v1.5.0' into merge-v1.5.0 
Change-Id: Ifaa56941340ac1774d8b7bd470e32c5203d15f69

Conflicts:
	library/ui-styles/src/main/res/values/colors.xml
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt
	vector-app/src/fdroid/java/im/vector/app/fdroid/package-info.kt
	vector-app/src/gplay/java/im/vector/app/nightly/FirebaseNightlyProxy.kt
	vector/build.gradle
	vector/src/fdroid/java/im/vector/app/fdroid/package-info.kt
	vector/src/main/java/im/vector/app/features/autocomplete/member/AutocompleteEmojiDataItem.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/RoomListViewState.kt
	vector/src/main/java/im/vector/app/features/home/room/list/home/HomeRoomListViewModel.kt
	vector/src/main/java/im/vector/app/features/home/room/list/home/recent/RecentRoomCarouselController.kt
	vector/src/main/java/im/vector/app/features/settings/VectorPreferences.kt
	vector/src/main/res/menu/menu_new_home.xml
	vector/src/main/res/xml/vector_settings_labs.xml
 2022-09-23 16:28:00 +02:00
ganfra
f8ed3520f5 Applayout: disable applayout by default 2022-09-23 11:45:34 +02:00
Florian Renaud
dd92bb756a Add visibility setting field for lab setting 2022-09-21 09:36:07 +02:00
Florian Renaud
e9d809d9c3 Move and enable deferred DMs into labs settings 2022-09-21 09:36:07 +02:00
ericdecanini
b8b2601e0b Enables app layout by default in labs 2022-09-17 13:12:45 -04:00
SpiritCroc
bc1f3cb24d Merge tag 'v1.4.36' into merge-v1.4.36 
Change-Id: I6fa1182a07b7b8ad507124fad3a8971ac38f2ac5

Conflicts:
	library/ui-strings/src/main/res/values-bg/strings_sc.xml
	library/ui-strings/src/main/res/values-cs/strings_sc.xml
	library/ui-strings/src/main/res/values-de/strings_sc.xml
	library/ui-strings/src/main/res/values-de/strings_sc_donottranslate.xml
	library/ui-strings/src/main/res/values-es/strings_sc.xml
	library/ui-strings/src/main/res/values-et/strings_sc.xml
	library/ui-strings/src/main/res/values-eu/strings_sc.xml
	library/ui-strings/src/main/res/values-fa/strings_sc.xml
	library/ui-strings/src/main/res/values-fr/strings_sc.xml
	library/ui-strings/src/main/res/values-hu/strings_sc.xml
	library/ui-strings/src/main/res/values-it/strings_sc.xml
	library/ui-strings/src/main/res/values-nb-rNO/strings_sc.xml
	library/ui-strings/src/main/res/values-nl/strings_sc.xml
	library/ui-strings/src/main/res/values-pl/strings_sc.xml
	library/ui-strings/src/main/res/values-pt-rBR/strings_sc.xml
	library/ui-strings/src/main/res/values-ro/strings_sc.xml
	library/ui-strings/src/main/res/values-ru/strings_sc.xml
	library/ui-strings/src/main/res/values-sk/strings_sc.xml
	library/ui-strings/src/main/res/values-sv/strings_sc.xml
	library/ui-strings/src/main/res/values-tr/strings_sc.xml
	library/ui-strings/src/main/res/values-vi/strings_sc.xml
	library/ui-strings/src/main/res/values-zh-rCN/strings_sc.xml
	library/ui-strings/src/main/res/values-zh-rTW/strings_sc.xml
	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/sync/SyncResponseHandler.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/handler/room/RoomSyncHandler.kt
	vector-app/src/main/res/mipmap-anydpi-v26/ic_launcher_sc.xml
	vector-app/src/main/res/mipmap-hdpi/ic_launcher_foreground_sc.png
	vector-app/src/main/res/mipmap-hdpi/ic_launcher_sc.png
	vector-app/src/main/res/mipmap-mdpi/ic_launcher_foreground_sc.png
	vector-app/src/main/res/mipmap-mdpi/ic_launcher_sc.png
	vector-app/src/main/res/mipmap-xhdpi/ic_launcher_foreground_sc.png
	vector-app/src/main/res/mipmap-xhdpi/ic_launcher_sc.png
	vector-app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground_sc.png
	vector-app/src/main/res/mipmap-xxhdpi/ic_launcher_sc.png
	vector-app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground_sc.png
	vector-app/src/main/res/mipmap-xxxhdpi/ic_launcher_sc.png
	vector/build.gradle
	vector/src/fdroid/java/im/vector/app/fdroid/receiver/KeepInternalDistributor.kt
	vector/src/main/AndroidManifest.xml
	vector/src/main/java/im/vector/app/SpaceStateHandlerImpl.kt
	vector/src/main/java/im/vector/app/core/di/FragmentModule.kt
	vector/src/main/java/im/vector/app/core/pushers/KeepInternalDistributor.kt
	vector/src/main/java/im/vector/app/core/pushers/VectorPushHandler.kt
	vector/src/main/java/im/vector/app/core/receiver/KeepInternalDistributor.kt
	vector/src/main/java/im/vector/app/features/attachments/AttachmentsHelper.kt
	vector/src/main/java/im/vector/app/features/grouplist/HomeSpaceSummaryItem.kt
	vector/src/main/java/im/vector/app/features/grouplist/NewHomeSpaceSummaryItem.kt
	vector/src/main/java/im/vector/app/features/home/HomeDetailFragment.kt
	vector/src/main/java/im/vector/app/features/home/HomeDrawerFragment.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/TimelineFragment.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/TimelineViewModel.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/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/RoomSummaryItem.kt
	vector/src/main/java/im/vector/app/features/home/room/list/SectionHeaderAdapter.kt
	vector/src/main/java/im/vector/app/features/home/room/list/UnreadCounterBadgeView.kt
	vector/src/main/java/im/vector/app/features/home/room/list/home/recent/RecentRoomItem.kt
	vector/src/main/java/im/vector/app/features/media/ImageContentRenderer.kt
	vector/src/main/java/im/vector/app/features/permalink/PermalinkHandler.kt
	vector/src/main/java/im/vector/app/features/settings/VectorPreferences.kt
	vector/src/main/java/im/vector/app/features/settings/VectorSettingsAdvancedSettingsFragment.kt
	vector/src/main/java/im/vector/app/features/settings/VectorSettingsPreferencesFragment.kt
	vector/src/main/java/im/vector/app/features/settings/notifications/VectorSettingsNotificationPreferenceFragment.kt
	vector/src/main/java/im/vector/app/features/spaces/NewSpaceSummaryController.kt
	vector/src/main/java/im/vector/app/features/spaces/NewSpaceSummaryItem.kt
	vector/src/main/java/im/vector/app/features/spaces/SpaceSummaryController.kt
	vector/src/main/java/im/vector/app/features/spaces/SpaceSummaryItem.kt
	vector/src/main/java/im/vector/app/features/spaces/SubSpaceSummaryItem.kt
	vector/src/main/res/xml/vector_settings_labs.xml
	vector/src/main/res/xml/vector_settings_preferences.xml
 2022-09-10 15:24:40 +02:00
ericdecanini
24509543b9 Replaces feature flag with labs flag 2022-09-06 12:48:03 +02:00
SpiritCroc
e6023c6bae Merge tag 'v1.4.34' into sc 
Change-Id: I7e1939f6c87e14d1497433a9bad4f97e074bb838

Conflicts:
	vector/src/debug/java/im/vector/app/flipper/VectorFlipperProxy.kt
	vector/src/main/java/im/vector/app/core/di/ActiveSessionHolder.kt
	vector/src/main/java/im/vector/app/features/home/HomeActivity.kt
	vector/src/main/java/im/vector/app/features/home/room/list/home/HomeRoomListAction.kt
	vector/src/main/java/im/vector/app/features/home/room/list/home/HomeRoomListFragment.kt
	vector/src/main/java/im/vector/app/features/home/room/list/home/HomeRoomListViewModel.kt
	vector/src/main/java/im/vector/app/features/settings/VectorSettingsAdvancedSettingsFragment.kt
	vector/src/main/res/layout/fragment_login_server_url_form_2.xml
	vector/src/main/res/layout/fragment_room_list.xml
 2022-08-24 10:14:36 +02:00
Adam Brown
19261ab2d0 removing login2 classes 2022-08-15 11:51:13 +01:00
SpiritCroc
5d1722054e Merge tag 'v1.4.32' into sc 
Change-Id: Ib3724625b1aada2541e030f9fdaf47a032538c85

Conflicts:
	.gitignore
	library/ui-styles/src/main/res/values/styles_toolbar.xml
	vector/build.gradle
	vector/src/main/java/im/vector/app/SpaceStateHandlerImpl.kt
	vector/src/main/java/im/vector/app/VectorApplication.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/HomeDetailViewModel.kt
	vector/src/main/java/im/vector/app/features/home/UnreadMessagesSharedViewModel.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/TimelineViewModel.kt
	vector/src/main/java/im/vector/app/features/home/room/list/RoomListSectionBuilder.kt
	vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewModel.kt
	vector/src/main/java/im/vector/app/features/login/LoginSplashFragment.kt
	vector/src/main/java/im/vector/app/features/notifications/NotificationUtils.kt
	vector/src/main/java/im/vector/app/features/rageshake/BugReporter.kt
	vector/src/main/java/im/vector/app/features/settings/VectorLocale.kt
	vector/src/main/java/im/vector/app/features/settings/VectorPreferences.kt
	vector/src/main/res/layout/fragment_timeline.xml
 2022-08-10 17:07:09 +02:00
Adam Brown
3d207f93f1 removing unused imports and fixing missing full stop on docs 2022-08-02 14:31:46 +01:00
Adam Brown
df02f505ad moving git versioning to the buildMeta abstraction 2022-08-02 14:31:46 +01:00
Adam Brown
d42c27bfe0 lifting the low privacy build config to the config 2022-08-02 14:31:46 +01:00
Adam Brown
9fe3fc69dd extracting the config models to their own files 2022-08-02 14:31:46 +01:00
Adam Brown
b6d052e58d lifting voip setting to a voip config 2022-08-02 14:31:46 +01:00
Adam Brown
56afac26ad creating a location sharing config for holding the map tiler key 2022-08-02 14:31:46 +01:00
Adam Brown
012485b8e3 lifting the live location sharing build flag to the config along with debug toggle 2022-08-02 14:31:46 +01:00