mirrors/SchildiChat-android
1
0
Fork 0
mirror of https://github.com/SchildiChat/SchildiChat-android.git synced 2024-11-29 06:28:45 +03:00
Code Issues Projects Releases Packages Wiki Activity
22601 commits 6 branches 120 tags 229 MiB
Commit graph

22601 commits

This branch
This branch
All branches
Author SHA1 Message Date
SpiritCroc
1c335194cf Still show threads as replies when threads are disabled 
Change-Id: Id08fd8be12bb7bfc589d21989ae96f9457961d15
 2022-12-17 15:17:43 +01:00
SpiritCroc
7a83a44077 Fix threaded message rendering rich reply when they shouldn't 
Change-Id: I5a1c1d177d896d203f2420bdd1536dfcbbd460d6
 2022-12-17 11:34:52 +01:00
SpiritCroc
aa9e0bc627 Add read receipt debugging 
Change-Id: I2cd0b5feb23962bc36295380fe3e77346f0ea694
 2022-12-17 11:34:39 +01:00
SpiritCroc
ed3049f04e Update Schildi help link 
Change-Id: I56c195734c453b08bbec018b8bbbb8e14af08f75
 2022-12-16 22:31:14 +01:00
SpiritCroc
1eacd0cca3 Make it harder to not find "initial sync" option in settings 
Change-Id: Iff49485ebe036a14bf03e274791275d5ff27d864
 2022-12-16 13:00:13 +01:00
SpiritCroc
987ca6dec4 Revert "stop listening timeline collection changes when app is not resumed (#7734)" 
This makes the chat view get destroyed onPause, leading to
jump-to-bottom when clicking links, opening threads etc.

This reverts commit cf59c80100.

Change-Id: I56ae7027d0488013251bc88edd0e47a19dead315
 2022-12-16 12:59:47 +01:00
SpiritCroc
05fc840b3b [merge] Fix gplay build 
Change-Id: I1fe6ca3a1b2e4355377da9e508b56c4e44eb7c26
 2022-12-15 11:45:48 +01:00
SpiritCroc
f6801a5be0 Revert "[TMP] merge_helpers.sh: Hardcode develop branch" 
This reverts commit d13494aa67.
 2022-12-15 11:02:24 +01:00
SpiritCroc
6fc5f6d378 Automatic SchildiChat string correction 
Change-Id: I81f8f9f911bc69dad440d782c3afc3349995704d
 2022-12-15 11:02:21 +01:00
SpiritCroc
b9d18a94fc Automatic upstream merge postprocessing 
Change-Id: I2512edeb09524f862eff2c0f287556d99e85aae8
 2022-12-15 11:02:20 +01:00
SpiritCroc
330f0cf5cc Merge tag 'v1.5.12' into sc 
Change-Id: I4c53d64845ee05ff395e5df436a0739c87798737

Conflicts:
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryUpdater.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/accountdata/AccountDataAPI.kt
	vector-app/build.gradle
	vector-app/src/gplay/java/im/vector/app/nightly/FirebaseNightlyProxy.kt
	vector-config/src/main/res/values/config-settings.xml
	vector/src/main/java/im/vector/app/features/home/room/detail/TimelineFragment.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/composer/MessageComposerFragment.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/format/DisplayableEventFormatter.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/format/NoticeEventFormatter.kt
	vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryItemFactory.kt
	vector/src/main/java/im/vector/app/features/notifications/NotificationUtils.kt
 2022-12-15 11:01:52 +01:00
SpiritCroc
5d30146a4b [TMP] Automatic upstream merge preparation 
Change-Id: If24c33d54a205bcd5721ad620725e9c2bf7ca7b3
 2022-12-15 10:39:04 +01:00
SpiritCroc
243af7358f Automatic revert to unchanged upstream strings, pt.1 
Change-Id: I03f5d0d1693253d23b9cd25b57228a288ca83a99
 2022-12-15 10:39:04 +01:00
SpiritCroc
d13494aa67 [TMP] merge_helpers.sh: Hardcode develop branch 
Change-Id: I3aecb7aae1d16b0f578a15b6271d2e66bc443cea
 2022-12-15 10:38:32 +01:00
Benoit Marty
7341e5c47b Merge branch 'release/1.5.12' into main 2022-12-15 10:18:25 +01:00
Benoit Marty
cf1a115c67 Merge branch 'release/1.5.12' into main 2022-12-15 10:16:25 +01:00
Benoit Marty
dd88ac597e Adding fastlane file for version 1.5.12 2022-12-15 10:16:02 +01:00
Benoit Marty
82ad08aced Changelog for version 1.5.12 2022-12-15 10:15:24 +01:00
Nikita Fedrunov
cf3abd6562
thread list loading (#7766) 2022-12-14 18:56:16 +01:00
Yoan Pintas
c74ea2dd16
Merge pull request #7719 from vector-im/feature/fre/voice_broadcast_last_message 
Voice Broadcast - Update last message in the room list
 2022-12-14 17:39:42 +01:00
Nikita Fedrunov
e0a611a16e
changed copy for threads labs flag (#7776) 2022-12-14 15:13:24 +01:00
Maxime NATUREL
fe5e4d6830
Merge pull request #7757 from vector-im/fix/mna/poll-end-not-recognized 
[Poll] Poll end event is not recognized (PSG-948 and PSG-949)
 2022-12-13 17:08:01 +01:00
Maxime NATUREL
851276978f Remove unused import 2022-12-13 15:47:30 +01:00
Maxime NATUREL
96e29d4d10 Renaming the name of the test file be consistent 2022-12-13 15:46:14 +01:00
Maxime NATUREL
71df1e61d4 Remove non necessary call when getting the targeted event id 2022-12-13 15:45:46 +01:00
Nikita Fedrunov
3dadebe505
threads are enabled by default end forced to enabled for existing users (#7775) 2022-12-13 14:02:45 +01:00
dependabot[bot]
4657729e36
Bump dependency-check-gradle from 7.3.0 to 7.4.1 (#7759) 
Bumps dependency-check-gradle from 7.3.0 to 7.4.1.

---
updated-dependencies:
- dependency-name: org.owasp:dependency-check-gradle
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2022-12-13 12:41:17 +00:00
Valere
d05e10e10a
crypto migration tests (#7645) 
Crypto migration tests

Co-authored-by: Benoit Marty <benoitm@matrix.org>
 2022-12-13 11:38:49 +01:00
SpiritCroc
c626100ae1 Disable unnecessary reply fallback processing 
We have rich replies!

Change-Id: Ifc5f41471f32e0a60e23f41c7fa9a51f25865d77
 2022-12-13 10:43:01 +01:00
Onuray Sahin
250bd9c620
Merge pull request #7754 from vector-im/feature/ons/remove_client_information_account_data 
Delete unused client information from account data (PSG-871)
 2022-12-13 11:10:41 +03:00
Nikita Fedrunov
4e0c3a97bd
thread message notification should navigate to thread timeline (#7771) 2022-12-12 22:35:09 +01:00
Hugh Nimmo-Smith
34ee399f94
Merge pull request #7737 from vector-im/bugfix/hughns/qr-server-change 2022-12-12 18:21:39 +00:00
Hugh Nimmo-Smith
0ffc2af679 Update test to work with new state 2022-12-12 17:32:28 +00:00
Onuray Sahin
9954045d30
Merge pull request #7740 from vector-im/feature/ons/remove_account_data 
Handle account data removal (PSG-865, PSG-867)
 2022-12-12 19:31:16 +03:00
Hugh Nimmo-Smith
f111a84e17 More unit test fix 2022-12-12 16:30:35 +00:00
Hugh Nimmo-Smith
096e52612e More fix up of unit tests 2022-12-12 16:30:35 +00:00
Hugh Nimmo-Smith
643b09a77c Fix up unit tests 2022-12-12 16:30:35 +00:00
Hugh Nimmo-Smith
1437f6d41d Remove unused bad function call 2022-12-12 16:30:35 +00:00
Hugh Nimmo-Smith
006e2b5c0d Changelog 2022-12-12 16:30:35 +00:00
Hugh Nimmo-Smith
21cbe52740 Lint 2022-12-12 16:30:34 +00:00
Hugh Nimmo-Smith
1930047ce1 Fix issue of QR not being offered where domain is entered instead of homeserver 2022-12-12 16:30:34 +00:00
Onuray Sahin
8c6c2dd5c2 Code review fixes. 2022-12-12 16:36:40 +03:00
Jorge Martin Espinosa
c523e144b8
Rich text editor: improve performance when changing composer mode (#7691) 
* Rich text editor: improve performance when changing composer mode

* Add changelog

* Make `MessageComposerMode.Quote` and `Reply` data classes

* Re-arrange code to fix composer not being emptied when sneding a message
 2022-12-12 13:52:17 +01:00
Ekaterina Gerasimova
a12167077f Update project board IDs for automation 
"PN-" prefixed IDs are no longer working, update to new IDs
 2022-12-12 10:40:49 +00:00
Onuray Sahin
746fb7719a Code review fixes. 2022-12-12 13:39:56 +03:00
Maxime NATUREL
361b0411c7
Merge pull request #7747 from vector-im/fix/mna/verification-request-priority 
Verification request is not showing when verify session popup is displayed (PSG-1017)
 2022-12-12 09:44:25 +01:00
dependabot[bot]
74d7e60380
Bump fragment from 1.5.4 to 1.5.5 (#7741) 
Bumps `fragment` from 1.5.4 to 1.5.5.

Updates `fragment-ktx` from 1.5.4 to 1.5.5

Updates `fragment-testing` from 1.5.4 to 1.5.5

---
updated-dependencies:
- dependency-name: androidx.fragment:fragment-ktx
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: androidx.fragment:fragment-testing
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2022-12-12 09:21:24 +01:00
Onuray Sahin
85a6c8c6f2 Write unit tests for the use case. 2022-12-09 19:53:20 +03:00
Maxime NATUREL
dba8aaea16
Merge pull request #7752 from vector-im/fix/mna/wrong-usage-of-stable-fields 
Revert usage of stable fields in live location sharing and polls
 2022-12-09 17:32:53 +01:00
Maxime NATUREL
bd91db66f8 Fixing retrieve of related event id in the end poll event during aggregation 2022-12-09 14:07:06 +01:00