filippodb
/
SchildiChat-android
mirror of https://github.com/SchildiChat/SchildiChat-android.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
14,212 Commits 6 Branches 120 Tags 228 MiB
Commit Graph

14212 Commits

Author SHA1 Message Date
ariskotsomitopoulos c9f07061ef Revert temporary fix for develop crash 2022-03-15 11:26:00 +01:00
ariskotsomitopoulos d7c486c55e Add fallback support rendering proposed in MSC3676 2022-03-14 16:04:08 +01:00
ariskotsomitopoulos d894d8598c Format text 2022-03-14 12:44:25 +01:00
ariskotsomitopoulos fef36d9334 Temporarily fix develop crash 2022-03-14 12:25:11 +01:00
ariskotsomitopoulos d215f03798 Merge branch 'develop' into feature/aris/thread_live_thread_list 2022-03-14 12:02:04 +01:00
ariskotsomitopoulos c2ec7cfa0f Add more clear documentation 2022-03-14 11:54:29 +01:00
Michael Kaye acfeb7ff65
Merge pull request #5523 from vector-im/michaelk/concurrency_issue 
Use different tags for unit tests and android test compilation.
 2022-03-11 17:47:24 +00:00
Michael Kaye 9a532fc47f Use different tags for unit tests and android test compilation. 
Otherwise we will cancel one in favour of the other.
 2022-03-11 16:47:40 +00:00
Benoit Marty c89554c3f6
Merge pull request #5443 from vector-im/task/eric/stable-hierarchy-endpoint 
Changes room hierarchy endpoint to stable
 2022-03-11 17:05:13 +01:00
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
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
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
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
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
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
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
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
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
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
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
Michael Kaye 70fbcec093 Update to latest setup-matrix-synapse 2022-03-10 11:31:44 +00: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
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
ariskotsomitopoulos 03f293f216 Remove io.element.thread and add stable m.thread prefix 2022-03-10 12:06:02 +02:00
Benoit Marty 0122d8f933 Make comment about ignoring UnusedResources more valuable 2022-03-10 10:23:18 +01:00
gradle-update-robot 89db6a065d Update Gradle Wrapper from 7.4 to 7.4.1. 
Signed-off-by: gradle-update-robot <gradle-update-robot@regolo.cc>
 2022-03-10 00:17:17 +00:00
Adam Brown d3fc3791bc Merge branch 'main' into develop 2022-03-09 21:33:16 +00:00
Adam Brown 9e8067dd19
Merge pull request #5484 from vector-im/feature/aris/fix_realm_crash_1_4_4 
Fix realm crash on v1.4.4
 2022-03-09 18:55:12 +00:00
Michael Kaye e9fe4630f1 Swap to using github action to configure server 2022-03-09 18:26:37 +00:00