mirrors/SchildiChat-android
1
0
Fork 0
mirror of https://github.com/SchildiChat/SchildiChat-android.git synced 2024-12-22 00:54:33 +03:00
Code Issues Projects Releases Packages Wiki Activity
16088 commits 7 branches 123 tags 230 MiB
Commit graph

4358 commits

Author SHA1 Message Date
SpiritCroc
7c35f5fda5 Merge tag 'v1.4.11' into sc 
Change-Id: I454f1ec4f1df6366065d5690d9704eb1bd573c2d

Conflicts:
	dependencies_groups.gradle
	library/ui-styles/build.gradle
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryUpdater.kt
	vector/src/main/AndroidManifest.xml
	vector/src/main/assets/open_source_licenses.html
	vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewEvents.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/factory/MessageItemFactory.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageVoiceItem.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/settings/notifications/VectorSettingsNotificationPreferenceFragment.kt
	vector/src/main/res/menu/menu_timeline.xml
 2022-04-12 11:57:16 +02:00
SpiritCroc
1e62bbfdb3 TokenChunkEventPersistor: log sync tokens 
Change-Id: I916808b1839171b8bd96dc5560d97c43c801165b
 2022-04-12 11:02:36 +02:00
SpiritCroc
e4c0883312 Rageshake: add field about what debug settings to expect 
Change-Id: Idd9a1954e80c24ed58bf8e1f2b93ecb7cd211407
 2022-04-07 15:15:29 +02:00
Benoit Marty
0f14652932
Merge pull request #5692 from vector-im/feature/aris/threads_beta_infrom_users_on_reply 
Threads Beta opt-in mechanism
 2022-04-05 20:40:16 +02:00
ariskotsomitopoulos
37dc77cc3e Add isValid check to RealmChangeListener to prevent crashes on deleted objects 2022-04-05 20:36:33 +03:00
Onuray Sahin
48d40d8ba2
Merge pull request #5651 from vector-im/feature/ons/live_location_beacon_info 
Live Location Sharing - Beacon Info
 2022-04-04 12:55:22 +03:00
Onuray Sahin
273b4816db Fix lint error. 2022-04-04 12:03:43 +03:00
SpiritCroc
1287770b16 Add some optional ViewPager debugging 
Change-Id: I30332b57779e1093d06d2d7a07bca0ca5342de15
 2022-04-03 13:29:16 +02:00
Adam Brown
57bf044df0 adding documentation to the new session listener 2022-04-01 16:57:23 +01:00
Onuray Sahin
97de6de8f2 Code review fixes. 2022-04-01 17:04:52 +03:00
Onuray Sahin
922d68cfda Code review fixes, use unstable prefixes as MSCs suggest. 2022-04-01 15:01:25 +03:00
Adam Brown
eb72587238 removing unused import 2022-03-31 17:23:05 +01:00
Adam Brown
ced621d469 refreshing the room summaries when new crypto sessions are recieved 
- matches the same flow as the timeline by starting observing in the ViewModel init
 2022-03-31 17:23:05 +01:00
Adam Brown
4629353314 removing noop newSession from base decryption interface, it's only relevant for Megolm sessions 2022-03-31 17:13:31 +01:00
Aris Kotsomitopoulos
3c06d56b87
Merge pull request #5627 from vector-im/feature/aris/threads_summary_event_redaction 
Thread redaction will now update the thread summary counter
 2022-03-31 16:21:35 +03:00
Benoit Marty
9a2cc1a4c5
Merge pull request #5664 from vector-im/feature/bma/dep_upgrade 
Upgrade Jitsi and ktlint
 2022-03-31 11:32:14 +02:00
SpiritCroc
f50b21d9b7 Do not clear unread counts when fetching room members 
This messes with our "open without reading" functionality.

Change-Id: Ie1bf84aa79b3bc0c18efd7325f817aa227b8e748
 2022-03-31 08:37:40 +02:00
SpiritCroc
972fd9f31a Also give up loading event for M_FORBIDDEN 
Change-Id: Ic21821df4a341257dca99149141855a34edc5101
 2022-03-30 17:41:08 +02:00
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
ariskotsomitopoulos
f58f3ad6d9 Refactoring 2022-03-29 14:28:57 +03:00
SpiritCroc
39c5cb2280 Load timeline without initial eventId if not found 
Change-Id: Ifab011c7730ddd9eeeef89451dda48b3fcec341b
 2022-03-29 13:08:49 +02:00
Adam Brown
1b2e3502cb
Merge pull request #5628 from vector-im/feature/adm/direct-login-tests 
Direct login tests
 2022-03-29 11:44:11 +01:00
ariskotsomitopoulos
2938fa92c0 Rename countThreads method 2022-03-29 11:58:11 +03:00
Onuray Sahin
2a4182ea84 Code review fixes. 2022-03-29 11:53:44 +03:00
Benoit Marty
ff1fb63bf6 Fix some ktlint issues, ignore some others 2022-03-28 18:22:04 +02:00
Onuray Sahin
152c921017 Send beacon info. 2022-03-28 16:23:51 +03:00
Onuray Sahin
32cf3feab8 Create beacon content class. 2022-03-28 14:45:40 +03:00
ClaireG
a9b87de7a3
[Subscribing] Blank display name 2022-03-28 10:34:22 +02:00
Adam Brown
230c37597c adding happy path tests for the direct login use case 2022-03-25 11:15:05 +00:00
Eric Decanini
10974366fb
Merge pull request #5473 from vector-im/bugfix/eric/voting-ended-poll 
Fixes ended poll voting
 2022-03-24 20:23:38 +01:00
ganfra
3410e75790 Merge tag '1.4.7' into develop 2022-03-24 19:34:14 +01:00
ganfra
04b136e3e4 RoomList: more fixes on count 2022-03-24 18:50:33 +01:00
ganfra
745382cdfa RoomList : avoid using flow extension on realm results (leads to frozen object and leaks). 2022-03-24 15:41:42 +01:00
ariskotsomitopoulos
3c7495bd60 Thread redaction will now update the thread summary counter 
Root threads with 0 threads replies will become normal messages and removed from thread summaries
 2022-03-24 16:28:49 +02:00
ericdecanini
edfe81cc2b Merge remote-tracking branch 'origin/develop' into bugfix/eric/voting-ended-poll 
# Conflicts:
#	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/MessageItemFactory.kt
 2022-03-24 14:40:28 +01:00
Adam Brown
e7a1c20132 handling the username in use as a username field error 2022-03-23 17:29:06 +00:00
Adam Brown
5aa35899bc extracting error cases to extensions and handles invalid username as a specific case 2022-03-23 17:29:06 +00:00
Adam Brown
373385b29f moving the not accepting registration error handling to the login fragment 2022-03-23 17:29:06 +00:00
Benoit Marty
012cdf4b4d runBlocking -> runTest 
https://github.com/Kotlin/kotlinx.coroutines/blob/master/kotlinx-coroutines-test/MIGRATION.md
 2022-03-22 16:52:18 +01:00
Benoit Marty
86829008c3 runBlockingTest -> runTest 
https://github.com/Kotlin/kotlinx.coroutines/blob/master/kotlinx-coroutines-test/MIGRATION.md
 2022-03-22 16:39:39 +01:00
Benoit Marty
03fee2a131 The .exhaustive trick is not needed anymore in Kotlin 1.6.0 
https://kotlinlang.org/docs/whatsnew16.html#stable-exhaustive-when-statements-for-enum-sealed-and-boolean-subjects
 2022-03-22 16:14:15 +01:00
Benoit Marty
7502158ba9 Fix compilation warning (exhaustive when) 2022-03-22 16:13:06 +01:00
ganfra
073475854e
Merge pull request #5564 from SpiritCroc/timeline-chunk-double-linking 
Fix another case of read markers not updating: Ensure proper double linking of TimelineChunks
 2022-03-22 15:46:48 +01:00
ganfra
a2f64e7f3c
Merge pull request #5576 from vector-im/feature/aris/thread_labs_notice_users 
Threads Migration
 2022-03-22 14:57:07 +01:00
ericdecanini
7449d15d2f Merge remote-tracking branch 'origin/develop' into bugfix/eric/voting-ended-poll 
# Conflicts:
#	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/MessageItemFactory.kt
 2022-03-22 14:15:29 +01:00
ariskotsomitopoulos
c6593f0cee PR remarks 2022-03-22 13:57:20 +02:00
ariskotsomitopoulos
a431d885f0 Increase the thread summaries limit 2022-03-22 11:20:47 +02:00
SpiritCroc
7723b45993 Open-at-unread: add option to not mark as read until fully read 
Change-Id: Ie700cee773bce08248212ddd3fcc7793b4a919cc
 2022-03-22 09:47:53 +01:00
SpiritCroc
6d5bdb4c88 Fix scroll-to-bottom jumping back to initial event 
Change-Id: I4d5ad6e2b2c2e47d79f5da2fd596de69a04c687a
 2022-03-21 21:23:07 +01:00
ganfra
794131d274
Merge pull request #5551 from SpiritCroc/local-echo 
Fix local echos not being shown when re-opening rooms
 2022-03-21 19:24:07 +01:00