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

4330 commits

Author SHA1 Message Date
SpiritCroc
20ba02db57 [TMP] Raise sync logging level 
So we get these in rageshakes

Change-Id: I1efb8dd759cd03607ade0611c92a87df1b20c7f3
 2022-03-03 08:55:34 +01:00
SpiritCroc
ecd28447c9 Merge tag 'v1.4.0' into sc 
Change-Id: If953d524434cd8a7073a16014f4ec6850b72a226

Conflicts:
	library/ui-styles/src/main/res/values/styles_timeline.xml
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/media/PreviewUrlData.kt
	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/RoomDetailViewState.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/TimelineEventController.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/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/BaseEventItem.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageBlockCodeItem.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/MessageTextItem.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/item/ReadReceiptsItem.kt
	vector/src/main/java/im/vector/app/features/home/room/list/RoomListDisplayModeFilter.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/navigation/DefaultNavigator.kt
	vector/src/main/java/im/vector/app/features/settings/VectorSettingsLabsFragment.kt
	vector/src/main/res/drawable/ic_filter.xml
	vector/src/main/res/layout/fragment_qr_code_scanner_with_button.xml
	vector/src/main/res/layout/fragment_timeline.xml
	vector/src/main/res/layout/item_bottom_sheet_message_preview.xml
	vector/src/main/res/layout/item_timeline_event_base.xml
	vector/src/main/res/layout/item_timeline_event_file_stub.xml
	vector/src/main/res/layout/item_timeline_event_notice_stub.xml
	vector/src/main/res/layout/item_timeline_event_voice_stub.xml
	vector/src/main/res/layout/view_voice_message_recorder.xml
	vector/src/main/res/menu/menu_timeline.xml
 2022-02-19 10:55:47 +01:00
Aris Kotsomitopoulos
077c0eea98
Revert "AGP 7.1.0" 2022-02-04 12:20:20 +02:00
ganfra
2e2da16a6b Bubbles: merge develop 2022-02-03 17:10:13 +01:00
Benoit Marty
dba9a47c63
Merge pull request #5127 from vector-im/feature/ons/generic_location_pin 
Support generic location pin
 2022-02-03 16:02:38 +01:00
Benoit Marty
aa12a73a05 Version++ 2022-02-03 15:51:04 +01:00
Benoit Marty
105118f831 Merge hotfix 1.3.18 to develop 2022-02-03 15:48:51 +01:00
Benoit Marty
5b3d999aaa Version 1.3.18 2022-02-03 15:43:13 +01:00
Benoit Marty
09cbd146e8 Improve missing state event detection to missing state events only one joined rooms (ignore LEFT room) 
Should reduce the number of initial sync
Co-authors: ganfra and billcarsonfr
 2022-02-03 14:53:17 +01:00
Benoit Marty
664bccf8a5 ktlint 2022-02-03 00:27:10 +01:00
Benoit Marty
c66849834a
Merge pull request #5051 from vector-im/feature/bma/cleanup 
Remove some usage of MatrixCallback
 2022-02-03 00:25:54 +01:00
ganfra
85af3767b7 Sync: avoid deleting root event of CurrentState on gappy sync 2022-02-02 18:07:39 +01:00
Onuray Sahin
c2daab4211 Code review fixes. 2022-02-02 19:33:34 +03:00
Adam Brown
e2d8c73761 fixing push notifications being skipped 
- reworking the isEventRead logic to always check if the new event exists locally, there's a race condition between eventFastLane and syncs where we end up mark unseen events as read if our last local message in a room is from ourselves
- this may also fix some  events being instantly marked as read when being received
 2022-02-02 12:32:42 +00:00
ganfra
1bf2523437 Merge branch 'develop' into feature/fga/message_bubbles 2022-02-02 13:01:43 +01:00
Onuray Sahin
a131d28b3e Merge branch 'develop' into feature/ons/generic_location_pin 
* develop: (146 commits)
  exhaustive not needed anymore
  Invert if condition and split long line
  Use kotlin string builder
  Same issue but in the test
  Format
  Fix a crash: java.util.IllegalFormatPrecisionException https://github.com/matrix-org/element-android-rageshakes/issues/33398
  add changelog file for threads feature
  add changelog file for threads feature
  Formatting
  Improve hidden events for threads
  Add TODO for the next Weblate sync
  ktlint format
  PR remarks
  Fix a lint false positive? Anyway this was not used. Restricted API ../../../matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/job/SyncWorker.kt:61: ListenableWorker.getTaskExecutor can only be called from within the same library group (referenced groupId=androidx.work from groupId=element-android)
  It seems that now lint rule `MissingQuantity` is an error and not a warning by default.
  Whitelist group 'org.webjars' on MavenCentral to fix lint execution
  Fix conflicts
  Formating & remove unused comments
  Fix error in unit test
  ktlint format
  ...

# Conflicts:
#	vector/src/main/java/im/vector/app/features/navigation/Navigator.kt
 2022-02-02 14:35:30 +03:00
Onuray Sahin
37d35c9a7f Support generic location pin. 2022-02-02 14:25:54 +03:00
Benoit Marty
7a44f16372 More cleanup 2022-02-02 11:38:09 +01:00
Benoit Marty
4893429d73 Remove usage of MatrixCallback 2022-02-02 11:38:09 +01:00
Benoit Marty
2bf36c74e3 Use kotlin string builder 2022-02-02 10:46:31 +01:00
Benoit Marty
581dbda2c1 Format 2022-02-02 10:34:08 +01:00
Benoit Marty
cd1171eb9d Fix a crash: java.util.IllegalFormatPrecisionException 
https://github.com/matrix-org/element-android-rageshakes/issues/33398
 2022-02-02 10:33:19 +01:00
Aris Kotsomitopoulos
3d5f8ed7e7
Merge pull request #4746 from vector-im/feature/aris/threads 
Threads P0 Release
 2022-02-01 15:58:32 +02:00
Benoit Marty
79b4c76a09
Merge pull request #5082 from vector-im/feature/bma/agp_7_1_0 
AGP 7.1.0
 2022-02-01 13:57:15 +01:00
ariskotsomitopoulos
fcc095a239 PR remarks 2022-02-01 12:13:10 +02:00
ganfra
825c2ca989 Merge branch 'develop' into feature/fga/message_bubbles 2022-02-01 10:05:51 +01:00
Benoit Marty
c8ddb2e85e Fix a lint false positive? Anyway this was not used. 
Restricted API
../../../matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/job/SyncWorker.kt:61: ListenableWorker.getTaskExecutor can only be called from within the same library group (referenced groupId=androidx.work from groupId=element-android)
 2022-02-01 00:30:30 +01:00
ariskotsomitopoulos
d509b3324c Merge branch 'develop' into feature/aris/threads 2022-01-31 15:58:12 +02:00
Benoit Marty
7dad08654b Revert "Downgrade the version to 1.3.17 to prepare a corrective release." 
This reverts commit 2efa67e587.
 2022-01-31 14:53:43 +01:00
Benoit Marty
2efa67e587 Downgrade the version to 1.3.17 to prepare a corrective release. 2022-01-31 14:48:54 +01:00
Benoit Marty
91e444ca73
Merge pull request #5084 from vector-im/feature/bma/location_crash 
Fix location crash
 2022-01-31 14:42:53 +01:00
Adam Brown
9119cf059f adding extra logging around the push rules to help determine if we're incorrectly filter out valid notifications 2022-01-31 12:06:21 +00:00
ariskotsomitopoulos
26eaa843b3 ktlint format 2022-01-31 13:56:17 +02:00
Benoit Marty
8ee23c1e6a Merge branch 'develop' into feature/bma/location_crash 2022-01-31 12:49:17 +01:00
ariskotsomitopoulos
3253a252fb Introduce ThreadsService by splitting TimelineService 2022-01-31 12:58:19 +02:00
SpiritCroc
45a5b8ca94 [merge] Further merge fixups 
Change-Id: I8edf4ac5b67865843a8e3fb28146ba62195bb812
 2022-01-29 15:56:13 +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
SpiritCroc
beb2b1e8a0 [merge] Use Java 11 again 
Change-Id: I3cc03216236097f4ba7b9de320fc927a603885a3
 2022-01-29 10:35:54 +01:00
Benoit Marty
83ed80e6d8 Rename fun for clarity 2022-01-29 07:40:41 +01:00
ariskotsomitopoulos
b1067e9a58 - ktlint format 
- Update a text resource
 2022-01-28 16:37:59 +02:00
ariskotsomitopoulos
1d6d8102b3 Further improve thread summary after forward scrolling 2022-01-28 14:11:03 +02:00
dependabot[bot]
c07b09c727
Bump libphonenumber from 8.12.41 to 8.12.42 
Bumps [libphonenumber](https://github.com/google/libphonenumber) from 8.12.41 to 8.12.42.
- [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.41...v8.12.42)

---
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>
 2022-01-27 23:11:05 +00:00
ganfra
c14eb050b1 Merge branch 'develop' into feature/fga/message_bubbles 2022-01-27 18:59:10 +01:00
ariskotsomitopoulos
78dfac52a7 ktlint format 2022-01-27 18:39:43 +02:00
ariskotsomitopoulos
b2a2fe2710 Merge branch 'develop' into feature/aris/threads 
# Conflicts:
#	matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/relation/RelationService.kt
#	tools/check/forbidden_strings_in_code.txt
#	vector/build.gradle
#	vector/src/main/java/im/vector/app/core/di/FragmentModule.kt
#	vector/src/main/java/im/vector/app/core/resources/UserPreferencesProvider.kt
#	vector/src/main/java/im/vector/app/features/command/Command.kt
#	vector/src/main/java/im/vector/app/features/command/CommandParser.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/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/MessageComposerViewModel.kt
#	vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchResultItem.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/MessageItemFactory.kt
#	vector/src/main/java/im/vector/app/features/navigation/Navigator.kt
#	vector/src/main/java/im/vector/app/features/notifications/NotificationUtils.kt
#	vector/src/main/java/im/vector/app/features/settings/VectorPreferences.kt
#	vector/src/main/res/layout/fragment_timeline.xml
#	vector/src/main/res/xml/vector_settings_labs.xml
 2022-01-27 17:11:26 +02:00
Benoit Marty
4aff1ab017 AGP 7.1.0 2022-01-27 16:08:47 +01:00
ariskotsomitopoulos
554ece724e - Remove counter from thread notifications 
- Fix red dot on user mentioning
 2022-01-27 14:55:34 +02:00
ariskotsomitopoulos
f53b711e0d When thread disabled add thread replies within threads ( to the users with threads enabled ) 2022-01-27 13:49:03 +02:00
ariskotsomitopoulos
358a7d0ec4 Handle latest thread message & root thread edition to update thread summary and thread list appropriately 2022-01-27 13:22:04 +02:00
Onuray Sahin
2ad7a020cf Current user is not a king to end polls, check event sender id instead. 2022-01-27 00:00:29 +03:00