mirrors/SchildiChat-android
1
0
Fork 0
mirror of https://github.com/SchildiChat/SchildiChat-android.git synced 2024-12-23 09:30:50 +03:00
Code Issues Projects Releases Packages Wiki Activity
16564 commits 7 branches 124 tags 230 MiB
Commit graph

16564 commits

This branch
This branch
All branches
Author SHA1 Message Date
SpiritCroc
38cfd2ab2f Restore pre-v1.4.4 toolbar 
New one has borked presence indicator, and overall doesn't look as nice
as the old one, including the new typing indicator, imo.

Change-Id: I9e1fa0f6677905d051f0d9557f8a79b3c4c86e2b
 2022-03-10 20:06:32 +01:00
ericdecanini
6db1c377c4 Reverts to fix by removing event timestamp condition 2022-03-10 19:16:22 +01:00
ericdecanini
fe3c9cc09f Reverts to fix by removing event timestamp condition 2022-03-10 19:15:12 +01:00
ericdecanini
df6ae4b848 Fixes warning for debugging 2022-03-10 18:26:49 +01:00
ariskotsomitopoulos
f31b130b49 Fix unit tests 2022-03-10 19:11:14 +02:00
ariskotsomitopoulos
34cfdfb6fe Merge branch 'develop' into feature/aris/thread_live_thread_list 2022-03-10 18:48:41 +02:00
Tiago Loureiro
9cb64f0592 Fix huge picture crash on timeline 
Change-Id: Ie9e4b68c8525a033b06e7f500e86aab73a718f40
 2022-03-10 17:43:13 +01:00
Michael Kaye
c57d22a72c Additionally notify the matrix channel if these tests fail when run 
after merge to develop or main.
 2022-03-10 16:41:00 +00:00
SpiritCroc
5b07dbbeb9 Fix possible class cast exception in url preview 
Change-Id: Ibab1f314591abca7669f89df51dade70ddab383f
 2022-03-10 17:20:11 +01:00
Benoit Marty
26617988f2 Add colors for shield vector drawable 2022-03-10 17:15:19 +01:00
Benoit Marty
becdd1ce29 Fix test compilation after method renaming 
Also rename in the comment
 2022-03-10 17:01:45 +01:00
Michael Kaye
23f7f72e38 Compile tests on PR, to ensure we don't break the build when merging. 
This was accidentally committed to develop and reverted there.
 2022-03-10 15:58:00 +00:00
Michael Kaye
ed7c65d8d8 Revert "Compile tests on PR, to ensure we don't break the build when merging." 
This reverts commit 9e5ff1785a.
 2022-03-10 15:57:05 +00:00
ariskotsomitopoulos
a758ad71e6 Add is_falling_back support for rich thread replies 
Enhance thread awareness handler so normal replies with thread disabled will be visible in te appropriate thread
Fix conflicts
 2022-03-10 17:51:02 +02:00
Michael Kaye
9e5ff1785a Compile tests on PR, to ensure we don't break the build when merging. 2022-03-10 15:50:02 +00:00
ericdecanini
628a160c3a Reverts timestamp condition but changes timing of setting closedTime 2022-03-10 16:32:42 +01:00
ericdecanini
080844dc9d Removes event timestamp condition for sdk poll voting 2022-03-10 16:28:22 +01:00
Onuray Sahin
cd29b1aa4b Add poll test for users vote different options. 2022-03-10 17:40:16 +03:00
Benoit Marty
66f76fbea3
Merge pull request #5450 from SpiritCroc/fix-5448 
Fix missing messages when forward paging with chunks > 50 messages
 2022-03-10 15:08:58 +01:00
Benoit Marty
dfc440b904
Merge pull request #5502 from vector-im/cgizard/ISSSUE-5501 
Use ColorPrimary for attachmentGalleryButton tint
 2022-03-10 15:02:08 +01:00
Onuray Sahin
a5441fdf22 Add poll test for someone else chose the same option. 2022-03-10 16:51:23 +03:00
ericdecanini
a5af4783cc Renames mapToSpaceChildInfoList to mapSpaceChildren in DefaultSpaceService 2022-03-10 14:41:44 +01:00
Claire G
8f0d6a1adc use colorPrimary for tint 2022-03-10 14:30:15 +01:00
Benoit Marty
551b827753
Merge pull request #5384 from p1gp1g/bubble-space 
Add padding before first own message
 2022-03-10 14:09:23 +01:00
Michael Kaye
621df9d1b1
Merge pull request #5498 from vector-im/michaelk/setup-matrix-synapse 
Swap to using github action to configure synapse server in CI builds
 2022-03-10 12:50:50 +00:00
Onuray Sahin
f029759f9a Add poll test for changing previous answer. 2022-03-10 15:47:40 +03:00
SpiritCroc
10c77f2b59 Don't reserve space for typing view until somebody is typing 
Once we show it, keep it, to not make the timeline jump around too much.

Change-Id: I8f863d8d21f3b06ff86f62615d8e6aefe81bde2e
 2022-03-10 13:42:48 +01:00
Onuray Sahin
1b348401bd Add poll test for a single vote. 2022-03-10 15:31:32 +03:00
Benoit Marty
c339e10c07
Merge pull request #5436 from vector-im/feature/nfe/space_highlight 
change selected space highlight
 2022-03-10 13:28:08 +01:00
SpiritCroc
27fd6a2819 Automatic SchildiChat string correction 
Change-Id: I728d41658c2b1148b40644e28b67016f5e420c70
 2022-03-10 13:26:54 +01:00
SpiritCroc
db3891b4c3 Automatic upstream merge postprocessing 
Change-Id: I60e8f659740659d74f1d918525abff353d5f2cfc
 2022-03-10 13:26:53 +01:00
SpiritCroc
8f93b55b59 Automatic color correction 
Change-Id: I0ac188dce1148b8defeaffd70062691a8ee2e9da
 2022-03-10 13:26:52 +01:00
SpiritCroc
f5afdefe2f Merge tag 'v1.4.4' into sc 
Change-Id: Ibfb35ec30a51abebb652044719417f62c8a6be50

Conflicts:
	library/ui-styles/src/main/res/values/dimens.xml
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/SyncTask.kt
	vector/src/gplay/java/im/vector/app/gplay/push/fcm/VectorFirebaseMessagingService.kt
	vector/src/main/AndroidManifest.xml
	vector/src/main/java/im/vector/app/features/home/HomeDetailFragment.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewState.kt
	vector/src/main/java/im/vector/app/features/rageshake/BugReporter.kt
	vector/src/main/res/drawable/bg_unread_notification.xml
	vector/src/main/res/drawable/ic_add_reaction_small.xml
	vector/src/main/res/layout/item_room.xml
	vector/src/main/res/layout/item_timeline_event_text_message_stub.xml
	vector/src/main/res/xml/vector_settings_preferences.xml
 2022-03-10 13:26:09 +01:00
SpiritCroc
7437d621b2 [TMP] Automatic upstream merge preparation 
Change-Id: I0d2270e32eca2d08e9fb1479cf3081af92d2b796
 2022-03-10 13:09:24 +01:00
SpiritCroc
373d88885e Automatic revert to unchanged upstream strings, pt.1 
Change-Id: I1c7b6a48f886c7c4664ebf81252f84c1aaa5930b
 2022-03-10 13:09:23 +01:00
SpiritCroc
98ec8b4842 FooteredTextView: Fix reserving footer width when forcing footer below 
Change-Id: Iea91960f6bcbdc0af4956a65a04d926b98f0d580
 2022-03-10 13:08:18 +01:00
Benoit Marty
d83d5f9828
Merge pull request #5467 from vector-im/feature/bma/unused_resources_all 
Remove unused resources
 2022-03-10 13:03:27 +01:00
SpiritCroc
b3d9ddbeca Do not cut italic text, v2 
Different implementaion than the one which got lost during a recent
upstream merge

Change-Id: Ic4b0474bd95a9746cfecc8aff8562c330e296b5a
 2022-03-10 12:48:17 +01:00
SpiritCroc
7bfd3c8dca [TMP] Add some debugging to detect timeline inconsistencies 
Note: may affect performance a little when loading the timeline, so
better revert when we are confident we have fixed the issue.

Change-Id: Ic4d31e47948984371a02ce51af7a8d56cb120234
 2022-03-10 12:36:00 +01:00
Michael Kaye
70fbcec093 Update to latest setup-matrix-synapse 2022-03-10 11:31:44 +00:00
Onuray Sahin
fd3e5128c7 Test initial poll event. 2022-03-10 14:30:03 +03:00
ericdecanini
a891f59397 Replaces lateinit var with passing params 2022-03-10 12:02:25 +01:00
ariskotsomitopoulos
21111922e6 Merge branch 'develop' into feature/aris/thread_live_thread_list 
# Conflicts:
#	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/relation/threads/FetchThreadTimelineTask.kt
#	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/handler/room/RoomSyncHandler.kt
 2022-03-10 12:55:13 +02:00
ariskotsomitopoulos
fd30d38603 Fix line length 2022-03-10 12:51:40 +02:00
Michael Kaye
029ccfa37f Add names to all jobs 2022-03-10 10:24:41 +00:00
Michael Kaye
5ec8a2b36d Add some color to the nightly summary. 2022-03-10 10:24:41 +00:00
Michael Kaye
314f32ed45 If a FileNotFound exception occurs, log a simple message indicating the tests may 
have not run.
 2022-03-10 10:24:41 +00:00
Benoit Marty
fbc3b15df4
Merge pull request #5492 from vector-im/gradlew-update-7.4.1 
Update Gradle Wrapper from 7.4 to 7.4.1
 2022-03-10 11:16:39 +01:00
Benoit Marty
ce4ad8819a
Merge pull request #5380 from vector-im/feature/bca/crypto_fix_rolling_uisi 
Refactoring for safer olm and megolm session usage
 2022-03-10 11:13:07 +01:00
ariskotsomitopoulos
45ee9f85e5 Check if the server supports MSC3440 using the stable flag from /versions api 2022-03-10 12:07:05 +02:00