filippodb
/
SchildiChat-android
mirror of https://github.com/SchildiChat/SchildiChat-android.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
19,557 Commits 6 Branches 119 Tags 221 MiB
Commit Graph

5481 Commits

Author SHA1 Message Date
Hugh Nimmo-Smith ca7a6efade Add missing binding 2022-10-13 22:13:56 +01:00
Hugh Nimmo-Smith e2f3dde5c1 Use correct var name 2022-10-13 22:13:56 +01:00
Hugh Nimmo-Smith 1e60f3c25b Make initialDeviceName optional 2022-10-13 22:13:56 +01:00
Hugh Nimmo-Smith d0898a2b89 Linting 2022-10-13 22:13:30 +01:00
Hugh Nimmo-Smith 88238c0f04 Support for login by m.login.token during QR code sign in 2022-10-13 22:13:03 +01:00
Hugh Nimmo-Smith 489dfd7354 Revert "Implementations of MSC3886 and MSC3903" 
This reverts commit 1235db7895.
 2022-10-13 21:48:27 +01:00
Hugh Nimmo-Smith e554b43bc6 Merge branch 'feature/ons/qr_code_login_ui' of https://github.com/vector-im/element-android into feature/ons/qr_code_login_ui 2022-10-13 21:27:09 +01:00
Onuray Sahin fb2776dca4 Cherry pick previous commits. 2022-10-13 20:33:52 +03:00
Onuray Sahin 1e1affbb7b Merge branch 'develop' into feature/ons/qr_code_login_ui 
# Conflicts:
#	library/ui-strings/src/main/res/values/strings.xml
#	library/ui-styles/src/main/res/values/stylable_sessions_list_header_view.xml
#	vector-app/src/debug/java/im/vector/app/features/debug/features/DebugFeaturesStateFactory.kt
#	vector-app/src/debug/java/im/vector/app/features/debug/features/DebugVectorFeatures.kt
#	vector/src/main/java/im/vector/app/core/di/MavericksViewModelModule.kt
#	vector/src/main/java/im/vector/app/features/VectorFeatures.kt
#	vector/src/main/java/im/vector/app/features/settings/devices/v2/VectorSettingsDevicesFragment.kt
#	vector/src/main/java/im/vector/app/features/settings/devices/v2/list/SessionsListHeaderView.kt
#	vector/src/main/res/layout/fragment_other_sessions.xml
#	vector/src/main/res/layout/fragment_settings_devices.xml
 2022-10-12 14:32:09 +03:00
Hugh Nimmo-Smith 1235db7895 Implementations of MSC3886 and MSC3903 2022-10-11 23:33:30 +01:00
Jorge Martin Espinosa def67b2e7d
Integrate WYSIWYG editor (#7288) 
* Add WYSIWYG lib dependency

* Replace EditText with RichTextEditor

* Add bold button, fix sending formatting messages issues

* Add missing inline formatting buttons, make scrollview horizontal

* Disable autocomplete for rich text editor

* Add formatted text to messages sent, replies, quotes and edited messages.

* Several fixes

* Add changelog

* Try to fix lint issues

* Address review comments.

* Exclude Epoxy KSP generated files from ktlint checks
 2022-10-11 17:05:47 +02:00
Eric Decanini 2fe636e93b
Adds Push Notification toggle to Device Manager (#7261) 
* Adds push notifications switch

* Adds functionality to Push notification toggle

* Adds DefaultPushersServiceTest for togglePusher

* Adds DefaultTogglePusherTaskTest

* Adds SessionOverviewViewModelTest for toggling pusher

* Hides pusher toggle if there are no pushers of the device

* Adds changelog file

* Edits changelog file

* Fixes copyrights

* Unregisters checkedChangelistener in onDetachedFromWindow for switch view

* Fixes post merge errors

* Fixes legal copies

* Removes unused imports

* Fixes lint errors

* Fixes test errors

* Fixes error

* Fixes error

* Fixes error

* Fixes error

* Fixes error
 2022-10-10 19:21:34 -04:00
ericdecanini 4af2e62150 Merge branch 'develop' into feature/eric/msc3881 2022-10-09 12:45:19 -04:00
ericdecanini cd2e693f0c Fixes legal copy 2022-10-09 09:48:36 -04:00
ericdecanini 11e251fc1d Fixes legal copy 2022-10-09 09:48:18 -04:00
ericdecanini d191bfeaf7 Fixes legal copy 2022-10-09 09:46:07 -04:00
Florian Renaud 4091d27311 Add "io.element.voice_broadcast_info" state event 2022-10-06 16:23:40 +02:00
Benoit Marty 80c210e62d
Merge pull request #7292 from vector-im/feature/mna/device-manager-type-icons 
[Device Management] Show correct device type icons (PSG-775)
 2022-10-05 17:30:42 +02:00
Benoit Marty 38ca3b6cdb Version++ 2022-10-05 17:20:05 +02:00
Valere 502b12a07e
Merge pull request #7290 from vector-im/feature/bca/hinder_verification 
E2ee dos not hinder verification
 2022-10-05 14:34:34 +02:00
Valere fddeddacc7 fix outdated doc 2022-10-05 10:42:29 +02:00
Valere 37458d41f2 E2ee dos not hinder verification 2022-10-05 10:42:29 +02:00
Valere 68d4ac34c7 Move setting to room profile 2022-10-05 10:27:12 +02:00
Valere f7d8356327 post rebase fix & cleaning 2022-10-05 10:27:12 +02:00
Valere 92a72cb1e9 cleaning 2022-10-05 10:27:12 +02:00
Valere e9b33f6234 Per room block unverified devices 2022-10-05 10:27:12 +02:00
Maxime NATUREL f02b689ce0 Adding unit tests for mapper 2022-10-05 10:14:05 +02:00
Maxime NATUREL b23520ea40 Adding new field for last seen user agent in DB with migration 2022-10-05 10:14:04 +02:00
ericdecanini 034046701d Merge remote-tracking branch 'origin/develop' into feature/eric/msc3881 
# Conflicts:
#	vector/src/test/java/im/vector/app/test/fakes/FakeCryptoService.kt
 2022-10-04 14:05:23 -04:00
Valere 005e712396
Merge pull request #6703 from vector-im/feature/bca/crosssigning_reset_warning 
warn on cross signing reset
 2022-10-03 09:25:52 +02:00
Onuray Sahin d0dd446af8
Merge pull request #7247 from vector-im/feature/ons/parse_user_agent 
[Device Manager] Parse user agents (PSG-762)
 2022-09-30 18:36:33 +03:00
Valere b4f7e1381d fix test post rebase 2022-09-30 16:00:34 +02:00
Valere 59afe434f8 more tests 2022-09-30 16:00:34 +02:00
Valere ac0e5e9dec fix broken test, userId confustion 
cleaning


cleaning


add tests


cleaning
 2022-09-30 16:00:34 +02:00
Valere c8f0792997 warn on cross signing reset 2022-09-30 16:00:34 +02:00
Onuray Sahin 1238f31cdf
Merge pull request #7209 from vector-im/feature/ons/extend_user_agent 
[Device Manager] Extend user agent to include device information (PSG-755)
 2022-09-29 13:11:20 +03:00
Onuray Sahin 0f0ec54ed1 Code review fixes. 2022-09-29 12:20:01 +03:00
Valere 8132a7902b post merge code quality 2022-09-29 09:21:06 +02:00
Valere ce86e29122 Merge branch 'main' into develop 2022-09-28 18:16:39 +02:00
Onuray Sahin 5666383134 Add unit test for desktop and web user agents. 2022-09-28 18:19:25 +03:00
Valere aa42746034 version 1.5.1 2022-09-28 16:28:43 +02:00
Valere 5c442296ef Security fix CVE-2022-39246 CVE-2022-39248 2022-09-28 16:26:47 +02:00
Adam Brown fad02062d8
Instrumentation test coroutines (#7207) 
Converting SDK instrumentation tests from CountdownLatch to suspending functions
 2022-09-27 13:37:23 +01:00
Onuray Sahin c70b6206d0 Add user agent into device info. 2022-09-26 14:39:23 +03:00
ericdecanini 1f28a2acae Adds PushersMapperTest 2022-09-25 10:45:59 -04:00
ericdecanini 65c89638ab Fixes lint error with comments 2022-09-23 09:24:20 -04:00
Onuray Sahin 33eeb721bf Merge branch 'develop' into feature/ons/extend_user_agent 2022-09-23 16:17:06 +03:00
Onuray Sahin 42983f5ce4 Write unit test for computing user agent user case. 2022-09-23 15:55:02 +03:00
Onuray Sahin c7108f3ac3 Create use case to compute user agent. 2022-09-23 13:05:16 +03:00
ericdecanini 8c7901177e Adds comments to new fields in HttpPusher 2022-09-22 20:44:46 -04:00