mirrors/SchildiChat-android
1
0
Fork 0
mirror of https://github.com/SchildiChat/SchildiChat-android.git synced 2024-11-24 18:36:21 +03:00
Code Issues Projects Releases Packages Wiki Activity
25629 commits 6 branches 120 tags 229 MiB
Commit graph

14736 commits

Author SHA1 Message Date
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
bmarty
1e00da6e2f Sync Emojis 2023-10-02 00:19:14 +00:00
Valere
2709cb2973 missing deprecated 2023-10-01 22:19:54 +02:00
Valere
0d70f6eb54 missing mock 2023-10-01 21:59:46 +02:00
SpiritCroc
29c921eb96 Drop GlideWebp 
The benefit of rendering some corner-case webp images is negligible
compared to issues related to the slow update policy of the library,
such as recently in relevance to CVE-2023-4863 (but also previously
for updating glide versions).

Fixes https://github.com/SchildiChat/SchildiChat-android/issues/210

Change-Id: I3809e2b48e595809fed1a6f4e405cdf178126cdb
 2023-09-28 09:47:49 +02:00
SpiritCroc
bf6f71c2b5 [Labs] Prefer lower root spaces in bottom space bar 
Change-Id: I884f52bb29d7279350e1101fdc9fd995461534e0
 2023-09-18 11:59:39 +02:00
Benoit Marty
1b3be240b3
Merge pull request #8645 from vector-im/hughns/oidc-device-logout-in-chrome-tab 
Open OIDC account management URL in chrome tab
 2023-09-14 21:54:23 +02:00
Benoit Marty
8c1cc44255
Merge pull request #8627 from vector-im/feature/bma/hideAccountDeactivation 
Hide deactivate account section in case of account managed externally.
 2023-09-14 21:53:13 +02:00
Hugh Nimmo-Smith
470557c59e Open OIDC account management URL in chrome tab 
Not the external browser
 2023-09-14 11:23:19 +01:00
Yoan Pintas
ff548d2f98
Fix crash when max shortcuts count is exceeded (#8644) 2023-09-13 10:43:03 +00:00
Benoit Marty
d31c741f9d Hide deactivate account section in case of account managed externally. 2023-09-12 16:28:28 +02:00
Benoit Marty
ec9a066900
Merge pull request #8620 from vector-im/feature/bma/oidcSessionEnd 
Feature/bma/OIDC session end
 2023-09-12 16:25:46 +02:00
SpiritCroc
a411437d53 Address another possible BetterLinkMovementMethod crash 
https://github.com/SchildiChat/SchildiChat-android-rageshakes/issues/1152

Well... it says it happened on longclick, but it doesn't say if it
happened in SafeBetterLinkMovementMethod or
EvenBetterLinkMovementMethod, but since we're not using it plain as far
as I see, it should be one of these, and SafeBetterLinkMovementMethod
has it already caught?

Change-Id: Ifa171203b4e65a49a89121ddd2fb714d5bcb0d64
 2023-09-10 09:01:13 +02:00
SpiritCroc
97dc744db3 Fix message render failures caused by Element's ListHandler 
Fixes https://github.com/SchildiChat/SchildiChat-android/issues/206

On repeated render, we sometimes get
`java.lang.NumberFormatException: For input string: ""`

Note: this doesn't necessarily happen on messages with lists, but any,
not sure when...

Change-Id: Icaa5b505c6f8a732d0a04378e0872e82ae40e16d
 2023-09-10 09:01:07 +02:00
SpiritCroc
2e6fcad79f Make sure on render exception no content is leaked in log 
In production builds. For internal builds, still allow it.
Note: upstream may have been leaking content here as well.

Change-Id: I1b07778d70dfddb151bf97b60482e38aeb01c26e
 2023-09-10 09:01:07 +02:00
Benoit Marty
52a06931f4 Change the test to hide multi signout of devices. 
We do not need an external account management URL, which is optional, but we need to know if account management is delegate to Oidc.
 2023-08-31 16:04:45 +02:00
Benoit Marty
a3be0286ee
Merge pull request #8341 from tomtit/bugfix/issue-7758 
Fixes #7758: Fixed JWT token for Jitsi openidtoken-jwt authentication
 2023-08-28 13:15:05 +02:00
Benoit Marty
880ed69f97 OIDC redirect to the web page to delete a session (new session manager) #8616 2023-08-22 12:17:23 +02:00
Benoit Marty
8941e6396c Hide multi signout if we have an external account manager (#8616) 2023-08-22 12:08:33 +02:00
Benoit Marty
425441546e Format 2023-08-22 12:08:06 +02:00
Benoit Marty
12395e9b04 OIDC redirect to the web page to delete a session (legacy session manager) #8616 2023-08-22 11:40:47 +02:00
Benoit Marty
39a783196e Hide setting entry point to manage 3Pid if homeserver capability m.3pid_changes is set to false. 2023-08-21 17:25:48 +02:00
SpiritCroc
030e1f853f Log actual HTML render exception 
Change-Id: I98d4274e92812df3e1143f7e8ea63b56fcbbc091
 2023-08-06 11:47:28 +02:00
SpiritCroc
89cc0d583c Avoid some empty bug reporter fields 
GitHub doesn't like code blocks to be empty

Change-Id: I949b9b27b84e28803d0aeffcb84aa8a9157d3e0b
 2023-08-05 17:01:34 +02:00
SpiritCroc
f605667a97 Fix possible crash rendering playback time 
https://github.com/SchildiChat/SchildiChat-android-rageshakes/issues/1087

Change-Id: I688e93637a0b0c42907b980cb619f5cb6c991c50
 2023-08-02 20:38:51 +02:00
SpiritCroc
1bc97e0aba Fix possible crash in autocompletion 
https://github.com/SchildiChat/SchildiChat-android-rageshakes/issues/1129

Change-Id: If8514bdcd39e6477a938decf59d2380466898b23
 2023-08-02 20:33:19 +02:00
SpiritCroc
ff67571dad Fix html messages not rendering at all on markwon exception 
If render(): renderAndProcess(markwon.parse(text), _) fails,
the input text *string* is returned instead of a Spannable,
so we shouldn't cast without checking here.

Fixes https://github.com/SchildiChat/SchildiChat-android/issues/201

Change-Id: I1824328e0b733de699a33376833b2fbc86b0e44f
 2023-08-02 20:05:35 +02:00
SpiritCroc
16ccd7817f Add non-free warning to integration manager 
https://github.com/SchildiChat/SchildiChat-android/issues/130#issuecomment-1657198941

Change-Id: I0f5af145697f14b2e6e83095993fdb158b41b3d8
 2023-07-30 19:50:57 +02:00
SpiritCroc
6b5bfde91e Merge tag 'v1.6.5' into sc 
tag

Change-Id: I4b548719336b58914ac6b52da5a2ea6fac0c4545
 2023-07-26 11:01:57 +02:00
SpiritCroc
61205787a8 Fix banned users alignment in room settings 
Use new "labs" icon from Element, that we have changed back to the old
one for settings - but since it's a bit too big (even upstream),
fix width/height in addition.

Fixes https://github.com/SchildiChat/SchildiChat-android/issues/200

Change-Id: I9195df80a5dadb9e70799ed3dc49f5702335ac49
 2023-07-21 15:31:55 +02:00
Benoit Marty
ae52d4cd3c Fix crash in the setting when enabling/disabling integration manager and there is no network. 2023-07-11 18:10:54 +02:00
Benoit Marty
2a5df54ae4 Fix crash: show an error message with a Retry button when there is no network when displaying the BootstrapBottomSheet. 2023-07-11 18:09:00 +02:00
SpiritCroc
96618eefda [merge] Fix enabling send-as-sticker button immediately on autocompletion 
Change-Id: Id4cfa90b5856594bc25ba6fd7fd6a63c94e215c0
 2023-06-27 20:58:57 +02:00
SpiritCroc
e06a4b94c6 [merge] Fix crash on disabling wysiwyg from dev quick option 
Fixes https://github.com/SchildiChat/SchildiChat-android-rageshakes/issues/1095

Change-Id: Ie8e2e41a0e162a785bc99d1083632f0d1e6cb227
 2023-06-27 20:28:59 +02:00
SpiritCroc
1aa3337cba Merge tag 'v1.6.3' into sc 
tag

Change-Id: I59d0cd559bb0aba334dc8662500670d91d00906c

Conflicts:
	vector/src/main/java/im/vector/app/features/home/room/detail/AutoCompleter.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/composer/MessageComposerFragment.kt
 2023-06-27 20:13:46 +02:00
Benoit Marty
2b4b5f05eb
Merge pull request #8556 from vector-im/feature/bma/noJcenter 
Feature/bma/no jcenter
 2023-06-27 17:04:59 +02:00
valere
7205cd73d4 quality 2023-06-26 11:13:08 +02:00
valere
3e73137c18 Fixes new device detections banner problems 2023-06-26 10:48:58 +02:00
Benoit Marty
e9f9decf00 Import source from https://github.com/dm77/barcodescanner 2023-06-23 18:58:42 +02:00
Benoit Marty
69680a9856 Import source from https://github.com/2dxgujun/Kpan 2023-06-23 18:23:14 +02:00
Benoit Marty
cd292488b6 Fix warning 2023-06-23 17:51:57 +02:00
Benoit Marty
3da1497d27 Import source from https://github.com/natario1/Autocomplete 2023-06-23 17:46:12 +02:00
Benoit Marty
f304e40d57 Import source from https://github.com/amulyakhare/TextDrawable 2023-06-23 17:35:14 +02:00
David Langley
a065cd338c
Merge pull request #8440 from vector-im/jonny/feat/rich-text-mentions 
[Rich text editor] Add mentions and slash commands
 2023-06-21 11:26:13 +01:00
David Langley
cfae6e9e51 Remove TODO causing failed lint check. 2023-06-21 09:49:44 +01:00
David Langley
e988308dc6 Add space after mention inserstion. 2023-06-21 09:30:45 +01:00
jonnyandrew
9d239bf94d
Use proper API to insert mention from timeline user 2023-06-19 13:41:08 +01:00
Benoit Marty
4af2f700f7
Merge pull request #8541 from abaker/fix_fallback_key_sharing_strategy 
Fix fallbackKeySharingStrategy
 2023-06-16 13:05:30 +02:00
Yoan Pintas
710d21f6a4
Implement MSC3987: Push actions clean-up (#8530) 2023-06-16 09:13:13 +00:00
Alex Baker
572bdb6dfe Fix fallbackKeySharingStrategy 
Signed-off-by: Alex Baker <alex@beeper.com>
 2023-06-14 16:29:22 -05:00
David Langley
cb64175c2b Fix line length and typo. 2023-06-09 19:43:26 +01:00