Commit graph

16877 commits

Author SHA1 Message Date
SpiritCroc
360f469c4c [TMP] Automatic upstream merge preparation
Change-Id: Idb8470d85e1279feb5fdf4f891aaf91c47b78dbc
2022-05-17 22:06:28 +02:00
SpiritCroc
dee1b0d6ec Automatic revert to unchanged upstream strings, pt.1
Change-Id: I3b53cdcd58a9a5dc4f30b3cfa29cb7503d90c552
2022-05-17 22:06:28 +02:00
SpiritCroc
91cff797f0 unifiedpush/FCM: also allow FCM for SERVICE_VERSION_UPDATE_REQUIRED
To fix inbuilt FCM on Android 7

Change-Id: Ia2aca76b5718cce3c7828b00a604d58cf9f3676e
2022-05-17 10:38:55 +02:00
SpiritCroc
1eed611f4e Allow shorter bug report messages for internal / debug builds
Change-Id: I0dd84bcca6d28ce9615ae40c06020a65d2401eea
2022-05-17 10:11:50 +02:00
SpiritCroc
cc96b2e198 Hide floating date above unread messages line
Change-Id: I44b00d41a77c0fe0fd08126502430723541dc7ae
2022-05-14 12:20:44 +02:00
SpiritCroc
3201c629c4 Reaction search: fix missed update
If we throttle and type fast, we don't get the last update sometimes.
This actually also applies to emoji search results, but becomes more
important for freeform reactions.

Change-Id: I0bb515cd90c06361e7dd5d2c248eac495dd5bd63
2022-05-13 23:10:04 +02:00
SpiritCroc
3dbbed6489 Hide freeform reaction option in easy mode
Change-Id: I74dd0edbec3db17cf4a65f45ffbc689df57e64b3
2022-05-13 22:48:17 +02:00
SpiritCroc
9444642254 Allow sending freeform reactions
Change-Id: I1f2a6fb14cd16b22543c7bf1b4f0a3dc813ae7a7
2022-05-13 22:33:25 +02:00
SpiritCroc
45c4f632e7 Pill-AutoComplete: add newline as word separator
Closes https://github.com/SchildiChat/SchildiChat-android/issues/122

Change-Id: Ie6c86aaf571aadd1e4977a1503c7d76f00c6d052
2022-05-13 20:57:08 +02:00
SpiritCroc
d1ee0dea6b Rely on MSC2654 unread counts when available for detecting unread status
Previously, we were doing some hybrid approach, in order to take into
account the room preview settings. However, this can mark chats as
unread in cases where isEventRead() does guessing due to insufficient
events loaded. Just using the counts when possible is more reliable.

Change-Id: I22dc242e69f1946c039d0b4f81851c6b0c0556e2
2022-05-13 20:44:55 +02:00
SpiritCroc
200370912a Add missed return
Change-Id: I0a01f3eb7ab8ffef965736c6aa0e03909914358c
2022-05-13 12:58:54 +02:00
SpiritCroc
07288c5458 Limit chunk reparation mechanisms to avoid too high delays
Change-Id: I0512a911b8637cd62815e2570e1897a374bbcf5b
2022-05-13 12:22:41 +02:00
SpiritCroc
7c80957e5a Retroactively fix stuck timelines due to empty chunks
Change-Id: I707d3c139e4731db5d5ced5fc113323646d305a3
2022-05-13 12:01:35 +02:00
SpiritCroc
d9e5dfa90a Do not insert empty chunks that loop to themselves
We were getting some stuck timelines because of the insertion of empty
chunks that link to themselves in both directions.

Change-Id: Id3672e6704d82cbcdafa2fa5ded716b624db3680
2022-05-13 11:37:54 +02:00
SpiritCroc
42ac513da4 FEATURES.md: Synapse moved MSC2654 behind experimental flag
https: //github.com/matrix-org/synapse/commit/bebf994ee804ef63ce16801c6694713fcd685320
Change-Id: Icdb86a8d8ba24648723c126b1d9346a4622ffa66
2022-05-12 20:27:58 +02:00
SpiritCroc
347af40ec0 Update notice rendering depending on layout
For SC bubbles: use exact same mechanism as rendering normal text
messages if possible
-> Closes https://github.com/SchildiChat/SchildiChat-android/issues/45

For non-SC-bubbles: use upstream implementation again, so it's possible
to tell apart notices in these as well.

Change-Id: I60c614266d2ae4afdf1e87c649ff484551f961b4
2022-05-11 21:51:06 +02:00
SpiritCroc
a96d27cb81 Floating date
Closes https://github.com/SchildiChat/SchildiChat-android/issues/41

Change-Id: I0eb9c6c3800309be40a1f5bc0c4420bd4066c098
2022-05-11 21:50:58 +02:00
SpiritCroc
85a26ae8be Render image reactions (MSC3746)
Some notes:
- Doesn't re-parse reactions already in the db to add the url field - so
  may need an initial sync for those.
- Since some clients don't really follow MSC3746, as in: they don't use
  the url field, but instead only write and check the key if it is an
  mxc-url, support those as well.
- Accordingly, initial sync is likely not required for those reactions
  I've seen in the wild so far, as it's common to use the mxc url also
  as key.

Change-Id: Ib1c50315425494986fa2e794d165658220a4f342
2022-05-11 21:50:49 +02:00
SpiritCroc
88556658a3 Improve and debug ghost swipe situation
Change-Id: Ic6f2956a139516050e2b7e5ec248969326b7ec43
2022-05-11 21:50:44 +02:00
SpiritCroc
b2a6252f94 Blank room list debug / fix attempt
Change-Id: Ic0624f530cbe951f5a229d4e5335b8699f559f43
2022-05-11 21:48:48 +02:00
SpiritCroc
9d6749f8cb Increment version
Change-Id: Ieb63a5f1f3f14f11ef0f874b45f74d95e14240b6
2022-05-09 12:41:04 +02:00
Lynn Nakanishi Lin(林中西)
5a8639b24c Translated using Weblate (Chinese (Simplified))
Currently translated at 99.3% (147 of 148 strings)

Translation: SchildiChat/SchildiChat-android
Translate-URL: https://weblate.bubu1.eu/projects/schildichat/schildichat-android/zh_Hans/
2022-05-09 12:35:42 +02:00
joshua
15a0c81440 Translated using Weblate (Swedish)
Currently translated at 100.0% (148 of 148 strings)

Translation: SchildiChat/SchildiChat-android
Translate-URL: https://weblate.bubu1.eu/projects/schildichat/schildichat-android/sv/
2022-05-09 12:35:41 +02:00
MagnetizedFreckles
2b9f3ac84c Translated using Weblate (Russian)
Currently translated at 85.8% (127 of 148 strings)

Translation: SchildiChat/SchildiChat-android
Translate-URL: https://weblate.bubu1.eu/projects/schildichat/schildichat-android/ru/
2022-05-09 12:35:41 +02:00
SpiritCroc
9cc5ab8a1d Emoji-only messages: ignore spaces for max emoji count
Change-Id: I270f0602ccb26aa744b788495b5ca2374ab6e6c5
2022-05-09 12:32:55 +02:00
SpiritCroc
797a8c6c10 Custom emojis: detect as emoji-only
Change-Id: Ia147a0362eb7d930ad6709bca0f86b51cb62612e
2022-05-09 12:32:49 +02:00
SpiritCroc
04cc69c206 Inline images: data-mx-emoticon height override
Change-Id: I3f1ab2aff5b17635600d76f4ca41fc539359b1ce
2022-05-09 12:32:42 +02:00
SpiritCroc
3c702b7230 Fix read marker update when rm becomes visible last
If the read marker becomes visible after all events, the global most
recent visible event won't be caught unless the user starts scrolling it
out and back in.
To fix, immediately look up the most recently displayed event once the
read marker becomes visible.

Change-Id: I909503801572d50e968610de163e56c05a946d36
2022-05-08 18:31:06 +02:00
SpiritCroc
19402f54a6 [merge] Fix fdroid variant compile / remove unused imports
Change-Id: Ib7d0c4095bb549b54d83ad3d1ef4c23bc0ebc736
2022-05-06 09:24:29 +02:00
SpiritCroc
30d7c9b09b [merge] Fix realm migration from v1.4.13
Change-Id: If402ca9e48871ef086f173843d6b42d850294e6e
2022-05-05 18:33:17 +02:00
SpiritCroc
bed3051812 Automatic SchildiChat string correction
Change-Id: I6db6443c31a7052293ae4df4e60c0694d1e38c26
2022-05-05 17:41:29 +02:00
SpiritCroc
cf3036de22 Automatic upstream merge postprocessing
Change-Id: Ia795352ccd15a5c17d71090d221cbedb51a96874
2022-05-05 17:41:28 +02:00
SpiritCroc
4617d2d698 Merge tag 'v1.4.14' into sc
v1.4.14

Change-Id: I3667009380f1e35ce05c75c3769e62e3446212db

Conflicts:
	.editorconfig
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/actions/MegolmSessionDataImporter.kt
	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/session/room/send/LocalEchoEventFactory.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/DefaultTimeline.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/LoadTimelineStrategy.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/SyncTask.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/util/database/RealmMigrator.kt
	vector/src/fdroid/java/im/vector/app/push/fcm/FcmHelper.kt
	vector/src/gplay/java/im/vector/app/gplay/push/fcm/VectorFirebaseMessagingService.kt
	vector/src/gplay/java/im/vector/app/push/fcm/FcmHelper.kt
	vector/src/main/java/im/vector/app/AppStateHandler.kt
	vector/src/main/java/im/vector/app/VectorApplication.kt
	vector/src/main/java/im/vector/app/core/pushers/PushersManager.kt
	vector/src/main/java/im/vector/app/core/receiver/BackgroundSyncStarter.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/TimelineViewModel.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/MessageItemFactory.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/TimelineControllerInterceptorHelper.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/style/TimelineMessageLayout.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/style/TimelineMessageLayoutFactory.kt
	vector/src/main/java/im/vector/app/features/home/room/list/RoomListSectionBuilderSpace.kt
	vector/src/main/java/im/vector/app/features/navigation/DefaultNavigator.kt
	vector/src/main/java/im/vector/app/features/navigation/Navigator.kt
	vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberListViewModel.kt
	vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberListViewState.kt
	vector/src/main/java/im/vector/app/features/settings/VectorPreferences.kt
	vector/src/main/java/im/vector/app/features/settings/notifications/VectorSettingsNotificationPreferenceFragment.kt
	vector/src/main/java/im/vector/app/features/settings/troubleshoot/TestTokenRegistration.kt
	vector/src/main/java/im/vector/app/features/spaces/SpaceSummaryController.kt
2022-05-05 17:41:26 +02:00
SpiritCroc
11194546a7 [TMP] Automatic upstream merge preparation
Change-Id: I3d17203abc4c7c8b681ba3d23483f76d3b5c2caa
2022-05-05 14:26:49 +02:00
SpiritCroc
2a87ebe3e8 Automatic revert to unchanged upstream strings, pt.1
Change-Id: Iceff48cf6d67ca6e84bc04e9a5d94d81cb339932
2022-05-05 14:26:49 +02:00
SpiritCroc
92fe0a5a29 Rageshake: re-enable can_contact switch
Follow-ups may be useful for some kind of reports

Change-Id: Id2a42ce771f1ed355b896e5e8f8ad61e61670d8b
2022-05-05 13:28:26 +02:00
SpiritCroc
3e2fdd0784 Inline images: use isMxcUrl()
Change-Id: Ie85c5597e714b48dc5bcd3ac69abb5161b4fa640
2022-05-05 13:28:12 +02:00
ganfra
a5b007f147 Merge branch 'release/1.4.14' into main 2022-05-05 11:30:59 +02:00
ganfra
9420d309a5 Add changes 2022-05-05 10:38:49 +02:00
ganfra
00ad9ccc2a
Merge pull request #5935 from vector-im/feature/fga/fix_weblate_lint
Feature/fga/fix weblate lint
2022-05-04 19:07:16 +02:00
Benoit Marty
330d802079
Merge pull request #5907 from vector-im/feature/bma/currentTimeMillis
Use Clock interface
2022-05-04 18:27:04 +02:00
ganfra
f2c35adb60 Fix TODO on strings 2022-05-04 18:19:03 +02:00
Benoit Marty
a11c0b7ea1
Merge pull request #5885 from chagai95/patch-2
don't pause timer when call is held
2022-05-04 18:09:11 +02:00
ganfra
ed7343e897 Weblate: fix string with param 2022-05-04 18:06:05 +02:00
Benoit Marty
2fb5f423a5 Rename val 2022-05-04 17:52:32 +02:00
Benoit Marty
3ecde755e0 Rename val 2022-05-04 17:51:14 +02:00
Benoit Marty
2d98cbd915 Rename now to more explicit currentTimeMillis 2022-05-04 17:48:36 +02:00
Benoit Marty
09e628f227
Merge branch 'develop' into feature/bma/currentTimeMillis 2022-05-04 17:43:03 +02:00
ganfra
de531a17d9
Merge pull request #5931 from RiotTranslateBot/weblate-element-android-element-app
Translations update from Weblate
2022-05-04 17:15:52 +02:00
Weblate
5cdea33418 Merge branch 'origin/develop' into Weblate. 2022-05-04 14:39:20 +00:00