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

8859 Commits

Author SHA1 Message Date
SpiritCroc 7de0406012 Automatic SchildiChat string correction 
Change-Id: Ib9c8d90f324ed77b1824d8daf11a0125e3983123
 2021-04-19 11:20:29 +02:00
SpiritCroc 7f9bbe3b9a Update string correction 
Change-Id: I294a4029146480d4624f8f43e5410ff58464a32e
 2021-04-19 11:20:29 +02:00
SpiritCroc 5fccd0fc06 Update correct_strings_de.sh 
Change-Id: I9fffdcb13b63599332cc9df7aeff08cc0b8658a0
 2021-04-19 11:19:23 +02:00
SpiritCroc baa5cd7d26 Automatic SchildiChat string correction 
Change-Id: Ie304dcf9324d543819431ccc762d549120ef7231
 2021-04-16 15:32:23 +02:00
SpiritCroc 3b94ea72d3 Automatic upstream merge postprocessing 
Change-Id: I18bd4c7615bc18926f0a5aafc0011d1b8d0f47eb
 2021-04-16 15:32:21 +02:00
SpiritCroc 2ae0fb8886 Merge tag 'v1.1.6' into sc 
Change-Id: I80d2ce9bdcb22c2fcc9795d3a5c727cb5ba772a6
 2021-04-16 15:32:18 +02:00
SpiritCroc 7a7cad9bb6 [TMP] Automatic upstream merge preparation 
Change-Id: I74d0a4cf0fdddf3339958b21f0ceefceaec0fd47
 2021-04-16 15:29:14 +02:00
SpiritCroc d1f6c607c7 Automatic revert to unchanged upstream strings, pt.1 
Change-Id: Ib67d15a33fc151d59cf4b754dd6a4e057fe35f9d
 2021-04-16 15:29:13 +02:00
Benoit Marty e5bf87c09f Merge branch 'hotfix/v1.1.6' 2021-04-16 14:36:26 +02:00
Benoit Marty 72515ee635 Prepare corrective release 1.1.6 2021-04-16 14:33:00 +02:00
Benoit Marty 9fc00fe6ff App crashes on "troubleshoot notifications" button (#3187) 2021-04-16 14:33:00 +02:00
Benoit Marty c08868bc3c Protect call to suspend fun 2021-04-16 13:22:16 +02:00
SpiritCroc e6b3f01545 Automatic SchildiChat string correction 
Change-Id: I4173e26d5fa2de9fc1ac9a8d08ce4cd50bd500dc
 2021-04-15 12:30:04 +02:00
SpiritCroc 5757d1894c Automatic upstream merge postprocessing 
Change-Id: Ia39d86869d7d2a16e2408838d5a3c5b0f80f3711
 2021-04-15 12:30:02 +02:00
SpiritCroc 28c5f036c8 Merge tag 'v1.1.5' into sc 
Change-Id: I263852c42cfa21935890bee435f063d7fa43edfa
 2021-04-15 12:29:59 +02:00
SpiritCroc ad8e9380b6 [TMP] Automatic upstream merge preparation 
Change-Id: Ib8637486c2a7e77402e356605603e6577ecd88e6
 2021-04-15 12:29:55 +02:00
SpiritCroc 537dd060b2 Automatic revert to unchanged upstream strings, pt.1 
Change-Id: I777c5cd5991b46559184568cc4d27d6acdab8878
 2021-04-15 12:29:55 +02:00
SpiritCroc dd5fd4c128 More longclick actions for stickers 
Allow
- Reactions
- Redactions
- Replies

Closes https://github.com/SchildiChat/SchildiChat-android/issues/57

Change-Id: I773cdcf84b2291494096debed38ba2342708290f
 2021-04-15 12:28:12 +02:00
Benoit Marty 18cef243a1 Merge branch 'hotfix/1.1.4_fixes' 2021-04-15 11:10:24 +02:00
Benoit Marty ccf7dd9583 Add changelog file 2021-04-14 22:41:57 +02:00
Benoit Marty e4375522ff Fix crash when playing video (#3179) 2021-04-14 22:35:30 +02:00
Benoit Marty 59637c4a6b Revert to Realm 10.3.1 to fix issue with migration 
Waiting for https://github.com/realm/realm-java/issues/7402
 2021-04-14 21:54:07 +02:00
SpiritCroc 221be6947d Fix alignment of read receipts for dual-side bubbles 
Change-Id: I60d6dde73071fa28d069cba87850cd85d6ddd36b
 2021-04-14 17:22:34 +02:00
SpiritCroc d568523b8b Add back low-priority section for DMs 
Change-Id: I63871b90a8541d2d8f9c87374176f95f6278882e
 2021-04-14 16:54:36 +02:00
SpiritCroc 3bfae2a28b Fix invalid expand status on tab switch 
Change-Id: I8db822d61b93b0b6f12ecbe4c7270f42c204caa5
 2021-04-14 16:43:54 +02:00
SpiritCroc 0aee3cf68c Remember expand status of sections in the overview again 
Change-Id: I3648e959de8a12d525d73da642b6ce6ae6a5ba7a
 2021-04-14 16:31:45 +02:00
SpiritCroc 2020765b77 Automatic SchildiChat string correction 
Change-Id: I0b5bf7e0a8d39f9308dcd13c35fbbfd91a487322
 2021-04-14 14:02:45 +02:00
SpiritCroc 5749e31508 Automatic upstream merge postprocessing 
Change-Id: Ic88df521a426bfe12b6fbbbcbdca534722ce7a6c
 2021-04-14 14:02:43 +02:00
SpiritCroc 20e185ef48 Restore setting functionality for unimportant unread type and count 
Change-Id: Ied403f8fad4a7fa4e9dd1422c9ca08690183c1b1
 2021-04-14 13:58:37 +02:00
SpiritCroc 04c0d7c121 Add back chats marked unread to notifications tab 
Likely also required for the "mark all as read" feature to work properly
since v1.1.4

Change-Id: I375860e55e3f188526f90cf7ffdccf192871e745
 2021-04-14 13:26:35 +02:00
SpiritCroc 811950cb18 Various fixes after merge 
- Fix compile
- Fix counting chats marked unread
- Fix counting chats with unread messages

Change-Id: Ibf928c5380a1b7ec25f2c510b97ee4f726fe7c0d
 2021-04-14 13:20:50 +02:00
SpiritCroc 0e601aa8f0 Merge tag 'v1.1.4' into sc 
Note: this merge needs more work, since upstream changed implementations
affecting following features:
- Mark unread
- Notification count badges
- Overview list filtering / combined overview
- Remember expanded categories
- Read receipt layout

Change-Id: If728bb54dd7c423b57bd3f59d23d86a1a0e5e435

Conflicts:
	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/database/model/RoomSummaryEntity.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/RoomAvatarResolver.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/read/DefaultReadService.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/accountdata/AccountDataAPI.kt
	vector/src/main/java/im/vector/app/core/resources/UserPreferencesProvider.kt
	vector/src/main/java/im/vector/app/core/utils/Emoji.kt
	vector/src/main/java/im/vector/app/features/home/HomeDetailViewModel.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/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/RoomListViewState.kt
	vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryController.kt
	vector/src/main/res/layout/item_timeline_event_base.xml
	vector/src/main/res/layout/item_timeline_event_base_state.xml
 2021-04-13 09:28:13 +02:00
SpiritCroc 5d7a1605da merge_helpers.sh: Fix spaces for upstream_previous_tag 
Change-Id: I669fd7e764419c9c78c15d7a3c5e5a6ce8af4af4
 2021-04-12 16:01:39 +02:00
SpiritCroc 79daede4f5 [TMP] Automatic upstream merge preparation 
Change-Id: Ic73bcab6bcb749b183f47ab8cf6ee647239822b7
 2021-04-12 15:58:23 +02:00
SpiritCroc d6fb89492a Automatic revert to unchanged upstream strings, pt.1 
Change-Id: I82ed105a407d79a9faa756b523e89dbfe5e14246
 2021-04-12 15:58:22 +02:00
SpiritCroc d329f08162 Increment version 
Change-Id: Ieeae5d0355183e5fadd8a0303514d8af9d7301a5
 2021-04-12 10:57:35 +02:00
SpiritCroc 0320bf2d05 SC dark themes: less bright bottom sheet / day separator 
Change-Id: I806f21c85ead59870d2a11bd1c5d3f101ac39325
 2021-04-11 10:28:33 +02:00
SpiritCroc 6a8cd9a329 Fix sometimes overlapping URL preview text with timestamp 
Change-Id: Ib441c2d0a447051b4dde2990111f748f1f3f2d66
 2021-04-09 12:54:40 +02:00
Benoit Marty 0a326015ef Merge branch 'release/1.1.4' 2021-04-09 12:41:04 +02:00
Benoit Marty 5ee8cf7ebf Prepare release 1.1.4 2021-04-09 12:40:11 +02:00
Marcus Hoffmann 1f37da276e propagate jitsi LIBRE_BUILD exclusion rules to not pull in gms libs 
Previously jitsi only had optional dependencies being disabled by the
LIBRE build flag but a while ago they introduced optional exclusion
rules which don't transitively propagate to consumers of the library, so
instead we need to mirror the exclusion rules from the jitsi gradle file:
See: 7a64bf006e/android/sdk/build.gradle (L53)

Signed-off-by: Marcus Hoffmann <bubu@bubu1.eu>
Change-Id: Ifadfef30a6b3f3040e98713fa21dbc4e2ee94a9b
 2021-04-09 12:25:47 +02:00
SpiritCroc 16c06f5f62 Automatic SchildiChat string correction 
Change-Id: If21ffd3164e94d6d668f4057ecd4afbeb36dd83d
 2021-04-09 11:57:24 +02:00
SpiritCroc 235cfa48ee Automatic upstream merge postprocessing 
Change-Id: I4b019ba99e9d48b57791e1bf33ccca553ae40483
 2021-04-09 11:57:22 +02:00
SpiritCroc 6aa6f3e01b Merge tag 'v1.1.3' into sc 
Change-Id: I50f78eeec11fc4d606ddabb68d08a5ff97bbad13

Conflicts:
	vector/src/main/res/layout/item_bottom_sheet_message_preview.xml
 2021-04-09 11:57:11 +02:00
SpiritCroc 5bfc106a33 [TMP] Automatic upstream merge preparation 
Change-Id: I8850efdce1c1c8d1b1ff08471634d012810d95a4
 2021-04-09 11:55:41 +02:00
SpiritCroc 2407c905fe Automatic revert to unchanged upstream strings, pt.1 
Change-Id: I0a3b0614e9533b7c572205eb571c21afa325cc7e
 2021-04-09 11:55:41 +02:00
SpiritCroc 61e9bfce5b pre_merge.sh: Fix when last merge was not tagged 
Change-Id: Ib48f8369884a13b7556bb0c3a70c367a940028c9
 2021-04-09 11:55:15 +02:00
Benoit Marty 93bc5abcb5 Update the Emoji source file 2021-04-09 10:32:11 +02:00
Benoit Marty 5311bacfff ktlint 2021-04-09 10:26:28 +02:00
Benoit Marty da7c2e38f6
Merge pull request #3140 from vector-im/feature/bca/verification_as_per_web 
Fix EW-EA compatibility for verification
 2021-04-09 10:24:01 +02:00