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

25538 Commits

Author SHA1 Message Date
Benoit Marty 778dab7bb7 Cleanup and safer Json model. 2023-12-04 09:20:25 +01:00
Benoit Marty 8e0c503b45 Support Functional members #3736 2023-12-04 09:16:26 +01:00
Benoit Marty 5987ca9c48 changelog 2023-11-30 18:24:58 +01:00
Benoit Marty fb077d5065 Implement Mobile Device Manager feature with 3 keys. 2023-11-30 18:18:00 +01:00
SpiritCroc 3c974e0085 Disable SC defaults button in non-internal builds 
It is in the "Dev Tools" section, and it tells you to not click it.
Apparently, users have a serious problem with that.

Closes https://github.com/SchildiChat/SchildiChat-android/issues/212

Change-Id: I3e5101b107127d7d7f1dfb92ca2df225bb8a79a7
 2023-11-29 09:20:20 +01:00
SpiritCroc 0cff637113 Don't auto-insert ':' after mentions 
Change-Id: I348a79b985e92c32475738c1c7e0a651b475f3f9
 2023-11-28 20:23:11 +01:00
SpiritCroc e3b421c74b Automatic SchildiChat string correction 
Change-Id: I7f2c78a1d575ed0995966c993ec5d507b9113090
 2023-11-28 20:06:13 +01:00
SpiritCroc 4aa190a591 Automatic upstream merge postprocessing 
Change-Id: Ie2019e4abbfc96c587782179a87e0158d7d3be3b
 2023-11-28 20:06:11 +01:00
SpiritCroc b2c8548e29 Merge tag 'v1.6.8' into sc 
tag

Change-Id: I0a2384fc2e4eda861a191b0b8c85641916854ac8

Conflicts:
	dependencies.gradle
	matrix-sdk-android/src/kotlinCrypto/java/org/matrix/android/sdk/internal/crypto/MXOlmDevice.kt
	matrix-sdk-android/src/kotlinCrypto/java/org/matrix/android/sdk/internal/crypto/algorithms/olm/MXOlmDecryption.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt
	vector-app/build.gradle
	vector/src/main/java/im/vector/app/core/di/ConfigurationModule.kt
	vector/src/main/java/im/vector/app/features/call/webrtc/WebRtcCallManager.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/MessageActionsViewModel.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageTextItem.kt
 2023-11-28 20:04:00 +01:00
SpiritCroc b46aa05a27 [TMP] Automatic upstream merge preparation 
Change-Id: I3de361479d7a4bdd8ede5b335fbb9cfc757d33bf
 2023-11-28 19:32:57 +01:00
SpiritCroc 2a1b705377 Automatic revert to unchanged upstream strings, pt.1 
Change-Id: I1f78b3ae76f1094db06cc24842212aa67303b385
 2023-11-28 19:32:56 +01:00
Benoit Marty bb9d1fc8d8 version++ 2023-11-28 17:23:40 +01:00
Benoit Marty f6ca7e5d0b Merge tag 'v1.6.8' into develop 
tag
 2023-11-28 17:19:08 +01:00
Benoit Marty 552b143f8c Merge branch 'release/1.6.8' into main 2023-11-28 17:18:51 +01:00
Weblate f46a9d6cc8 Update release script now that there is only on crypto implementation. 2023-11-28 17:17:44 +01:00
Benoit Marty b27dc02cfd Adding fastlane file for version 1.6.8 2023-11-28 17:13:37 +01:00
Benoit Marty 6ba03f82e4 Changelog for version 1.6.8 2023-11-28 17:12:03 +01:00
jonnyandrew a6fafb07da
Remove quote from message actions menu (#8689) 2023-11-27 16:30:44 +00:00
Benoit Marty 0c1f190035
Merge pull request #8674 from vector-im/feature/bma/infiniteRingCall 
Ensure Background sync is not stopped when there is an active call.
 2023-11-23 17:45:20 +01:00
Benoit Marty 8d85d047b7 Ensure Background sync is not stopped when there is an active call, even when the app goes to background. 2023-11-22 09:42:39 +01:00
Benoit Marty 84158ece37 Ensure Background sync is not stopped when there is an active call. 
It was happening since the application is foregrounded when VectorCallActivity is displayed.
 2023-11-22 09:31:20 +01:00
jonnyandrew 63ef40f58b
Fix issue with timeline message view reuse while rich text editor is enabled (#8688) 2023-11-17 17:09:18 +00:00
yostyle 31d3b9d385 Add changelog 2023-11-16 16:29:26 +01:00
yostyle 7755da881e Move crypto migration 2023-11-16 16:29:26 +01:00
giomfo fd5530a2f9
Merge pull request #8683 from vector-im/giomfo/fix_custom_gateway_check 
Unified Push: Ignore the potential SSL error when the custom gateway is testing
 2023-11-15 22:26:06 +01:00
Giom Foret ee2fd9f123 add changelog 2023-11-15 17:20:37 +01:00
Giom Foret 7c58af735b Unified Push: Ignore the potential SSL error when the custom gateway is testing 
When the Unified Push is enabled, the application checks the potential custom gateway before applying it. If an SSL error happens, the application may ignore this error and keep using this custom gateway. The actual SSL check will be done server side where this gateway is actually used.
 2023-11-15 17:10:44 +01:00
Valere 1a941149ab
Merge pull request #8679 from vector-im/feature/bca/bump_crypto_sdk_version 
bump crypto sdk to 0.3.16
 2023-11-14 22:26:32 +01:00
Benoit Marty 98e09eedc3
Merge pull request #8671 from yostyle/yostyle/update_email_regex 
Update regex for email address to be aligned on RFC 5322
 2023-11-14 14:32:00 +01:00
yostyle 3d7489c7c5 Fix PR comment 2023-11-14 12:38:10 +01:00
yostyle edf23bbb89 Add changelog 
Signed-off-by: yostyle <y.pintas@gmail.com>
 2023-11-14 12:38:10 +01:00
yostyle 3179dc1400 Update regex for email address 2023-11-14 12:38:10 +01:00
Valere d3391076b5 fix comment 2023-11-14 12:09:05 +01:00
Valere 36ce42e36e update change log 2023-11-14 11:33:26 +01:00
Valere f37d918ce6 fix outdated documentation 2023-11-14 11:24:05 +01:00
Valere b61b2b6f16 bump crypto sdk to 0.3.16 2023-11-13 22:23:11 +01:00
RT Redréovič 69adf225e1 Translated using Weblate (Esperanto) 
Currently translated at 100.0% (180 of 180 strings)

Translation: SchildiChat/SchildiChat-android
Translate-URL: https://weblate.spiritcroc.de/projects/schildichat/schildichat-android/eo/
 2023-11-13 19:39:22 +00:00
Benoit Marty 979324da84
Merge pull request #8656 from vector-im/feature/bca/clean_up_legacy_crypto 
Remove legacy crypto support.
 2023-11-13 16:53:02 +01:00
Valere d045cedb46 ignore paparazzi tests 2023-11-13 15:01:19 +01:00
Valere 58a44ac668 fix test 2023-11-13 14:00:30 +01:00
Valere e4c1913e01 Merge branch 'develop' into feature/bca/clean_up_legacy_crypto 2023-11-13 09:20:49 +01:00
Valere 4e53d8462f use error instead of require 2023-11-10 16:33:46 +01:00
Benoit Marty 7073b1647c
Merge pull request #8607 from vector-im/dependabot/gradle/io.element.android-wysiwyg-2.5.0 
Bump io.element.android:wysiwyg from 2.2.2 to 2.6.0
 2023-11-09 09:35:30 +01:00
Benoit Marty dd6410794c Suppress lint warning. MenuBuilder is restricted. 2023-11-08 17:51:03 +01:00
Benoit Marty 2c75f41072 Fix lint false positive 2023-11-08 17:49:04 +01:00
Benoit Marty 454ba7bf7c
Merge branch 'develop' into feature/bca/clean_up_legacy_crypto 2023-11-07 14:13:56 +01:00
Yoan Pintas b14338d2c4
Remove unused WebRTC dependency (#8658) 2023-11-07 14:12:27 +01:00
Benoit Marty 83084f6481 Upgrade lint 2023-11-07 11:09:30 +01:00
Benoit Marty 4341cf8c9c Upgrade Mavericks library to 3.0.7 
It fixes crash: java.lang.IllegalStateException: Flow invariant is violated
 2023-11-06 18:29:47 +01:00
Benoit Marty 8d8a5d3de2 Upgrade Wysiwyg library to 2.14.1 2023-11-06 18:17:14 +01:00