mirrors/SchildiChat-android
1
0
Fork 0
mirror of https://github.com/SchildiChat/SchildiChat-android.git synced 2024-12-24 01:48:31 +03:00
Code Issues Projects Releases Packages Wiki Activity
9135 commits 7 branches 124 tags 230 MiB
Commit graph

3211 commits

Author SHA1 Message Date
SpiritCroc
39359f7d24 Merge remote-tracking branch 'upstream/develop' into spaces 
Change-Id: I10235a7a808ae66f5b00ad2e58c2aedf395e8e25

Conflicts:
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/summary/RoomAggregateNotificationCount.kt
	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/RoomSummaryDataSource.kt
	vector/build.gradle
	vector/src/main/java/im/vector/app/core/extensions/TimelineEvent.kt
	vector/src/main/java/im/vector/app/features/configuration/VectorConfiguration.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/HomeDrawerFragment.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/action/MessageActionsViewModel.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/list/RoomListAction.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/RoomListViewModel.kt
	vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewModelFactory.kt
	vector/src/main/java/im/vector/app/features/home/room/list/SectionHeaderAdapter.kt
	vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomController.kt
	vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileActivity.kt
	vector/src/main/java/im/vector/app/features/ui/SharedPreferencesUiStateRepository.kt
 2021-05-02 12:12:52 +02:00
SpiritCroc
2605c6ac9b Properly sort rooms according to events previewed in summary 
Change-Id: Id17385a4d17869b0356aa7242407581e2193845e
 2021-05-01 11:56:03 +02:00
SpiritCroc
3ee98f3c94 Fix missing sender information after edits 
Fixes https://github.com/vector-im/element-android/issues/3184

Change-Id: I27de01c29b31fbd49c8d2b0d4dacf13ba932d5b9
 2021-05-01 11:56:03 +02:00
SpiritCroc
47aa787ecb Fix missing sender information after edits 
Fixes https://github.com/vector-im/element-android/issues/3184
 2021-05-01 10:11:15 +02:00
Benoit Marty
5d9d984c73
Merge pull request #3235 from vector-im/feature/bca/spaces_justme_beta 
Just me spaces support
 2021-04-29 17:47:19 +02:00
Valere
31ffa65fd0 Update add room screen as per design 2021-04-29 11:51:07 +02:00
Benoit Marty
e073563a67 Cleanup 2021-04-29 11:10:41 +02:00
ganfra
80b155e042 Refact coroutine session scope 2021-04-29 11:10:41 +02:00
Benoit Marty
bd0fcce572 Return Job 2021-04-29 11:10:41 +02:00
Benoit Marty
a5c0c23bae Inject constructor... 2021-04-29 11:10:41 +02:00
Benoit Marty
e5d0a8f3d8 Cleanup 2021-04-29 11:10:41 +02:00
Benoit Marty
dc69d5c68a Create a holder 2021-04-29 11:10:41 +02:00
Benoit Marty
ecd2d0fb76 Use session scope 2021-04-29 11:10:41 +02:00
Benoit Marty
82ee2567b7 Provide a session scope, to launch coroutines without using the ViewModelScope 
It could be used elsewhere, will change other location in another commit.
 2021-04-29 11:10:41 +02:00
Benoit Marty
4acc308864
Merge pull request #3190 from vector-im/feature/bma/fix_troubleshoot 
Fix a race condition
 2021-04-29 11:08:00 +02:00
Benoit Marty
751efb57fc
Merge pull request #2840 from vector-im/feature/bca/spaces_sdk 
Spaces support - beta
 2021-04-29 10:18:31 +02:00
Benoit Marty
7beb483972
Merge pull request #3238 from vector-im/feature/bma/android11 
Android 11 fixes an other fixes for attachement
 2021-04-28 16:57:51 +02:00
Benoit Marty
b86fd37c15
Merge branch 'develop' into feature/bca/spaces_sdk 2021-04-28 16:57:02 +02:00
Benoit Marty
c40476aa94 Add ability to install APK from directly from Element (#2381) 
And cleanup `data class OpenFile`
 2021-04-28 15:55:21 +02:00
Benoit Marty
195bc8e914 Fix issue when opening encrypted files (#3186) 
Also always open the file after a successful download
 2021-04-28 15:11:48 +02:00
Yoan Pintas
ba641a6e76
Merge pull request #3178 from vector-im/expose_directUserId 
Expose directUserId in RoomSummary
 2021-04-28 13:45:21 +02:00
yostyle
506bdd8eb0 directUserId can be null 2021-04-28 12:22:43 +02:00
Valere
32605be6e8 Fix / migration recover room type 2021-04-28 11:42:08 +02:00
Valere
70476b912f Fix / placeholder in dark time 2021-04-28 11:15:58 +02:00
Valere
7d3d080603 Code review 2021-04-28 11:15:58 +02:00
Valere
aa74646ddf Fix invited spaced filters rooms out of home + invite not working 2021-04-28 11:15:58 +02:00
Valere
d30ba9c749 Spaces quick fixes and updates 
Make drawer menu more obvious + fix notification count
 2021-04-28 11:15:58 +02:00
Valere
4d7aeff54a Code review 2021-04-28 11:15:58 +02:00
Valere
8146d8ab1e Add Rooms to space 2021-04-28 11:15:58 +02:00
Valere
5a84456f1f Set guest access in developer mode 2021-04-28 11:15:58 +02:00
Valere
1deb44f91f Better DM filtering + fix space member loading 2021-04-28 11:15:58 +02:00
Valere
7910e84d8e Fix test compilation 2021-04-28 11:15:58 +02:00
Valere
57e9e4474e fix warning 2021-04-28 11:15:58 +02:00
Valere
e735aee724 Fix / group switch + refactoring 2021-04-28 11:15:58 +02:00
Valere
6aaf6bdf9b Fix rebase 2021-04-28 11:15:58 +02:00
Valere
49381db2e3 cleaning 2021-04-28 11:15:58 +02:00
Valere
79bde6ee91 Private (me and teamates) space support 2021-04-28 11:15:58 +02:00
Valere
02c2fea99e cleaning 2021-04-28 11:15:58 +02:00
Valere
886cc7fb5b Sort summaries by default 2021-04-28 11:15:58 +02:00
Valere
0d3c2b4bef Fix space filtering 2021-04-28 11:15:58 +02:00
Valere
8a35a786b4 Post rebase fixes 2021-04-28 11:15:58 +02:00
Benoit Marty
715bd29c75 Cleanup and add URL 2021-04-28 11:15:58 +02:00
Benoit Marty
66ac298e95 Benoit Review: cleanup 2 2021-04-28 11:15:58 +02:00
Benoit Marty
2cccbb3fce Benoit Review: avoid duplicate (again) class PowerLevelsContent 2021-04-28 11:15:58 +02:00
Benoit Marty
46290f1ed4 Benoit Review: cleanup 2021-04-28 11:15:58 +02:00
Valere
815cae4d84 remove enum from rest model 2021-04-28 11:15:58 +02:00
Valere
6b8b03e162 Show people you may no in space bottomsheet 2021-04-28 11:15:58 +02:00
Valere
dda45f1c2a Fix public space guest access & history visibility 2021-04-28 11:15:58 +02:00
Valere
201b914304 Fix invite power level for public space 2021-04-28 11:15:58 +02:00
Valere
55083a5602 Design review changes 2021-04-28 11:15:58 +02:00