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

25752 Commits

Author SHA1 Message Date
ganfra b4b11a5767
Merge pull request #8770 from element-hq/feature/fga/fix_send_button_blinking 
Fix send button blinking with RTE
 2024-03-04 11:21:32 +01:00
ganfra 21d685f981 Fix send button blinking with RTE 2024-03-04 10:23:24 +01:00
Valere 79462bcb90 revert previous commit 2024-02-29 16:25:50 +01:00
Valere bc5c31d8f7 Increase decryption failure grace period 2024-02-29 13:58:44 +01:00
SpiritCroc 14cd245c24 Increment version 
Change-Id: I55eb27c1deb5b65e923ea9985bece94556823148
 2024-02-27 12:04:24 +01:00
aasami 3b50b166b5 Translated using Weblate (Slovak) 
Currently translated at 58.3% (105 of 180 strings)

Translation: SchildiChat/SchildiChat-android
Translate-URL: https://weblate.spiritcroc.de/projects/schildichat/schildichat-android/sk/
 2024-02-27 08:40:30 +00:00
Maksim Kliazovich e2fc1ee320 Added translation using Weblate (Belarusian) 2024-02-26 02:32:23 +00:00
SpiritCroc 8173811df5 Automatic SchildiChat string correction 
Change-Id: Ib1c8af9930c0a28d8ae07c38f2fd6bd31a65c464
 2024-02-20 15:01:39 +01:00
SpiritCroc 1674deea45 Automatic upstream merge postprocessing 
Change-Id: Ic63c381fe36d11f08caf4c8d18c4f266be9d3fe8
 2024-02-20 15:01:37 +01:00
SpiritCroc 4b3b454068 Merge tag 'v1.6.12' into sc 
tag

Change-Id: Iecfd29cb1d95af84fa2c8433c45e69c6ffa20a57
 2024-02-20 15:01:32 +01:00
SpiritCroc ed0c1bd433 [TMP] Automatic upstream merge preparation 
Change-Id: I67e5e0542cc212da7118d365b1e164eb8b9d4a88
 2024-02-20 15:01:20 +01:00
SpiritCroc 7c940f9849 Automatic revert to unchanged upstream strings, pt.1 
Change-Id: I6084ceb95656b79ea0e1cf923b605407b57f201a
 2024-02-20 15:01:19 +01:00
Benoit Marty 1dd73ad31e Update release note with CVE and GHSA identifiers 2024-02-20 12:26:06 +01:00
SpiritCroc 52ce0d2311 Increment version 
Change-Id: I7a0c9e40109bb151a9eaf7efb92dca1810fa86e8
 2024-02-20 10:59:02 +01:00
Benoit Marty 8682a75b0a version++ 2024-02-16 11:57:54 +01:00
Benoit Marty c6d718a555 Merge tag 'v1.6.12' into develop 
tag
 2024-02-16 11:56:49 +01:00
Benoit Marty effdca1832 Merge branch 'release/1.6.12' into main 2024-02-16 11:56:27 +01:00
Benoit Marty 2831efd6e7 Adding fastlane file for version 1.6.12 2024-02-16 11:56:24 +01:00
Benoit Marty bd124e12c2 Changelog for version 1.6.12 2024-02-16 11:55:38 +01:00
Benoit Marty 8f9695a9a8 Store temporary files created for Camera in the media folder. 2024-02-16 11:51:56 +01:00
Benoit Marty 53734255ec Add a check on incoming intent. 2024-02-16 11:51:16 +01:00
SpiritCroc f7a4cc4b31 Apply received patches from upstream 
Change-Id: I0d4be766d0f75c3ba64494599e8f3c5d589d3410
 2024-02-16 09:43:19 +01:00
Jorge Martin Espinosa 355d091c94
Merge pull request #8757 from element-hq/dependabot/gradle/io.element.android-wysiwyg-2.29.0 
Bump io.element.android:wysiwyg from 2.27.0 to 2.29.0
 2024-02-12 08:06:36 +01:00
SpiritCroc f05af3f8b3 increment_version.sh: Include changelog in git tag 
Change-Id: I6df1673df359c0fd7ebbf7bb0af7d6b13a876774
 2024-02-11 20:13:09 +01:00
Suguru Hirahara 707032f875 Translated using Weblate (Japanese) 
Currently translated at 100.0% (180 of 180 strings)

Translation: SchildiChat/SchildiChat-android
Translate-URL: https://weblate.spiritcroc.de/projects/schildichat/schildichat-android/ja/
 2024-02-10 16:08:13 +00:00
franconian ed5b084da3 Translated using Weblate (German) 
Currently translated at 96.1% (173 of 180 strings)

Translation: SchildiChat/SchildiChat-android
Translate-URL: https://weblate.spiritcroc.de/projects/schildichat/schildichat-android/de/
 2024-02-10 01:26:42 +00:00
Mæve Rey c8585921e7 Translated using Weblate (German) 
Currently translated at 96.1% (173 of 180 strings)

Translation: SchildiChat/SchildiChat-android
Translate-URL: https://weblate.spiritcroc.de/projects/schildichat/schildichat-android/de/
 2024-02-10 01:26:42 +00:00
Kuchenmampfer 377ab9a23f Translated using Weblate (German) 
Currently translated at 96.1% (173 of 180 strings)

Translation: SchildiChat/SchildiChat-android
Translate-URL: https://weblate.spiritcroc.de/projects/schildichat/schildichat-android/de/
 2024-02-10 01:26:41 +00:00
dependabot[bot] fb593cd8b4
Bump io.element.android:wysiwyg from 2.27.0 to 2.29.0 
Bumps [io.element.android:wysiwyg](https://github.com/matrix-org/matrix-wysiwyg) from 2.27.0 to 2.29.0.
- [Changelog](https://github.com/matrix-org/matrix-rich-text-editor/blob/main/CHANGELOG.md)
- [Commits](https://github.com/matrix-org/matrix-wysiwyg/compare/2.27.0...2.29.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>
 2024-02-09 23:04:14 +00:00
Benoit Marty e0c51bd168
Merge pull request #8749 from element-hq/feature/bma/locationAvatar 
Location avatar
 2024-02-06 16:02:02 +01:00
Benoit Marty e340678349 changelog 2024-02-05 09:43:05 +01:00
Benoit Marty 6ea0129bee Location sharing: use Room member avatar instead of profile avatar. 2024-02-02 18:36:29 +01:00
Benoit Marty c6bb054fd7 Add a log when User is not kwown. 2024-02-02 17:25:00 +01:00
Benoit Marty 8b1bd7940d Fix avatar with initial not displayed on message preview bottom sheet 2024-02-02 16:01:59 +01:00
Benoit Marty ff439546c5 Improve cache of drawables used for rendering location pin. 
In particular, use the Glide cache, and ensure that if an error occurs and later the avatar can be retrieved, the cache will be replaced.
Also limit cache size to 32.
Also use UserItem as a key, instead of just the userId, so that if displayName or avatarUrl change, there will be not cache hit.
 2024-02-02 15:34:51 +01:00
Benoit Marty 343468717c Add a test 2024-02-02 13:56:44 +01:00
Benoit Marty d49f6bfbb6 Equivalent code. 2024-02-02 13:56:44 +01:00
Jorge Martin Espinosa d75ca516fc
Merge pull request #8741 from element-hq/fix/jme/update-login-splash-screen 
Make 'sign in' flow more important in the initial screen
 2024-02-02 09:58:16 +01:00
Benoit Marty 1277f6fdd9
Merge pull request #8744 from element-hq/feature/bma/usedDecryptedEvent 
[Crypto] Improve Event.getClearContent() and fix assignement issue.
 2024-02-02 09:47:22 +01:00
Benoit Marty 3611052386 Add changelog. 2024-02-02 09:46:44 +01:00
Benoit Marty 96648bbd0e
Merge pull request #8745 from element-hq/dependabot/gradle/io.element.android-wysiwyg-2.27.0 
Bump io.element.android:wysiwyg from 2.25.0 to 2.27.0
 2024-02-02 09:39:44 +01:00
dependabot[bot] 393c40e652
Bump io.element.android:wysiwyg from 2.25.0 to 2.27.0 
Bumps [io.element.android:wysiwyg](https://github.com/matrix-org/matrix-wysiwyg) from 2.25.0 to 2.27.0.
- [Changelog](https://github.com/matrix-org/matrix-rich-text-editor/blob/main/CHANGELOG.md)
- [Commits](https://github.com/matrix-org/matrix-wysiwyg/compare/2.25.0...2.27.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>
 2024-02-01 23:41:07 +00:00
Benoit Marty 7dc8c436cf Fix test. `getClearContent()` return the decrypted content for encrypted Event, and it is null in this case 2024-02-01 18:43:59 +01:00
Benoit Marty ec96f4e0ae Fix assignment issue. `sessionId` was used instead of `roomId`. 
This may fix issue of Event not decrypted if the key is coming late for the last Event displayed in the Room list.
 2024-02-01 18:11:44 +01:00
Benoit Marty e04bfe8981 Remove dead code 2024-02-01 18:02:04 +01:00
Benoit Marty a1140fd8fa Improve getClearContent() method: it should not fallback to the encrypted content when the content is not decrypted. 2024-02-01 17:28:29 +01:00
Benoit Marty a17c75a7da Remove unused import 2024-01-31 18:49:19 +01:00
Benoit Marty 054af4d6a3 changelog 2024-01-31 18:31:56 +01:00
Benoit Marty 6a30a2ed32 Keep the current message formatting when switching between composer mode (Regular, Reply, etc.) 2024-01-31 18:28:39 +01:00
Benoit Marty 423b9215c4 Store the `formattedText` to the draft, to be able to restore the formatting. #7466 2024-01-31 18:28:39 +01:00