jarno
/
element-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
19,564 Commits 4 Branches 3 Tags 186 MiB
Commit Graph

19564 Commits

Author SHA1 Message Date
Hugh Nimmo-Smith 6399032312 Fix bad merge 2022-10-13 22:23:26 +01:00
Hugh Nimmo-Smith 7bc0bd3b57 Reduce logging 2022-10-13 22:15:07 +01:00
Hugh Nimmo-Smith dd47297dfd QR login + E2EE set up 2022-10-13 22:14:55 +01:00
Hugh Nimmo-Smith 9a72d6529b Support for navigation to home screen 2022-10-13 22:13:56 +01:00
Hugh Nimmo-Smith 991eeb1de6 Map for soft logout 2022-10-13 22:13:56 +01:00
Hugh Nimmo-Smith bc0843eddf Another default value fix 2022-10-13 22:13:56 +01:00
Hugh Nimmo-Smith ac80ae5632 Set default value for optional params 2022-10-13 22:13:56 +01:00
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 b03240330d Only do completeOnNewDevice if we received a confirmation code 2022-10-13 22:13:55 +01:00
Onuray Sahin ef574bd82f 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-13 22:13:55 +01:00
Hugh Nimmo-Smith bfab07d716 Partial implementation of QR login logic 2022-10-13 22:13:55 +01:00
Hugh Nimmo-Smith de611ca81a Implementations of MSC3886 and MSC3903 2022-10-13 22:13:30 +01:00
Hugh Nimmo-Smith 3b3e11e568 Retry scanning if not a QR code 2022-10-13 22:13:30 +01:00
Hugh Nimmo-Smith d0898a2b89 Linting 2022-10-13 22:13:30 +01:00
Hugh Nimmo-Smith 282825db79 Changelog 2022-10-13 22:13:03 +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 9429a4f22a Revert "Retry scanning if not a QR code" 
This reverts commit 87956e9438.
 2022-10-13 21:48:33 +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 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 1235db7895 Implementations of MSC3886 and MSC3903 2022-10-11 23:33:30 +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
Benoit Marty 31a79594fb
Merge pull request #7301 from vector-im/dependabot/gradle/androidx.sharetarget-sharetarget-1.2.0 
Bump sharetarget from 1.1.0 to 1.2.0 - REQUIRE DEVELOPER BRAIN
 2022-10-10 18:14:06 +02:00
Benoit Marty 23654a9ff8
Merge pull request #7315 from vector-im/dependabot/gradle/glide-4.14.2 
Bump glide from 4.14.1 to 4.14.2
 2022-10-10 18:13:36 +02:00
Benoit Marty 7878d6f565
Merge pull request #7316 from vector-im/dependabot/gradle/flipper-0.169.0 
Bump flipper from 0.164.0 to 0.169.0
 2022-10-10 18:13:12 +02:00
ericdecanini 267431d06e Fixes error 2022-10-10 11:37:39 -04:00
Benoit Marty ac5a5015ba
Merge pull request #7326 from vrifox/patch-1 
correct login_set_email_notice
 2022-10-10 17:03:57 +02:00
Vri 5430ca2966
correct login_set_email_notice 
Corrected the string as noted in this comment by @lvre (https://translate.element.io/translate/element-android/element-app/en/?checksum=8cfc63845b17eca4#comments) over on Weblate.
 2022-10-10 16:18:37 +02: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
ericdecanini cd2e693f0c Fixes legal copy 2022-10-09 09:48:36 -04:00