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

15759 commits

This branch
This branch
All branches
Author SHA1 Message Date
Benoit Marty
c3ac054634
Merge pull request #5518 from vector-im/bmarty-patch-1 
Add space between icon and name
 2022-03-11 16:47:59 +01:00
Benoit Marty
97f30ef7c1
Merge pull request #5520 from vector-im/feature/bma/fix_test_warnings 
Fix all warnings in file E2eeSanityTests.kt
 2022-03-11 16:47:25 +01:00
Benoit Marty
fa104adefc Fix all warnings in file E2eeSanityTests.kt 2022-03-11 15:35:21 +01:00
Benoit Marty
02ea1c0e7c
Add space between icon and name 
Also remove extra space for the text_template
 2022-03-11 14:39:38 +01:00
SpiritCroc
8d04a48157 Fix ChunkEntity.isMoreRecentThan() if both chunks linked to last forward 
Imagine scenario:

[this] -> [chunkToCheck] -> [lastForwardChunk]

Then, both `isLastForward` checks will not return, and also the `chunkToCheck.doesNextChunksVerifyCondition { it == this }` will return false.
Since both chunks are connected to the last forward chunk, `isMoreRecent()` will still return `true`, which is wrong in this case.
So do not only check if chunkToCheck has this as any of the next chunks, but also the other way round.

Change-Id: I98727d85837e9b38a42297568df82f957b3a2dca
 2022-03-11 11:29:43 +01:00
SpiritCroc
24133ba7b5 isReadMarkerMoreRecent(): use helper to properly compare chunks 
Change-Id: I878b8145d3a9c85ea815f369e5d8f810343c8f62
 2022-03-11 11:29:39 +01:00
cfriedlander
3ef2f824e8 add presence indicator online 2022-03-11 11:10:11 +01:00
Benoit Marty
25cfc7e05f
Merge pull request #5506 from vector-im/michaelk/build_tests_on_pr 
Compile tests on PR, to ensure we don't break the build when merging. Alert if we merge and the build fails.
 2022-03-11 10:15:04 +01:00
SpiritCroc
6aabb38c3b [TMP] Update some readmarker debugging 
Change-Id: Ia1de156f39622d90cc1433f0b16776bd00e2a462
 2022-03-11 10:04:40 +01:00
Benoit Marty
d0a24afa5a
Merge pull request #5510 from vector-im/dependabot/gradle/com.googlecode.libphonenumber-libphonenumber-8.12.45 
Bump libphonenumber from 8.12.44 to 8.12.45
 2022-03-11 09:47:26 +01:00
Michael Kaye
9a112bb010 Remove confetti from build failed message. 
(there will be red icons if the build has failed in the body anyway)
 2022-03-11 08:45:27 +00:00
Michael Kaye
400a47c39b Only run one gradlew build for all tests, do not split by project 2022-03-11 08:45:04 +00:00
Onuray Sahin
8b08d3db25 Fix poll test for users vote different options. 2022-03-11 11:36:06 +03:00
SpiritCroc
12e4853c59 [TMP] More missing message debugging 
Change-Id: Ia6ad08fa6a51365ba6f4e5a880f9ce804f3026c5
 2022-03-11 08:50:17 +01:00
dependabot[bot]
2d5638baaf
Bump libphonenumber from 8.12.44 to 8.12.45 
Bumps [libphonenumber](https://github.com/google/libphonenumber) from 8.12.44 to 8.12.45.
- [Release notes](https://github.com/google/libphonenumber/releases)
- [Changelog](https://github.com/google/libphonenumber/blob/master/making-metadata-changes.md)
- [Commits](https://github.com/google/libphonenumber/compare/v8.12.44...v8.12.45)

---
updated-dependencies:
- dependency-name: com.googlecode.libphonenumber:libphonenumber
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-03-10 23:09:19 +00:00
ericdecanini
7226864cc9 Improves code formatting in ResolveSpaceInfoTask 2022-03-10 21:41:17 +01:00
Benoit Marty
eb7eb1aac8
Merge pull request #5505 from vector-im/feature/bma/must_be_tinted 
Add colors for shield vector drawable
 2022-03-10 20:39:29 +01:00
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
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
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