filippodb
/
SchildiChat-android
mirror of https://github.com/SchildiChat/SchildiChat-android.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
15,247 Commits 7 Branches 122 Tags 228 MiB
Commit Graph

15247 Commits

Author SHA1 Message Date
Michael Kaye b25d11244b
Merge pull request #5413 from vector-im/michaelk/code_cov_alt 
Code coverage using jacoco (and xml report)
 2022-03-07 13:31:51 +00:00
Michael Kaye f32da28285 Ignore ThreadMessagingTest as it seems to cause other integration tests to fail. 2022-03-07 13:14:38 +00:00
Michael Kaye 2b7b7521a9 Maybe the file is here? 2022-03-07 10:26:25 +00:00
SpiritCroc 22d034566b Do not offset text with inline code snippets 
Change-Id: Id1573c55f4e719e4659aacd76a4416a38db5d9eb
 2022-03-06 10:36:31 +01:00
SpiritCroc 9d64a14ff7 Revert back to search icon for room list filter for now 
Until a global search exists, users are more likely to think "search
for a room" instead of "filter the room list by room name"

Change-Id: Ic0d07bcd0b64c92ad180c33a5740a4a98f94f625
 2022-03-06 09:56:31 +01:00
SpiritCroc c402e6d637 Add comment to schildichat:// intent filter 
Change-Id: I155217f592d9af885cda51d1baf410c472c97a4a
 2022-03-06 09:47:55 +01:00
Andrew Ryan c3fbaaa3aa Support schildichat:// links 
We want to suppot schildichat:// links in addition to element:// links.

This change adds support for schildichat:// links of the same format as
the element links.
 2022-03-05 09:56:13 -08:00
Michael Kaye 8e39247c4d I give up for the weekend 2022-03-04 18:00:20 +00:00
Michael Kaye 1ad3e7cc9d Frustration at artifact handling vs what's in docs. 2022-03-04 16:35:46 +00:00
Ahmed Radhouane Belkilani bcdf004082
Update the top bar in a room (#5213) 
Remove typing message notification from room toolbar.

Signed-off-by: Ahmed Radhouane Belkilani <arbelkilani@gmail.com>
 2022-03-04 16:38:53 +01:00
Michael Kaye 57bbec4ffd
Merge pull request #5388 from vector-im/michaelk/format_unit_test_results 
Format unit test results
 2022-03-04 15:29:15 +00:00
Michael Kaye 96168929ff Tweak upload/download of codecov xml file 2022-03-04 15:15:52 +00:00
Michael Kaye 2dedad1cf2 Address review points from adam 2022-03-04 15:03:12 +00:00
Michael Kaye 662f72fde8 Remove unneeded code, retaining a comment for how to exclude certain projects 2022-03-04 15:01:24 +00:00
SpiritCroc 37a68b4367 [merge] Fix ic_add_reaction color 
Change-Id: Ieeff366c672499ed14291fe64338bd0d41332585
 2022-03-04 12:11:30 +01:00
SpiritCroc 3d57cb880c Unread line: follow unread counter color 
Change-Id: Ia3cd51364517276cfc438fe0f7700d11de7ff00a
 2022-03-04 11:57:58 +01:00
SpiritCroc 0a4f07f07f Automatic SchildiChat string correction 
Change-Id: I3b93d37a7ac0874203cb10e16693476c01b5fe5b
 2022-03-04 11:43:01 +01:00
SpiritCroc d77c42f8c1 Automatic upstream merge postprocessing 
Change-Id: Iaf674a4d25857de93b86e4162b51688ed113553f
 2022-03-04 11:43:00 +01:00
SpiritCroc 161780899e [merge] Make unread indicator accent color as before 
Change-Id: I511adcfd2be159f1ba392525af6e60196a774901
 2022-03-04 11:42:49 +01:00
SpiritCroc 2f5df9133f Merge tag 'v1.4.2' into sc 
Change-Id: I8a96211645ff31284897d818ce93c7b5571fbd0f

Conflicts:
	library/ui-styles/src/main/res/values/styles_timeline.xml
	library/ui-styles/src/main/res/values/theme_black.xml
	library/ui-styles/src/main/res/values/theme_dark.xml
	library/ui-styles/src/main/res/values/theme_light.xml
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/RealmCryptoStoreMigration.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt
	vector/src/main/java/im/vector/app/features/home/HomeDrawerFragment.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewState.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/TimelineEventController.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/MergedHeaderItemFactory.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/detail/timeline/item/AbsBaseMessageItem.kt
	vector/src/main/java/im/vector/app/features/html/PillImageSpan.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/res/layout/item_room.xml
	vector/src/main/res/values/config.xml
 2022-03-04 11:42:30 +01:00
SpiritCroc ab9bf0cb7d [TMP] Automatic upstream merge preparation 
Change-Id: I643396f8586b594412dbd97284256165fd843f7b
 2022-03-04 10:48:35 +01:00
SpiritCroc 5331ad8911 Automatic revert to unchanged upstream strings, pt.1 
Change-Id: I2cf821d62dab6a1c5bcbf7a3c124e57bd49ab60e
 2022-03-04 10:48:35 +01:00
Michael Kaye d4bf38f428
Merge pull request #5391 from vector-im/michaelk/sonaqube_nightly 
Run sonarqube as part of nightly build
 2022-03-04 09:25:18 +00:00
SpiritCroc dd0037509e Apply corner roundness to image-related drawables 
Background outline and time overlay

Change-Id: If6715bf11489609a9ad2aad831db9ee608c803b6
 2022-03-04 10:21:40 +01:00
SpiritCroc b56c1a3b0c Fix image corner radius for SC bubbles 
Change-Id: I8cb2515f3f7985cf12ecc2b4a368f663cacfc0d0
 2022-03-04 10:06:16 +01:00
ClaireG 2a9e582db5
Merge pull request #5405 from vector-im/cgizard/ISSUE-5402 
[Create private room] Picture doesn't not displayed
 2022-03-03 22:40:26 +01:00
Michael Kaye 2d5b25cfad Remove the printing of file name to the log as it's doubling up information. 2022-03-03 20:39:41 +00:00
Michael Kaye 9fe04ac5b8 Remove exclusions (for now). 
We can merge this PR without and re-add afterwards the only ones we want.
 2022-03-03 20:26:33 +00:00
Michael Kaye cb32124fd4 Fix typo in name of action 2022-03-03 18:28:13 +00:00
Benoit Marty 1690a0b2cf
giving avatar/display name error dialogs human readable error messages (#5419) 
- reuses the ErrorDialog logic which translates exceptions to human readable strings
 2022-03-03 18:29:39 +01:00
Adam Brown 54e23a2c55 giving avatar/display name error dialogs human readable error messages 
- reuses the ErrorDialog logic which translates exceptions to human readable strings
 2022-03-03 16:37:59 +00:00
Michael Kaye 76844b1572 Run codecoverage and pass to sonarqube upload for processing. 2022-03-03 16:34:54 +00:00
Michael Kaye 49fbfe6811 Better codecov based on ouchadam's suggestion 2022-03-03 16:34:54 +00:00
Michael Kaye 105f3dd93d Correct name of environment variable 2022-03-03 16:34:26 +00:00
SpiritCroc fe5eaece47 Setting for more rounded bubbles 
Closes https://github.com/SchildiChat/SchildiChat-android/issues/48

Change-Id: I51dabc18c1542dcd4b8d12769fe1cc76573441c5
 2022-03-03 17:20:06 +01:00
Michael Kaye 3364868365 Use environment variable that is tied to project property 2022-03-03 15:05:39 +00:00
Yoan Pintas 6e6b04c57e
Merge pull request #4498 from vector-im/yostyle/fix_strandhogg 
Override task affinity to prevent unknown activities running in our app tasks.
 2022-03-03 15:05:29 +01:00
Benoit Marty 7a1322baf7
Merge pull request #5415 from vector-im/feature/adm/missing-allowed-depenency-groups 
Adding missing dependency allowances
 2022-03-03 14:57:37 +01:00
Adam Brown 16a31e1716 adding new dependency allowances for latest dependency upgrades 2022-03-03 13:47:19 +00:00
Benoit Marty dd0d2e8101
Merge pull request #5383 from vector-im/dependabot/gradle/com.google.android.gms-oss-licenses-plugin-0.10.5 
Bump oss-licenses-plugin from 0.10.4 to 0.10.5 - REQUIRE HUMAN INTERVENTION
 2022-03-03 11:55:00 +01:00
Michael Kaye 0ce787f20b Ensure we run on java 11 on macos 2022-03-03 10:51:00 +00:00
Michael Kaye fd065dbbb9 Update build.gradle 
Note password secret name.
 2022-03-03 10:51:00 +00:00
Michael Kaye 5ea917f74b jobs.step.env is a map not a list 2022-03-03 10:51:00 +00:00
Michael Kaye 82e0f4a1a9 Run sonarqube as part of nightly build 2022-03-03 10:51:00 +00:00
Benoit Marty 840742ce71 Lint: "MissingQuantity" -> warning 2022-03-03 10:22:59 +01:00
SpiritCroc 20ba02db57 [TMP] Raise sync logging level 
So we get these in rageshakes

Change-Id: I1efb8dd759cd03607ade0611c92a87df1b20c7f3
 2022-03-03 08:55:34 +01:00
SpiritCroc ad3beec3cf [merge] Make url previews utilize maximum width again 
Change-Id: Ib0e6bbb2d898553f23c4d51a8c3e0242c6197bb8
 2022-03-03 08:52:24 +01:00
SpiritCroc 8afa535fe6 [merge] Fix minimum bubble width for long sender names 
Change-Id: I32aa8b8dfc40ce29e2414f04ae8933a836d9ebc3
 2022-03-03 08:48:38 +01:00
Benoit Marty 4396390409 Fix lint error (false positive, but anyway, not used) 2022-03-02 22:14:54 +01:00
Benoit Marty 7024ccb244
Merge pull request #5409 from vector-im/feature/adm/test-compilation-error 
Fixing unit test compilation error
 2022-03-02 21:25:23 +01:00