SpiritCroc
4573a4235e
Merge tag 'v1.6.10' into sc
...
Change-Id: If32b84a60de38eab046bbedeb2b1e8d9c6094bb3
Conflicts:
matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/timeline/TimelineEvent.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/util/ContentUtils.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/RoomAvatarResolver.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/LocalEchoEventFactory.kt
vector/src/main/java/im/vector/app/core/pushers/UnifiedPushHelper.kt
vector/src/main/java/im/vector/app/features/home/room/detail/composer/PlainTextComposerLayout.kt
2024-01-10 19:57:20 +01:00
ganfra
b72039e735
Fix a bunch of issues related to edition and reply #5969
2024-01-02 08:17:26 +01:00
Benoit Marty
25d1945cdc
Merge pull request #8577 from element-hq/sync-analytics-plan
...
Sync analytics plan
2023-12-21 14:19:59 +01:00
Benoit Marty
03966f1c13
Fix KDoc (I know I should not edit this, but its fine)
2023-12-21 09:38:03 +01:00
Benoit Marty
d610f75f1b
Fix compilation issue.
...
This extension is only used for Test
2023-12-21 09:30:46 +01:00
Benoit Marty
7242ad48c2
No need to use `also` here.
2023-12-21 09:29:31 +01:00
Benoit Marty
abccc7dd9f
Merge pull request #8710 from element-hq/feature/bma/elementHq
...
Element hq
2023-12-21 09:14:58 +01:00
Benoit Marty
6feee61f17
Merge pull request #8711 from element-hq/dependabot/gradle/io.element.android-wysiwyg-2.22.0
...
Bump io.element.android:wysiwyg from 2.14.1 to 2.22.0
2023-12-20 15:05:11 +01:00
Benoit Marty
644587a98c
Fix crash...
2023-12-20 10:16:29 +01:00
Benoit Marty
fac8dd333a
RTE: fix API break...
2023-12-20 10:16:29 +01:00
Benoit Marty
431a1a6fb2
Merge pull request #8672 from Amir-yazdanmanesh/develop
...
Change jitsi-meet constants URL
2023-12-15 18:10:40 +01:00
SpiritCroc
2117f95290
Switch prefered room preview types to best tested selection
...
Devs prefer this option and test this the most.
Change-Id: I1a986597d539589e68c588d99074d32dd04e4833
2023-12-14 11:36:35 +01:00
Benoit Marty
6d65a74f1d
Organization renaming: replace all ` https://github.com/vector-im ` by ` https://github.com/element-hq `
2023-12-13 11:01:40 +01:00
Benoit Marty
1c1c89fb86
Merge pull request #8698 from vector-im/feature/bma/mdm
...
Implement Mobile Device Manager feature with 3 keys.
2023-12-11 17:03:28 +01:00
bmarty
7e40b933c0
Sync analytics plan
2023-12-11 00:03:18 +00:00
SpiritCroc
46cd827e95
Hide quick-access to matrix.org account registration for Play Store
...
New Play Store guidelines require easy account deletion links etc. when
the app provides a way to create accounts. For SchildiChat, we do not
provide any homeservers for users, which is hard to teach the Google
Play Store testers. Accordingly, require users to enter their homeserver
themselves. Note that entering matrix.org in the "Custom server" picker
will lead you to the same UX like previously checking the existing box.
Change-Id: I93d313e22dc18b4c1b7469cd4a7e9761c5b6ee5f
2023-12-07 17:44:58 +01:00
Benoit Marty
6452b5c2b4
Make DefaultMdmService a singleton and use Binds instead of Provides.
2023-12-04 17:54:48 +01:00
Benoit Marty
882020fdba
Fix test compilation issue.
2023-12-04 15:54:17 +01:00
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
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
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
jonnyandrew
a6fafb07da
Remove quote from message actions menu ( #8689 )
2023-11-27 16:30:44 +00: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
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
yostyle
3d7489c7c5
Fix PR comment
2023-11-14 12:38:10 +01:00
yostyle
3179dc1400
Update regex for email address
2023-11-14 12:38:10 +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
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
jonnyandrew
26e2f4e967
Fix compilation error
2023-11-06 18:15:45 +01:00
jonnyandrew
6112082d07
Update to new mentions API
2023-11-06 18:15:45 +01:00
amir
4debc49172
Change jitsi-meet constants URL
2023-10-28 21:53:56 +03:30
Valere
d4c141664b
fix ignored test
2023-10-12 09:12:32 +02:00
Valere
5f68f98d3a
fix unit test
2023-10-11 17:04:05 +02:00
Valere
cd101f871c
missing mock
2023-10-11 15:07:48 +02:00
Valere
e8922a5fa7
property not in schema
2023-10-11 12:13:50 +02:00
Valere
25ecd599f3
Merge branch 'develop' into feature/bca/clean_up_legacy_crypto
2023-10-10 13:00:45 +02:00
Benoit Marty
60940c01df
Merge pull request #8651 from vector-im/sync-emojis
...
Sync Emojis
2023-10-06 17:46:54 +02:00
Benoit Marty
52082a9def
Ensure the incoming call will not ring forever, in case the call is not ended by another way ( #8178 )
...
Add a safe 2 minutes timer.
2023-10-06 10:44:03 +02:00
SpiritCroc
1892cf0ff8
Merge tag 'v1.6.6' into sc
...
Change-Id: I785561f0b2283214dd419a6c7028e374b85dc598
Conflicts:
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt
2023-10-05 17:23:23 +02:00
Valere
dfbb3122e7
Remove legacy crypto code
2023-10-02 13:58:51 +02:00