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

12094 Commits

Author SHA1 Message Date
Hugh Nimmo-Smith 4c7c86100f Fix logic for showing confirm button 2022-10-14 02:04:08 +01:00
Hugh Nimmo-Smith 343cf74871 Add flag to allow QR login on all servers + split flag for showing in device manager 2022-10-14 01:45:03 +01:00
Hugh Nimmo-Smith 9429a4f22a Revert "Retry scanning if not a QR code" 
This reverts commit 87956e9438.
 2022-10-13 21:48:33 +01:00
Hugh Nimmo-Smith e305478dda Revert "Partial implementation of QR login logic" 
This reverts commit 4b14ee4695.
 2022-10-13 21:48:25 +01:00
Hugh Nimmo-Smith 90fa5d5345 Revert "Only do completeOnNewDevice if we received a confirmation code" 
This reverts commit 6e58f2fa51.
 2022-10-13 21:48:21 +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
Hugh Nimmo-Smith 6e58f2fa51 Only do completeOnNewDevice if we received a confirmation code 2022-10-12 13:08:01 +01: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 4b14ee4695 Partial implementation of QR login logic 2022-10-11 23:34:05 +01:00
Hugh Nimmo-Smith 87956e9438 Retry scanning if not a QR code 2022-10-11 23:32:49 +01:00
Onuray Sahin d8ea9c8215 Add flag for qr code login. 2022-10-11 20:04:18 +03:00
Onuray Sahin f272e566b0 Implement link a device flow. 2022-10-11 19:03:15 +03: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
Onuray Sahin 5566300665 Add qr code options to layout. 2022-10-11 14:15:44 +03:00
Onuray Sahin aacf2ba8a6 Refactor layout. 2022-10-11 13:08:43 +03: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
Eric Decanini a096ff03c8
Merge pull request #7217 from vector-im/feature/eric/msc3881 
Implements MSC3881 (enabled and device_id fields for Pusher API)
 2022-10-10 12:37:47 -04:00
Onuray Sahin ad208a0819 Refactor layout. 2022-10-10 13:48:25 +03:00
Benoit Marty 34cc5e8bd7
Merge pull request #7311 from vector-im/feature/bma/fix_bc 
Fix breadcrumbs
 2022-10-10 10:08:03 +02:00
ericdecanini 618cf7ac0e Fixes error 2022-10-09 14:55:43 -04:00
ericdecanini c94884b9d3 Fixes error 2022-10-09 14:55:25 -04:00
ericdecanini 4af2e62150 Merge branch 'develop' into feature/eric/msc3881 2022-10-09 12:45:19 -04:00
ericdecanini 31d4fc9ab0 Fixes lint error 2022-10-09 12:45:11 -04:00
ericdecanini 78555ec6ba Rearranges imports 2022-10-09 10:59:11 -04:00
Onuray Sahin 236b30367f Fix ui test case. 2022-10-07 19:13:59 +03:00
Onuray Sahin 2b452d6fe5 Implement qr code login failed states. 2022-10-07 19:04:27 +03:00
Onuray Sahin 2527cab73e Fix cancel actions. 2022-10-07 17:48:40 +03:00
Onuray Sahin 04fb31666b Implement show qr code screen. 2022-10-07 17:34:41 +03:00
Maxime NATUREL 9827ffb1e5
Merge pull request #7312 from vector-im/fix/mna/device-manager-long-session-name 
[Device Management] Long session names not rendered well (PSG-820)
 2022-10-07 15:57:12 +02:00
Maxime NATUREL bcf315aece Fix UI for long session names in SessionDetailsContentItem 2022-10-07 11:28:05 +02:00
Maxime NATUREL 824752a4ec Fix UI for long session names in SessionInfoView 2022-10-07 11:28:05 +02:00
Benoit Marty bbc4b35b23 Remove unused val. 2022-10-07 11:27:08 +02:00
Benoit Marty e08028378b Fix broken Breadcrumbs 2022-10-07 11:26:37 +02:00
Onuray Sahin 1932edad46 Fix instructions view visibility. 2022-10-06 18:48:07 +03:00
Onuray Sahin a00afa7a30 Simulate qr login states. 2022-10-06 18:17:02 +03:00
Florian Renaud 0a047b6045 Use VoiceBroadcastEvent wrapper 2022-10-06 16:28:38 +02:00
Florian Renaud cc1bb23406 Aggregate voice broadcast state events 2022-10-06 16:28:38 +02:00
Florian Renaud b286a52f5b Catch error and return Result in useCases 2022-10-06 16:27:11 +02:00
Florian Renaud 30f33d36de Use session.getRoom(roomId) 2022-10-06 16:27:11 +02:00
Florian Renaud 521af70988 Pass VoiceBroadcastState in MessageVoiceBroadcastItem 2022-10-06 16:27:11 +02:00
Florian Renaud 05b8f7d375 Create TimelineEvent.getVectorLastMessageContent() in vector module 2022-10-06 16:27:07 +02:00
Florian Renaud 01e0383dd5 Reorder VoiceBroadcastAction switch cases 2022-10-06 16:25:57 +02:00
Florian Renaud e4e953acf9 Verify that there is no ongoing voice broadcast before starting a new one 2022-10-06 16:25:56 +02:00
Florian Renaud b9bb7d7892 Add VoiceBroadcastEvent wrapper 2022-10-06 16:25:56 +02:00
Florian Renaud faeb078c8b Add voice broadcast state event in timeline displayable events 2022-10-06 16:25:56 +02:00
Florian Renaud 1bc894712e Add unit tests for use cases 2022-10-06 16:25:56 +02:00
Florian Renaud e4a52e1d5e Add deletion action on voice broadcast event 2022-10-06 16:25:56 +02:00
Florian Renaud daf4fc0f6d Add basic timeline voice broadcast item 2022-10-06 16:25:56 +02:00
Florian Renaud bcc84c8025 Add several voice broadcast actions 2022-10-06 16:25:52 +02:00