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

4468 Commits

Author SHA1 Message Date
Aris Kotsomitopoulos 3c06d56b87
Merge pull request #5627 from vector-im/feature/aris/threads_summary_event_redaction 
Thread redaction will now update the thread summary counter
 2022-03-31 16:21:35 +03:00
Benoit Marty 9a2cc1a4c5
Merge pull request #5664 from vector-im/feature/bma/dep_upgrade 
Upgrade Jitsi and ktlint
 2022-03-31 11:32:14 +02:00
ariskotsomitopoulos f58f3ad6d9 Refactoring 2022-03-29 14:28:57 +03:00
Adam Brown 1b2e3502cb
Merge pull request #5628 from vector-im/feature/adm/direct-login-tests 
Direct login tests
 2022-03-29 11:44:11 +01:00
ariskotsomitopoulos 2938fa92c0 Rename countThreads method 2022-03-29 11:58:11 +03:00
Benoit Marty ff1fb63bf6 Fix some ktlint issues, ignore some others 2022-03-28 18:22:04 +02:00
ganfra ebee66cfaf Update versions to 1.4.10 2022-03-28 16:37:24 +02:00
ClaireG a9b87de7a3
[Subscribing] Blank display name 2022-03-28 10:34:22 +02:00
Adam Brown 230c37597c adding happy path tests for the direct login use case 2022-03-25 11:15:05 +00:00
Eric Decanini 10974366fb
Merge pull request #5473 from vector-im/bugfix/eric/voting-ended-poll 
Fixes ended poll voting
 2022-03-24 20:23:38 +01:00
ganfra 3410e75790 Merge tag '1.4.7' into develop 2022-03-24 19:34:14 +01:00
ganfra 04b136e3e4 RoomList: more fixes on count 2022-03-24 18:50:33 +01:00
ganfra 745382cdfa RoomList : avoid using flow extension on realm results (leads to frozen object and leaks). 2022-03-24 15:41:42 +01:00
ganfra 70e5698082 Update versions to 1.4.7 2022-03-24 15:41:35 +01:00
ariskotsomitopoulos 3c7495bd60 Thread redaction will now update the thread summary counter 
Root threads with 0 threads replies will become normal messages and removed from thread summaries
 2022-03-24 16:28:49 +02:00
ericdecanini edfe81cc2b Merge remote-tracking branch 'origin/develop' into bugfix/eric/voting-ended-poll 
# Conflicts:
#	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/MessageItemFactory.kt
 2022-03-24 14:40:28 +01:00
Adam Brown e7a1c20132 handling the username in use as a username field error 2022-03-23 17:29:06 +00:00
Adam Brown 5aa35899bc extracting error cases to extensions and handles invalid username as a specific case 2022-03-23 17:29:06 +00:00
Adam Brown 373385b29f moving the not accepting registration error handling to the login fragment 2022-03-23 17:29:06 +00:00
ganfra adf2c642da Update versions to 1.4.8 2022-03-23 16:27:36 +01:00
Benoit Marty 012cdf4b4d runBlocking -> runTest 
https://github.com/Kotlin/kotlinx.coroutines/blob/master/kotlinx-coroutines-test/MIGRATION.md
 2022-03-22 16:52:18 +01:00
Benoit Marty 86829008c3 runBlockingTest -> runTest 
https://github.com/Kotlin/kotlinx.coroutines/blob/master/kotlinx-coroutines-test/MIGRATION.md
 2022-03-22 16:39:39 +01:00
Benoit Marty 03fee2a131 The `.exhaustive` trick is not needed anymore in Kotlin 1.6.0 
https://kotlinlang.org/docs/whatsnew16.html#stable-exhaustive-when-statements-for-enum-sealed-and-boolean-subjects
 2022-03-22 16:14:15 +01:00
Benoit Marty 7502158ba9 Fix compilation warning (exhaustive when) 2022-03-22 16:13:06 +01:00
ganfra 073475854e
Merge pull request #5564 from SpiritCroc/timeline-chunk-double-linking 
Fix another case of read markers not updating: Ensure proper double linking of TimelineChunks
 2022-03-22 15:46:48 +01:00
ganfra a2f64e7f3c
Merge pull request #5576 from vector-im/feature/aris/thread_labs_notice_users 
Threads Migration
 2022-03-22 14:57:07 +01:00
ericdecanini 7449d15d2f Merge remote-tracking branch 'origin/develop' into bugfix/eric/voting-ended-poll 
# Conflicts:
#	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/MessageItemFactory.kt
 2022-03-22 14:15:29 +01:00
ariskotsomitopoulos c6593f0cee PR remarks 2022-03-22 13:57:20 +02:00
ariskotsomitopoulos a431d885f0 Increase the thread summaries limit 2022-03-22 11:20:47 +02:00
ganfra 794131d274
Merge pull request #5551 from SpiritCroc/local-echo 
Fix local echos not being shown when re-opening rooms
 2022-03-21 19:24:07 +01:00
ariskotsomitopoulos e574fda099 Remove unused import 2022-03-18 14:55:14 +01:00
ariskotsomitopoulos 06db7e2374 Enhance migration logic & PR remarks 2022-03-18 14:51:06 +01:00
ariskotsomitopoulos fd4d99d6fc Possible NullPointerException crash fix 2022-03-18 14:50:34 +01:00
Valere 189683a8a1
Merge pull request #5552 from SpiritCroc/timeline-decryptor-crash 
Fix crash when closing room during timeline decryption
 2022-03-18 11:34:27 +01:00
ariskotsomitopoulos a0e6dd5f6c Merge branch 'develop' into feature/aris/thread_labs_notice_users 
# Conflicts:
#	matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/MatrixConfiguration.kt
#	vector/src/main/java/im/vector/app/core/di/SingletonModule.kt
 2022-03-18 11:28:21 +01:00
ariskotsomitopoulos 2ca3387ab3 Migrate Threads and notify user 2022-03-17 18:51:54 +01:00
Arnaud Ringenbach 7593f7a2c6 Fix lint issues 2022-03-17 17:15:16 +01:00
Arnaud Ringenbach d3459d1d3d Use MatrixConfiguration & move presence sync enabled checks out of view 2022-03-17 14:50:15 +01:00
ericdecanini fbb6f117d0 Fixes remote echo of end poll not processing correctly 2022-03-17 13:47:57 +01:00
Eric Decanini 9c8f29e853 Merge branch 'develop' into bugfix/eric/voting-ended-poll 2022-03-17 12:07:45 +01:00
Arnaud Ringenbach 4bcf31e0c2 Add a presence sync enabling build config 2022-03-17 11:43:07 +01:00
SpiritCroc 91259bef40 Ensure proper double linking of TimelineChunks 
We need both directions so getOffsetIndex() produces correct results in
all cases.
 2022-03-17 11:34:20 +01:00
ariskotsomitopoulos eee1ec1423 Merge branch 'develop' into feature/aris/threads_analytics 2022-03-16 13:19:08 +01:00
ariskotsomitopoulos 60db2e424e Merge branch 'develop' into feature/aris/threads_analytics 2022-03-16 13:01:09 +01:00
SpiritCroc a994f859e1 Fix crash when closing room during timeline decryption 2022-03-16 10:19:01 +01:00
SpiritCroc 856f25f684 Fix local echos not being shown when re-opening rooms 2022-03-15 19:34:04 +01:00
Maxime NATUREL 9ef235f3d7
Merge pull request #5479 from vector-im/feature/mna/PSF-735-pinned-location 
#5417: Pinned location sharing
 2022-03-15 17:40:21 +01:00
aringenbach a7639f4424
Merge pull request #5544 from vector-im/aringenbach/5521_permalink_base_url_mention 
Fix mentions using matrix.to rather than client defined permalink base url
 2022-03-15 17:28:16 +01:00
Maxime Naturel f495150b4e Fixing asset type representation 2022-03-15 17:09:31 +01:00
Maxime Naturel 04405c7970 Distinguish user location and pinned location sharing 2022-03-15 17:09:30 +01:00