mirrors/SchildiChat-android
1
0
Fork 0
mirror of https://github.com/SchildiChat/SchildiChat-android.git synced 2024-12-23 01:20:35 +03:00
Code Issues Projects Releases Packages Wiki Activity
23643 commits 7 branches 124 tags 230 MiB
Commit graph

23643 commits

This branch
This branch
All branches
Author SHA1 Message Date
Danial Behzadi
0cdafc96d8 Translated using Weblate (Persian) 
Currently translated at 100.0% (2590 of 2590 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/fa/
 2023-01-15 14:33:26 +00:00
Priit Jõerüüt
a9eb333fd2 Translated using Weblate (Estonian) 
Currently translated at 99.6% (2582 of 2590 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/et/
 2023-01-15 14:33:26 +00:00
Vri
1eee44d9aa Translated using Weblate (German) 
Currently translated at 100.0% (2590 of 2590 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/de/
 2023-01-15 14:33:25 +00:00
waclaw66
c3a4c43fef Translated using Weblate (Czech) 
Currently translated at 100.0% (2590 of 2590 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/cs/
 2023-01-15 14:33:25 +00:00
Florian Renaud
31e599f2e2
Merge pull request #7919 from vector-im/bugfix/fre/handle_vb_playback_crash 
Voice Broadcast - Handle exceptions during playback
 2023-01-13 18:29:28 +01:00
Onuray Sahin
25edcaf5d1
Merge pull request #7950 from vector-im/feature/ons/dismiss_verification_bottomsheet 
Make verification bottom sheet cancellable on tap outside (PSG-1139)
 2023-01-13 19:50:33 +03:00
Maxime NATUREL
60e838a82c Check encrypted event status using the Event model 2023-01-13 16:48:53 +01:00
SpiritCroc
94b996b52a [rich replies] Disable useless recent upstream reply fallback changes 
Change-Id: I37cf9986dba043ae6ca146b98a29e05f004de3a4
 2023-01-13 16:16:33 +01:00
Onuray Sahin
4a49f2ff9b Check if bottom sheet is cancellable. 2023-01-13 18:15:52 +03:00
SpiritCroc
627e7f5019 Automatic SchildiChat string correction 
Change-Id: I7847090ba45e452b35d468c3b09d7789bc585bc9
 2023-01-13 15:53:52 +01:00
SpiritCroc
b9d312c40d Automatic upstream merge postprocessing 
Change-Id: I2d61b69195b3cd5033ad1014070ebd4b7bee436c
 2023-01-13 15:53:51 +01:00
Florian Renaud
169c9b221c Throw an error if the media player which has completed is not the expected one 2023-01-13 15:46:48 +01:00
SpiritCroc
d4cb55eeaa Merge tag 'v1.5.20' into sc 
Change-Id: I438392b41ebe84dccfae1639ae90102c3d45c680

Conflicts:
	dependencies.gradle
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/RealmCryptoStore.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/TimelineChunk.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/handler/room/RoomSyncHandler.kt
	vector/src/main/java/im/vector/app/core/resources/StringProvider.kt
	vector/src/main/res/xml/vector_settings_advanced_settings.xml
 2023-01-13 14:50:46 +01:00
SpiritCroc
b8cbc10ca3 [TMP] Automatic upstream merge preparation 
Change-Id: I0dfb163330468cf676dbe35b2fe07699f2c072cf
 2023-01-13 14:43:06 +01:00
SpiritCroc
c8d7710e27 Automatic revert to unchanged upstream strings, pt.1 
Change-Id: Id98245b4107a678e502fe15547094d72c4ffc54b
 2023-01-13 14:43:05 +01:00
Florian Renaud
1b192ea45c
Merge pull request #7945 from vector-im/feature/fre/vb_notification_on_first_chunk 
Voice Broadcast - only send a notification on the first chunk
 2023-01-13 14:26:04 +01:00
Onuray Sahin
a12460b09c Add changelog. 2023-01-13 15:56:47 +03:00
Onuray Sahin
e5801a4f19 Make verification dialog cancelable. 2023-01-13 15:56:38 +03:00
Benoit Marty
f3e56cfa5c
Merge pull request #7940 from vector-im/dependabot/gradle/androidx.appcompat-appcompat-1.6.0 
Bump appcompat from 1.5.1 to 1.6.0
 2023-01-13 10:49:00 +01:00
Benoit Marty
06ac22488e Fix typo. 2023-01-13 10:45:09 +01:00
Benoit Marty
e7cde42923
Merge pull request #7942 from RiotTranslateBot/weblate-element-android-element-app 
Translations update from Weblate
 2023-01-13 10:44:23 +01:00
Benoit Marty
728e5941f1
Merge pull request #7948 from vector-im/dependabot/gradle/io.element.android-wysiwyg-0.17.0 
Bump wysiwyg from 0.15.0 to 0.17.0
 2023-01-13 10:42:09 +01:00
Benoit Marty
cad5e732df Fix issue of send button not displayed when starting message with a space. 2023-01-13 10:36:03 +01:00
dependabot[bot]
d55f1efd63
Bump wysiwyg from 0.15.0 to 0.17.0 
Bumps [wysiwyg](https://github.com/matrix-org/matrix-wysiwyg) from 0.15.0 to 0.17.0.
- [Release notes](https://github.com/matrix-org/matrix-wysiwyg/releases)
- [Changelog](https://github.com/matrix-org/matrix-rich-text-editor/blob/main/CHANGELOG.md)
- [Commits](https://github.com/matrix-org/matrix-wysiwyg/compare/0.15.0...0.17.0)

---
updated-dependencies:
- dependency-name: io.element.android:wysiwyg
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-01-13 00:17:34 +00:00
Onuray Sahin
1787031cc6
Merge pull request #7939 from vector-im/feature/ons/fix_edit_poll 
Fix rendering of edited polls (PSG-963)
 2023-01-13 03:13:53 +03:00
Florian Renaud
8a2f28bc37 Add comment to explain the error handling 2023-01-12 18:29:56 +01:00
Florian Renaud
72e0dc4bd2 Voice Broadcast - only send a notification on the first chunk 2023-01-12 18:08:43 +01:00
Onuray Sahin
6813571015 Fix rendering bug when poll is edited from another client. 2023-01-12 18:46:18 +03:00
Weblate
149ff75d90 Merge branch 'origin/develop' into Weblate. 2023-01-12 10:33:32 +00:00
Szimszon
07db45a167 Translated using Weblate (Hungarian) 
Currently translated at 100.0% (2585 of 2585 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/hu/
 2023-01-12 10:33:29 +00:00
Christian Paul
6cdd8096cd Translated using Weblate (Esperanto) 
Currently translated at 75.8% (1961 of 2585 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/eo/
 2023-01-12 10:33:29 +00:00
waclaw66
90d9eaf950 Translated using Weblate (Czech) 
Currently translated at 100.0% (2585 of 2585 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/cs/
 2023-01-12 10:33:28 +00:00
Maxime NATUREL
ee3cbd9884 Filter in only encrypted events with relatesTo content 2023-01-12 11:15:38 +01:00
Florian Renaud
b1d2581bf3
Merge pull request #7898 from vector-im/bugfix/fre/unexpected_live_vb_room_list 
Fix unexpected live voice broadcast in the room list
 2023-01-12 10:42:52 +01:00
Maxime NATUREL
d1ce15bf18 Renaming field in PollResponseData for better clarity 2023-01-12 10:14:47 +01:00
Maxime NATUREL
94dd599f13 Fix after rebase 2023-01-12 10:03:01 +01:00
Maxime NATUREL
8b051c5b86 Replace usage of new UnableToDecryptEventEntity by usage of existing EventInsertEntity 2023-01-12 10:02:05 +01:00
Maxime NATUREL
fd58875c31 Database migration 2023-01-12 10:02:05 +01:00
Maxime NATUREL
b001bc382f Fixing code style issue 2023-01-12 10:01:51 +01:00
Maxime NATUREL
e9f59d85b4 Adding unit tests for DefaultCreateUnableToDecryptEventEntityTask 2023-01-12 10:01:51 +01:00
Maxime NATUREL
a04c60a85b Adding unit tests for EncryptedEventRelationsAggregationProcessor 2023-01-12 10:01:51 +01:00
Maxime NATUREL
1bd11775e9 Adding unit tests for EncryptedReferenceAggregationProcessor 2023-01-12 10:01:51 +01:00
Maxime NATUREL
eb4de37603 Updating unit tests for poll aggregation processor 2023-01-12 10:01:51 +01:00
Maxime NATUREL
fdc28c0383 Add encrypted event id only if not already in the list 2023-01-12 10:01:50 +01:00
Maxime NATUREL
da6b41c34d Updating unit tests for PollItemViewStateFactory 2023-01-12 10:01:50 +01:00
Maxime NATUREL
7e1016da7e Changing where we insert UnableToDecryptEventEntity in DB 2023-01-12 10:01:50 +01:00
Maxime NATUREL
a29d4399a5 Removing encrypted related id when receiving decrypted event 2023-01-12 10:01:50 +01:00
Maxime NATUREL
3b9faa5f31 Render specific message on decryption error 2023-01-12 10:01:49 +01:00
Maxime NATUREL
c0c5e208bd Remove processing of encrypted events from EventRelationsAggregationProcessor 2023-01-12 10:00:41 +01:00
Maxime NATUREL
ae2639aeb0 Keep track of related events to a poll which had failed to be decrypted 2023-01-12 10:00:41 +01:00