mirrors/SchildiChat-android
1
0
Fork 0
mirror of https://github.com/SchildiChat/SchildiChat-android.git synced 2025-01-08 17:27:44 +03:00
Code Issues Projects Releases Packages Wiki Activity
8837 commits 7 branches 124 tags 230 MiB
Commit graph

5230 commits

Author SHA1 Message Date
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
20e185ef48 Restore setting functionality for unimportant unread type and count 
Change-Id: Ied403f8fad4a7fa4e9dd1422c9ca08690183c1b1
 2021-04-14 13:58:37 +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
d6fb89492a Automatic revert to unchanged upstream strings, pt.1 
Change-Id: I82ed105a407d79a9faa756b523e89dbfe5e14246
 2021-04-12 15:58:22 +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
SpiritCroc
16c06f5f62 Automatic SchildiChat string correction 
Change-Id: If21ffd3164e94d6d668f4057ecd4afbeb36dd83d
 2021-04-09 11:57:24 +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
2407c905fe Automatic revert to unchanged upstream strings, pt.1 
Change-Id: I0a3b0614e9533b7c572205eb571c21afa325cc7e
 2021-04-09 11:55:41 +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
Benoit Marty
2d6fca9214
Merge pull request #3143 from vector-im/feature/bma/discovery_filtering 
Filter some other words when navigating into the room directory
 2021-04-09 08:52:32 +02:00
Benoit Marty
f1e280827d Ensure there is no dup and cleanup 2021-04-08 19:39:49 +02:00
Matthew Hodgson
1233fde261
Update forbidden_terms.txt 2021-04-08 18:26:55 +01:00
Benoit Marty
153d393bf1 Prevent searching for forbidden terms 2021-04-08 17:28:47 +02:00
Benoit Marty
1715143b85 Filter some other words 
Cannot filter canonical alias anymore, as we now use word boundaries
 2021-04-08 16:54:41 +02:00
Benoit Marty
c6bd378104 Test is passing 2021-04-08 12:44:28 +02:00
Valere
760e14531f Fix EW-EA compatibility for verification 2021-04-08 12:09:35 +02:00
Benoit Marty
3b6234a9a2
Merge pull request #3133 from vector-im/feature/bma/wl_fixes 
Weblate fixes
 2021-04-07 19:11:16 +02:00
Benoit Marty
eef6d92b89
Merge pull request #3129 from vector-im/feature/bma/dn_iteration 
Empty room name small iteration
 2021-04-07 18:41:08 +02:00
Benoit Marty
e61a9e75e8
Merge pull request #3055 from vector-im/feature/bma/get_event 
Get event
 2021-04-07 18:38:17 +02:00
Benoit Marty
47aeadef7c Add configuration for new Irish language 2021-04-07 18:34:54 +02:00
Benoit Marty
fc202437e8 Fix lint issues 2021-04-07 18:31:46 +02:00
Weblate
eff560f8f0 Merge branch 'origin/develop' into Weblate. 2021-04-07 15:37:02 +00:00
ozzii
3efd35e27a Translated using Weblate (Serbian) 
Currently translated at 28.1% (666 of 2362 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/sr/
 2021-04-07 15:36:54 +00:00
Nikita Epifanov
e9838f6db1 Translated using Weblate (Russian) 
Currently translated at 99.4% (2350 of 2362 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/ru/
 2021-04-07 15:36:51 +00:00
Daniel Løvbrøtte Olsen
cc1d52171c Translated using Weblate (Norwegian Bokmål) 
Currently translated at 62.9% (1486 of 2362 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/nb_NO/
 2021-04-07 15:36:47 +00:00
Magnus
3250f3bc0e Translated using Weblate (Norwegian Bokmål) 
Currently translated at 62.9% (1486 of 2362 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/nb_NO/
 2021-04-07 15:36:47 +00:00
Samu Voutilainen
39c0c5401f Translated using Weblate (Finnish) 
Currently translated at 79.2% (1873 of 2362 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/fi/
 2021-04-07 15:36:47 +00:00
Benoit Marty
7309c1066c Move WifiDetector to the app side 
And protect the call to getEvent()
 2021-04-07 17:35:46 +02:00
Benoit Marty
dead57b9fe Cleanup 2021-04-07 17:35:46 +02:00
Benoit Marty
b89a258fdf FastLane: Only is Wifi is detected 2021-04-07 17:35:46 +02:00
Benoit Marty
9a124f7630 Done TODO 2021-04-07 17:35:46 +02:00
Benoit Marty
3a1b8bc33d FastLane: handle push rules 2021-04-07 17:35:46 +02:00
Benoit Marty
4a0a6e9f01 FastLane: Ignore message edition 2021-04-07 17:35:46 +02:00
Benoit Marty
96153fe92a Get Event after a Push for a faster notification display in some conditions 2021-04-07 17:35:46 +02:00
Benoit Marty
af023669ba Implement FirstThrottler, to gain 200 ms for first refresh 2021-04-07 17:35:25 +02:00
Benoit Marty
e811c53c44 Improve "was" fallback for Empty rooms. 2021-04-07 15:24:00 +02:00
Benoit Marty
923715aeb3 Add method for name fallback when there is only one member 2021-04-07 15:19:33 +02:00
Benoit Marty
15c51cad17 Improve interface, name are not nullable 2021-04-07 15:17:02 +02:00
Benoit Marty
835eb95aa1 If signout request fails, do not start LoginActivity, but restart the app (#3099) 2021-04-07 14:52:27 +02:00
Benoit Marty
1ac17b3aee Exclude instruction from try catch block 2021-04-07 14:34:06 +02:00
Benoit Marty
b8d01c4577 Fix quick click action (#3127) 2021-04-07 14:08:43 +02:00
Benoit Marty
884358b374 Small cleanup 2021-04-07 13:47:20 +02:00