filippodb/SchildiChat-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
20,978 Commits 7 Branches 127 Tags
Commit Graph

5678 Commits

Author SHA1 Message Date
SpiritCroc
6a626ea3be Old layout: Sort order setting to show unreads on top 
Setting is in options menu.
Different setting for home than for spaces, to allow e.g. having unreads on
top only for home.

Change-Id: Ib390a5601ab78ba8372a4c3161311a52d1016b48
 2022-10-15 10:12:12 +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
SpiritCroc
c634bb74e5 Merge tag 'v1.5.1' into sc 
Note: we already had picked the internal v1.5.1 patch for the security
release, but we still do this merge to make git merge happy again for
future merges, and also clean up a little bit of UI things that I did
for that patch but abandonned later.

Change-Id: I51b674093e6f32e19fc9556109fb0d231d8f8f3e
 2022-10-07 19:45:09 +02:00
Valere
502b12a07e
Merge pull request #7290 from vector-im/feature/bca/hinder_verification 
E2ee dos not hinder verification
 2022-10-05 14:34:34 +02:00
Valere
fddeddacc7 fix outdated doc 2022-10-05 10:42:29 +02:00
Valere
37458d41f2 E2ee dos not hinder verification 2022-10-05 10:42:29 +02:00
Valere
68d4ac34c7 Move setting to room profile 2022-10-05 10:27:12 +02:00
Valere
f7d8356327 post rebase fix & cleaning 2022-10-05 10:27:12 +02:00
Valere
92a72cb1e9 cleaning 2022-10-05 10:27:12 +02:00
Valere
e9b33f6234 Per room block unverified devices 2022-10-05 10:27:12 +02:00
Valere
005e712396
Merge pull request #6703 from vector-im/feature/bca/crosssigning_reset_warning 
warn on cross signing reset
 2022-10-03 09:25:52 +02:00
Onuray Sahin
d0dd446af8
Merge pull request #7247 from vector-im/feature/ons/parse_user_agent 
[Device Manager] Parse user agents (PSG-762)
 2022-09-30 18:36:33 +03:00
Valere
b4f7e1381d fix test post rebase 2022-09-30 16:00:34 +02:00
Valere
59afe434f8 more tests 2022-09-30 16:00:34 +02:00
Valere
ac0e5e9dec fix broken test, userId confustion 
cleaning


cleaning


add tests


cleaning
 2022-09-30 16:00:34 +02:00
Valere
c8f0792997 warn on cross signing reset 2022-09-30 16:00:34 +02:00
Onuray Sahin
1238f31cdf
Merge pull request #7209 from vector-im/feature/ons/extend_user_agent 
[Device Manager] Extend user agent to include device information (PSG-755)
 2022-09-29 13:11:20 +03:00
Onuray Sahin
0f0ec54ed1 Code review fixes. 2022-09-29 12:20:01 +03:00
Valere
8132a7902b post merge code quality 2022-09-29 09:21:06 +02:00
Valere
ce86e29122 Merge branch 'main' into develop 2022-09-28 18:16:39 +02:00
Onuray Sahin
5666383134 Add unit test for desktop and web user agents. 2022-09-28 18:19:25 +03:00
Valere
aa42746034 version 1.5.1 2022-09-28 16:28:43 +02:00
Valere
5c442296ef Security fix CVE-2022-39246 CVE-2022-39248 2022-09-28 16:26:47 +02:00
SpiritCroc
87eaf85224 Security patch v1.5.1 
Conflicts:
	library/ui-styles/src/main/res/values/colors.xml
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/AbsBaseMessageItem.kt

Change-Id: I0c8f5e098f92d0bf42e5ddc41bb6ad43c69bfdd2
 2022-09-28 10:41:00 +02:00
Adam Brown
fad02062d8
Instrumentation test coroutines (#7207) 
Converting SDK instrumentation tests from CountdownLatch to suspending functions
 2022-09-27 13:37:23 +01:00
Onuray Sahin
c70b6206d0 Add user agent into device info. 2022-09-26 14:39:23 +03: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
Onuray Sahin
33eeb721bf Merge branch 'develop' into feature/ons/extend_user_agent 2022-09-23 16:17:06 +03:00
Onuray Sahin
42983f5ce4 Write unit test for computing user agent user case. 2022-09-23 15:55:02 +03:00
Onuray Sahin
c7108f3ac3 Create use case to compute user agent. 2022-09-23 13:05:16 +03:00
Benoit Marty
60bfd0dd42
Merge pull request #7159 from vector-im/feature/bma/fix_new_lint_warning 
Fix lint warning
 2022-09-22 17:35:10 +02:00
Adam Brown
65156a8ece
Merge pull request #7198 from vector-im/feature/adm/configurable-sync-timeout 
Allow configurable sync timeout
 2022-09-22 15:40:58 +01:00
Benoit Marty
7f5c712e88 No need to use @SuppressLint("NewApi") when @ChecksSdkIntAtLeast is used - more cleanup 2022-09-22 16:34:07 +02:00
Benoit Marty
658a09ea6a No need to use @SuppressLint("NewApi") when @ChecksSdkIntAtLeast is used. 2022-09-22 16:32:14 +02:00
Benoit Marty
bb2eb56ee6 Add @ChecksSdkIntAtLeast annotation. 2022-09-22 16:32:14 +02:00
Benoit Marty
151f6245db
Merge pull request #6929 from vector-im/feature/bma/android12 
Target API 32 (Android 12)
 2022-09-22 16:30:04 +02:00
Onuray Sahin
c37a6842fe Update format to be consistent with Element iOS. 2022-09-22 15:53:29 +03:00
Onuray Sahin
ea78f504d7 Small refactoring. 2022-09-22 15:28:26 +03:00
Onuray Sahin
b2e7cc2208 Extend user agent by adding device manufacturer and model to the beginning. 2022-09-22 15:18:20 +03:00
ganfra
fabfe36ede Update versions to 1.5.2 2022-09-22 10:31:31 +02:00
Adam Brown
600588dbbb adding trailing commas 2022-09-21 16:37:31 +01:00
Adam Brown
9ab78c93e2 reducing sync timeout for instrumentation tests to speed them up 2022-09-21 15:39:13 +01:00
Adam Brown
7f31098ba1 lifting the sync timeout to the matrix configuration 2022-09-21 15:39:09 +01:00
Benoit Marty
b9c28ba4ce
Merge branch 'develop' into feature/bma/android12 2022-09-21 16:24:30 +02:00
Florian Renaud
8624199be3
Merge pull request #7154 from vector-im/bugfix/fre/start_dm_app_layout 
Deferred DMs - Handle the local rooms within the new AppLayout
 2022-09-20 10:53:51 +02:00
Florian Renaud
5e504942ca Delete the local read receipts when deleting the local rooms 2022-09-19 15:58:14 +02:00
Florian Renaud
648498e2de Move local room check from UpdateBreadcrumbsTask to RoomService 2022-09-19 15:58:14 +02:00
Florian Renaud
3c68222fd7 Do not save local room into recent rooms 2022-09-19 15:58:14 +02:00
Florian Renaud
eac74bda09 Improve nullability check in CreateRoomFromLocalRoomTask 2022-09-19 09:38:05 +02:00
Florian Renaud
3f88811590 remove unused import 2022-09-19 09:38:05 +02:00