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

24930 Commits

Author SHA1 Message Date
SpiritCroc ca2cfbfd5c Automatic upstream merge postprocessing 
Change-Id: I49255442b53125bd6e94187df24225efa4d2c866
 2023-06-05 15:03:31 +02:00
SpiritCroc f440628208 Merge tag 'v1.6.2' into sc 
Change-Id: I7a9ebbae6df28044a8fa308fe34241dbd1d8b8ae

Conflicts:
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/MessageItemFactory.kt
	vector/src/main/java/im/vector/app/features/media/ImageContentRenderer.kt
 2023-06-05 14:59:06 +02:00
SpiritCroc b9752b2adf [TMP] Automatic upstream merge preparation 
Change-Id: Ided3e8213f46a4ab12baff083394edda3c12f998
 2023-06-05 14:43:30 +02:00
SpiritCroc 0d399b23f7 Automatic revert to unchanged upstream strings, pt.1 
Change-Id: Iff97921f1bcc03e387c4ef7c875f863ae6a51ad6
 2023-06-05 14:43:29 +02:00
SpiritCroc f37afeee03 Merge remote-tracking branch 'origin/sc' into sc 
Change-Id: If92caa52267fa199004fd9fd51d73b2fc2725c6f
 2023-06-05 14:43:02 +02:00
Valere 9f797e49e9 Merge branch 'release/1.6.2' into main 2023-06-02 18:02:45 +02:00
Valere 632f316f8e Adding fastlane file for version 1.6.2 2023-06-02 18:02:01 +02:00
Valere 1e4f47bc52 Changelog for version 1.6.2 2023-06-02 18:01:49 +02:00
Valere 56ea316a22
Merge pull request #8488 from vector-im/feature/bca/bump_crypto_sdk_0.3.8 
bump crypto sdk to 0.3.9
 2023-06-02 15:32:45 +02:00
valere 91f507e6c4 revert sonarqube gradle plugin version 2023-06-02 14:27:57 +02:00
dependabot[bot] 7f8a19f194
Bump org.checkerframework:checker from 3.34.0 to 3.35.0 (#8497) 2023-06-02 09:59:16 +00:00
valere ada8539898 Fix remove deprecated isReady() call 2023-06-02 11:28:53 +02:00
valere 688ae7d259 update change log 2023-06-02 11:28:53 +02:00
valere be8f226948 bump to 0.3.9 2023-06-02 11:28:53 +02:00
valere 99b6c887d2 Add change log 2023-06-02 11:28:53 +02:00
valere 1eda087233 bump crypto sdk to 0.3.8 2023-06-02 11:28:53 +02:00
Hugh Nimmo-Smith 61d4e468cb
Support for stable MSC3882 (#8299) 2023-06-01 18:15:01 +02:00
Valere 2f1a7b76ad
Merge pull request #8485 from vector-im/feature/bca/fix_anrs 
Make cryptoDevice calls suspendable
 2023-06-01 16:36:29 +02:00
Benoit Marty f741c4e7d9
Merge pull request #8463 from vector-im/dla/feature/always_allow_signout 
Always allow users sign out
 2023-06-01 14:55:39 +02:00
dependabot[bot] cb0fb63fe6
Bump org.sonarsource.scanner.gradle:sonarqube-gradle-plugin (#8490) 2023-06-01 11:21:27 +00:00
Someone 7253f77204 Translated using Weblate (Vietnamese) 
Currently translated at 57.0% (101 of 177 strings)

Translation: SchildiChat/SchildiChat-android
Translate-URL: https://weblate.spiritcroc.de/projects/schildichat/schildichat-android/vi/
 2023-05-31 14:02:40 +00:00
valere 7e6376bf90 remove log 2023-05-31 15:14:28 +02:00
valere 8c1938987b Code review 2023-05-31 12:18:27 +02:00
valere dc969f502a ktlint 2023-05-31 10:55:56 +02:00
valere 2d335c1307 fix unit test 2023-05-31 10:42:46 +02:00
valere b59068b463 missing suspend 2023-05-31 09:52:43 +02:00
valere 268cbb83cd Make cryptoDevice calls suspendable 2023-05-30 23:47:50 +02:00
dependabot[bot] 7e1659b1f9
Bump androidx.activity:activity-ktx from 1.7.1 to 1.7.2 (#8465) 2023-05-30 12:40:02 +00:00
Valere 83795344ed
Merge pull request #8470 from vector-im/feature/bca/extract_common_crypto 
Extract common crypto interface for all flavors
 2023-05-30 09:09:30 +02:00
valere b37eca4520 fix rust crypto still need CryptoMetadataEntity for global pref 2023-05-26 18:22:47 +02:00
Alex Maras 24b18847b5
Fix animated webp playback (#8120) 
* fix: add webp as playable image type

* fix: make glide transformations optional to prevent rendering webp throwing exception

* fix: stop marking webp as playable by default

* fix: play animated Webp in attachment view

* feat: autoplay webp if autoplay is enabled

---------

Signed-off-by: Alex Maras <dev@alexmaras.com>
Co-authored-by: Jorge Martín <jorgem@element.io>
 2023-05-26 17:03:24 +02:00
valere ac916078bc fix test compilation 2023-05-26 16:04:25 +02:00
valere a2ef95584f Add changelog 2023-05-26 10:17:48 +02:00
valere 3bf5c0cc1b Extract common crypto interface for all flavors 2023-05-26 09:50:15 +02:00
Nekothegamer bae30bf0c0 Translated using Weblate (Italian) 
Currently translated at 26.5% (47 of 177 strings)

Translation: SchildiChat/SchildiChat-android
Translate-URL: https://weblate.spiritcroc.de/projects/schildichat/schildichat-android/it/
 2023-05-25 17:01:52 +00:00
SpiritCroc e8b50941ba Automatic SchildiChat string correction 
Change-Id: I3923e7be57b7ee80c4aaa117cfd22545ec937327
 2023-05-25 12:04:03 +02:00
SpiritCroc 74f800ed23 Automatic upstream merge postprocessing 
Change-Id: I8601f26a2925acb03824224ef56a4f58a64fad9d
 2023-05-25 12:04:02 +02:00
SpiritCroc 9614f5994d Merge tag 'v1.6.1' into sc 
Change-Id: If1da0c145abfecd01df1384bedc794d2dd4d6bef

Conflicts:
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/read/SetReadMarkersTask.kt
	vector/src/main/java/im/vector/app/features/html/EventHtmlRenderer.kt
 2023-05-25 12:03:56 +02:00
SpiritCroc 4cdc4f1341 [TMP] Automatic upstream merge preparation 
Change-Id: Id97218e185f871ca5936f8773ce5f5b34d432e50
 2023-05-25 11:51:31 +02:00
SpiritCroc 2af92abb38 Automatic revert to unchanged upstream strings, pt.1 
Change-Id: Iee117c31686e6bc899ee6568e8aa3e6a5445e60d
 2023-05-25 11:51:31 +02:00
SpiritCroc 349fbe0f23 pre_merge.sh: ignore failure during git tag 
Do not fail if tag already exists

Change-Id: I8c54fe85879e8bd1866ee96951aca406a03862ed
 2023-05-25 11:50:25 +02:00
Benoit Marty 8f69e411d7 version++ 2023-05-25 11:22:07 +02:00
Benoit Marty e961a8ccb5 Merge tag 'v1.6.1' into develop 
tag
 2023-05-25 11:20:39 +02:00
Benoit Marty b9cc1b6dab Merge branch 'release/1.6.1' into main 2023-05-25 11:20:18 +02:00
Benoit Marty 93e2d7d176 Adding fastlane file for version 1.6.1 2023-05-25 11:18:34 +02:00
Benoit Marty f261a903f0 Changelog for version 1.6.1 2023-05-25 11:18:08 +02:00
Benoit Marty 82748591f9 Setting version for the release 1.6.1 2023-05-25 11:05:07 +02:00
Benoit Marty 997c9dd917 Ensure signout service is always use even if users want to ignore sigout error from the server. The SDK is doing more cleanup. 2023-05-25 10:38:08 +02:00
Benoit Marty cff9fbd008
Merge pull request #8439 from vector-im/yostyle/fix_crash_on_start_verification 
Allow stateloss on verification dialogfragment
 2023-05-25 09:36:40 +02:00
dependabot[bot] d5d5c9009b
Bump io.element.android:wysiwyg from 1.2.2 to 2.2.1 (#8464) 
* Bump io.element.android:wysiwyg from 1.2.2 to 2.2.1

Bumps [io.element.android:wysiwyg](https://github.com/matrix-org/matrix-wysiwyg) from 1.2.2 to 2.2.1.
- [Changelog](https://github.com/matrix-org/matrix-rich-text-editor/blob/main/CHANGELOG.md)
- [Commits](https://github.com/matrix-org/matrix-wysiwyg/compare/1.2.2...2.2.1)

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

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

* Fix compilation

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: jonnyandrew <jonnya@element.io>
 2023-05-24 10:14:22 +00:00