filippodb
/
SchildiChat-android
mirror of https://github.com/SchildiChat/SchildiChat-android.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
8,511 Commits 6 Branches 120 Tags 228 MiB
Commit Graph

8511 Commits

Author SHA1 Message Date
Benoit Marty e8bb3d81ed Ganfra's review: inject Moshi Moshi 2021-03-16 12:15:28 +01:00
SpiritCroc 8f378aafea Jump to recent button: accent color like FAB in chat overview 
Change-Id: Ie0bef66add3b329d0c0624be825d4c49797b7534
 2021-03-16 10:26:11 +01:00
Timo Kösters dd2a7397a4
fix: make cross signing work with server names containing : 
Server names are allowed to contain ':' to specify a port, see https://matrix.org/docs/spec/appendices#server-name
User ids on the other hand are not allowed to contain ':', even
historical user ids, see https://matrix.org/docs/spec/appendices#historical-user-ids

Therefore we can use the first instance of ':' to split the user
localpart from the server name.
 2021-03-15 22:31:34 +01:00
Benoit Marty e7c9fb987c Use AwaitTransaction (G's review) 2021-03-15 18:08:33 +01:00
Benoit Marty 4f3734f932 Ensure message are decrypted in the room list after a clear cache 2021-03-15 16:53:19 +01:00
Benoit Marty 4302d50af9 We do not display shield in the room list anymore 
Room member are lazy loaded, so the shield may not be accurate anymore.
 2021-03-15 16:09:08 +01:00
Benoit Marty 75ad6a640b loglimit 2021-03-15 16:02:09 +01:00
Benoit Marty 13cbfaf5e7 Do not load room members in e2e after init sync 2021-03-15 15:29:20 +01:00
Benoit Marty 71f2c50799 Do what the comment said 2021-03-15 15:02:04 +01:00
Benoit Marty c4aadfed33 Better API and avoid copying Collection 2021-03-15 14:35:21 +01:00
Benoit Marty ed662d3add Fix double RR issue when optimizing init sync 2021-03-15 14:19:23 +01:00
Jonathan de Jong c998f5fd8f whoops 2021-03-14 19:20:35 +01:00
Jonathan de Jong 2708b85a20 Update CHANGES.md 2021-03-14 19:17:05 +01:00
Jonathan de Jong cb0445c785 Change bold to headers 2021-03-14 19:14:53 +01:00
SpiritCroc fa8fac6bca Remove time location setting, always use bottom if possible 
Issues with dual-side bubbles with top time:
- Not well tested, extra complexity, extra maintenance hassle
- Media: no send time without footer
- Media: currently showing empty footer shade
- Adding further footer items would need extra handling
 2021-03-14 11:44:20 +01:00
SpiritCroc 507a9575fc Fix Element's send state alignment in SC's layout 2021-03-14 11:34:17 +01:00
SpiritCroc a64429fcb6 Content in bubbles -> don't show element send state (we have SC one) 2021-03-14 11:34:17 +01:00
SpiritCroc ead1258e2a Automatic SchildiChat string correction 2021-03-14 11:33:56 +01:00
SpiritCroc f06162f1a8 correct_strings.sh: matrix-sdk strings were deleted 2021-03-14 11:06:25 +01:00
SpiritCroc bfb7fe5938 Automatic upstream merge postprocessing 2021-03-14 10:59:10 +01:00
SpiritCroc 5120b8c148 Automatic color correction 2021-03-14 10:59:10 +01:00
SpiritCroc 699ad4eaeb Merge tag 'v1.1.1' into sc 
Conflicts:
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt
	vector/src/main/AndroidManifest.xml
	vector/src/main/java/im/vector/app/core/epoxy/bottomsheet/BottomSheetRoomPreviewItem.kt
	vector/src/main/java/im/vector/app/features/home/HomeActivity.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/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/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/MessageInformationData.kt
	vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileController.kt
	vector/src/main/res/drawable/rounded_rect_shape.xml
	vector/src/main/res/menu/menu_timeline.xml
	vector/src/main/res/values/array.xml
	vector/src/main/res/xml/vector_settings_preferences.xml
 2021-03-14 10:58:57 +01:00
SpiritCroc 1aed52e291 [TMP] Automatic upstream merge preparation 2021-03-14 10:13:06 +01:00
SpiritCroc 2e74a87e4c Automatic revert to unchanged upstream strings, pt.1 2021-03-14 10:13:06 +01:00
Benoit Marty 0c774c098f No op for empty list 2021-03-12 19:08:57 +01:00
Benoit Marty e3d2186c25 Rework UpdateTrustWorker, should have better perf. 2021-03-12 18:55:53 +01:00
Benoit Marty 857bfcb971 Cleanup 2021-03-12 12:18:21 +01:00
Benoit Marty 0b0634b531 Ensure tmp file is always deleted when it is read 2021-03-12 12:17:47 +01:00
Benoit Marty fe39c92e25 Load RR when opening a timeline 2021-03-12 12:17:47 +01:00
Benoit Marty 3777b00ad7 Store Ephemeral in files to handle them later (no second transaction) 2021-03-12 12:17:47 +01:00
Benoit Marty e8d4fab305 Add template for 1.1.2 2021-03-12 12:17:29 +01:00
Benoit Marty b5fa61c8aa
Merge pull request #2983 from vector-im/dependabot/gradle/com.schibsted.spain-barista-3.9.0 
Bump barista from 3.8.0 to 3.9.0
 2021-03-11 22:44:54 +01:00
Benoit Marty 5cb577be58
Merge pull request #2984 from vector-im/feature/bma/fixes_release 
2 fixes for release 1.1.2
 2021-03-11 22:43:39 +01:00
ganfra 992cc0addd Message state: add sent status in BottomSheet 2021-03-11 19:34:34 +01:00
ganfra a407ed1903 Fix live timeline event race condition 2021-03-11 15:24:06 +01:00
Benoit Marty 4b8c59a23b Fix crash on ViewSource of event 2021-03-11 14:14:55 +01:00
Benoit Marty cbfb5d3fcc Fix color and bottom margin 
And improve a11y
 2021-03-11 11:10:59 +01:00
dependabot[bot] 507eba3ddb
Bump barista from 3.8.0 to 3.9.0 
Bumps barista from 3.8.0 to 3.9.0.

Signed-off-by: dependabot[bot] <support@github.com>
 2021-03-10 21:08:12 +00:00
Benoit Marty 4e3ad91c67 Version++ 2021-03-10 22:05:31 +01:00
Benoit Marty bc81931773 Merge branch 'release/1.1.1' 2021-03-10 22:04:26 +01:00
Benoit Marty 3f241cc996 Merge branch 'release/1.1.1' into develop 2021-03-10 22:04:25 +01:00
Benoit Marty ac02d1d48a Prepare release 1.1.1 2021-03-10 22:03:57 +01:00
Benoit Marty 77772f01c1
Merge pull request #2981 from vector-im/feature/bma/wl 
WL mistake
 2021-03-10 21:57:33 +01:00
Benoit Marty 8c24dd0fba Add entry in changelog 2021-03-10 21:55:59 +01:00
Benoit Marty c6828a8612 Fix issue with Locale folder. 
Hoping Weblate will eat that correctly.
 2021-03-10 21:54:11 +01:00
Benoit Marty c5a4c805b5 Fix lint error 2021-03-10 21:54:11 +01:00
Benoit Marty 8a1a90d1b9
Merge pull request #2937 from vector-im/feature/ons/message_states 
Improve the status of send messages
 2021-03-10 21:51:48 +01:00
ganfra ea21892d03 Message state: fix and clean code after Benoits review 2021-03-10 19:32:50 +01:00
Benoit Marty 2536452220
Merge pull request #2964 from vector-im/matthew/zh 
rename zh-Hans and zh-Hant - TO BE MERGED DURING WEBLATE SYNC
 2021-03-10 18:32:22 +01:00
Benoit Marty 730869a37a
Merge pull request #2980 from RiotTranslateBot/weblate-element-android-element-app 
Translations update from Weblate
 2021-03-10 18:27:06 +01:00