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

25705 commits

This branch
This branch
All branches
Author SHA1 Message Date
SpiritCroc
a7ae4b5743 Silence lint for release 
Change-Id: I7310fb496c9c9764cb0f6f62b5f1ef80f78f323d
 2024-08-02 20:27:17 +02:00
SpiritCroc
bffb997511 [merge] Increase gradle jvm heap space for compile again 
Change-Id: I1c1f64a87612cff0fc5896a9f458399a6fbd134b
 2024-08-02 20:10:21 +02:00
SpiritCroc
4d226436b3 Automatic SchildiChat string correction 
Change-Id: I62380028c106d11e5efd4e5c7b522d4167409bed
 2024-08-02 17:59:23 +02:00
SpiritCroc
b79db7b840 Automatic upstream merge postprocessing 
Change-Id: I07058b251c3bc2bcf4a148bf1e1edc9490a8009f
 2024-08-02 17:59:22 +02:00
SpiritCroc
a10220f690 [merge] Fix compile 
Change-Id: I5df927a88f4eb786561a86d8986155ebe71baafd
 2024-08-02 17:57:43 +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
SpiritCroc
9a381b557e [TMP] Automatic upstream merge preparation 
Change-Id: I57b0f66f0cd19283b23aac5604d44609e13daac6
 2024-07-30 20:31:12 +02:00
SpiritCroc
39cee3aec7 Automatic revert to unchanged upstream strings, pt.1 
Change-Id: Idd8a9b535659c2a74f6eddfbfdd37fc3e34e19db
 2024-07-30 20:31:11 +02:00
ganfra
fca16b6774 Merge branch 'release/1.6.20' into main 2024-07-25 11:37:02 +02:00
ganfra
d0d05d543e Adding fastlane file for version 1.6.20 2024-07-25 11:36:54 +02:00
ganfra
91897d6bb6 Changelog for version 1.6.20 2024-07-25 11:36:16 +02:00
ganfra
95e1bcbf64
Merge pull request #8868 from element-hq/feature/fga/authenticated_media 
Feature/fga/authenticated media
 2024-07-19 16:30:40 +02:00
ganfra
59f3c6e8da Fix copyrights. 2024-07-19 14:08:23 +02:00
ganfra
497f422b2b Authenticated media : fix pr remarks 2024-07-19 12:56:58 +02:00
Benoit Marty
669a80e8e4 Update Realm gradle plugin and Flipper dependencies. 2024-07-19 12:36:02 +02:00
Benoit Marty
fd1a9498ca
Merge pull request #8867 from element-hq/feature/bma/fixCrashOnApi34 
Use ContextCompat.registerReceiver with explicit RECEIVER_EXPORTED
 2024-07-19 10:42:09 +02:00
ganfra
d10e83bb48 Authenticated media : fix formatting. 2024-07-19 10:25:45 +02:00
ganfra
fa0860ac0f Authenticated media : listen db. 2024-07-18 17:52:53 +02:00
Benoit Marty
1e32ebde41 Use ContextCompat.registerReceiver with explicit RECEIVER_EXPORTED to fix crash on API 34. 
java.lang.SecurityException: im.vector.app.debug: One of RECEIVER_EXPORTED or RECEIVER_NOT_EXPORTED should be specified when a receiver isn't being registered exclusively for system broadcasts
 2024-07-18 17:15:06 +02:00
ganfra
9e27705b6e Merge branch 'develop' into feature/fga/authenticated_media 2024-07-18 15:56:48 +02:00
Benoit Marty
10e79849a5 Fix Weblate conflicts 2024-07-18 11:36:37 +02:00
Benoit Marty
224243aca5 Increase available memory for nightly builds and use G1GC 
Copy settings from EXA.
They are failing with OutOfMemoryError.
 2024-07-18 10:48:11 +02:00
Benoit Marty
96e05ba5c3
Merge pull request #8860 from element-hq/feature/bma/sdk34 
Bump compile and target SDK to 34
 2024-07-17 21:05:40 +02:00
Benoit Marty
cf464af6ef Revert to API 28 2024-07-16 15:15:12 +02:00
Benoit Marty
b3bd361a08 Add Realm migrations due to upgrade of Kotlin version. 
See https://github.com/realm/realm-java/issues/7810 for more details.
 2024-07-16 15:03:55 +02:00
Benoit Marty
5203dd86b4 Add packaging pickFirst to fix tests. 2024-07-16 13:14:41 +02:00
Benoit Marty
6671a3f925 try API 29 2024-07-16 10:01:22 +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
ganfra
da8c892f7a Authenticated media : makes usage of API when server supports it 2024-07-10 16:53:10 +02:00
SpiritCroc
8ab5a544b9 Increment version 
Change-Id: I2dfe6a609bafd26c34f782dc8e81c7e7fb96553e
 2024-07-06 09:53:19 +02:00
ganfra
7ad3ccfc60 Authenticated media : add versions check to HomeServerCapabilities 2024-07-05 17:58:25 +02:00
Benoit Marty
84b8d410d5 Bump compile and target SDK to 34 2024-07-05 16:17:09 +02:00
SpiritCroc
429f69b98f Automatic SchildiChat string correction 
Change-Id: I7164053d3a65f3dc3ac46067d7942e14ffa2ee28
 2024-06-29 10:50:10 +02:00
SpiritCroc
47a01fbd80 Automatic upstream merge postprocessing 
Change-Id: Ic8782cf421a932bd980a6a6ed3551d71fc17abec
 2024-06-29 10:50:09 +02:00
SpiritCroc
21eec091f8 Merge tag 'v1.6.18' into sc 
Change-Id: Ifc8466ddf92154fb9be05b372f234ffe26da47ba

Conflicts:
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/pills/TextPillsUtils.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/AutoCompleter.kt
	vector/src/main/java/im/vector/app/features/settings/VectorSettingsHelpAboutFragment.kt
 2024-06-29 10:28:16 +02:00
SpiritCroc
93ddba8786 [TMP] Automatic upstream merge preparation 
Change-Id: I905f36ccc1dda1fe266f24fe9384057c2c9c83d5
 2024-06-29 10:25:17 +02:00
SpiritCroc
4010ba024d Automatic revert to unchanged upstream strings, pt.1 
Change-Id: Ic35aec65a8272b0d549b4c9a27a39d1855a42c34
 2024-06-29 10:25:16 +02:00
Benoit Marty
b0158f1a93
Merge pull request #8854 from element-hq/feature/bma/bundleUpgrade 
Run `bundle update`
 2024-06-28 09:52:15 +02:00
Benoit Marty
f2c970f1b4 Run bundle update 2024-06-26 10:13:51 +02:00
Jorge Martin Espinosa
6942a502b3
Merge pull request #8853 from element-hq/dependabot/gradle/io.element.android-wysiwyg-2.37.4 
Bump io.element.android:wysiwyg from 2.37.3 to 2.37.4
 2024-06-26 07:47:06 +02:00
dependabot[bot]
80904ee847
Bump io.element.android:wysiwyg from 2.37.3 to 2.37.4 
Bumps [io.element.android:wysiwyg](https://github.com/matrix-org/matrix-wysiwyg) from 2.37.3 to 2.37.4.
- [Changelog](https://github.com/matrix-org/matrix-rich-text-editor/blob/main/CHANGELOG.md)
- [Commits](https://github.com/matrix-org/matrix-wysiwyg/compare/2.37.3...2.37.4)

---
updated-dependencies:
- dependency-name: io.element.android:wysiwyg
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2024-06-25 23:05:42 +00:00
Benoit Marty
dfb0fc31e1 Use BuildTools 35.0.0 - part 2 2024-06-25 15:56:10 +02:00
Benoit Marty
207ab2802a version++ 2024-06-25 15:14:20 +02:00
Benoit Marty
6e7b095254 Merge tag 'v1.6.18' into develop 
tag
 2024-06-25 15:13:43 +02:00
Benoit Marty
026318304f Merge branch 'release/1.6.18' into main 2024-06-25 15:13:30 +02:00
Benoit Marty
3f67bbf4e0 Adding fastlane file for version 1.6.18 2024-06-25 15:13:20 +02:00
Benoit Marty
4a261a88c5 Changelog for version 1.6.18 2024-06-25 15:12:55 +02:00
Benoit Marty
712b846f9f Use BuildTools 35.0.0 2024-06-25 15:06:21 +02:00
Benoit Marty
b5758c5335
Merge pull request #8850 from element-hq/fix/jme/8894-ea-intercepts-mas-urls 
Replace `*.element.io` deep link with actual hosts
 2024-06-25 14:17:18 +02:00
Jorge Martín
0292749cc0 Add changelog 2024-06-25 11:56:15 +02:00