Commit graph

20045 commits

Author SHA1 Message Date
dependabot[bot]
b679727246
Bump dokka-gradle-plugin from 1.7.10 to 1.7.20 (#7329)
Bumps dokka-gradle-plugin from 1.7.10 to 1.7.20.

---
updated-dependencies:
- dependency-name: org.jetbrains.dokka:dokka-gradle-plugin
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-10-14 09:48:15 +02:00
Hugh Nimmo-Smith
de4232dff5 Fix logic for showing confirm button 2022-10-14 06:17:48 +01:00
Hugh Nimmo-Smith
d72371906e Add flag to allow QR login on all servers + split flag for showing in device manager 2022-10-14 06:17:48 +01:00
Hugh Nimmo-Smith
efa70fa0ff Revert "Retry scanning if not a QR code"
This reverts commit 87956e9438.
2022-10-14 06:17:48 +01:00
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
c00ce91214 Linting 2022-10-14 01:11:25 +01:00
Hugh Nimmo-Smith
c18439f99b Refactor code into api from internal 2022-10-14 01:07:19 +01:00
Hugh Nimmo-Smith
5abb786b6b Fix copyright on SDK 2022-10-14 00:59:31 +01:00
Hugh Nimmo-Smith
385140aaf1 Merge branch 'feature/hughns/qr_code_login' of https://github.com/vector-im/element-android into feature/hughns/qr_code_login 2022-10-14 00:44:09 +01:00
dependabot[bot]
1960dc3e41
Bump libphonenumber from 8.12.56 to 8.12.57
Bumps [libphonenumber](https://github.com/google/libphonenumber) from 8.12.56 to 8.12.57.
- [Release notes](https://github.com/google/libphonenumber/releases)
- [Changelog](https://github.com/google/libphonenumber/blob/master/making-metadata-changes.md)
- [Commits](https://github.com/google/libphonenumber/compare/v8.12.56...v8.12.57)

---
updated-dependencies:
- dependency-name: com.googlecode.libphonenumber:libphonenumber
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-10-13 23:08:06 +00:00
dependabot[bot]
f2d76be20c
Bump com.google.devtools.ksp from 1.7.20-1.0.6 to 1.7.20-1.0.7
Bumps [com.google.devtools.ksp](https://github.com/google/ksp) from 1.7.20-1.0.6 to 1.7.20-1.0.7.
- [Release notes](https://github.com/google/ksp/releases)
- [Commits](https://github.com/google/ksp/compare/1.7.20-1.0.6...1.7.20-1.0.7)

---
updated-dependencies:
- dependency-name: com.google.devtools.ksp
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-10-13 23:06:43 +00:00
Hugh Nimmo-Smith
f04f0e6fac Revert "Revert "Partial implementation of QR login logic""
This reverts commit e305478dda.
2022-10-13 22:42:58 +01:00
Hugh Nimmo-Smith
370652c04b Revert "Revert "Implementations of MSC3886 and MSC3903""
This reverts commit 489dfd7354.
2022-10-13 22:37:19 +01:00
Hugh Nimmo-Smith
958ee2d356 Revert "Revert "Retry scanning if not a QR code""
This reverts commit 9429a4f22a.
2022-10-13 22:32:02 +01:00
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
Hugh Nimmo-Smith
560fda51d1 Reduce logging 2022-10-13 21:26:22 +01:00
Hugh Nimmo-Smith
1ed082d3cb QR login + E2EE set up 2022-10-13 21:15:52 +01:00
Hugh Nimmo-Smith
0111b932de Support for navigation to home screen 2022-10-13 21:08:45 +01:00
Onuray Sahin
fb2776dca4 Cherry pick previous commits. 2022-10-13 20:33:52 +03:00
Hugh Nimmo-Smith
8dbb1b830e Map for soft logout 2022-10-13 16:28:58 +01:00
Hugh Nimmo-Smith
738242c837 Map for soft logout 2022-10-13 16:28:47 +01:00
Hugh Nimmo-Smith
22b344c43a Another default value fix 2022-10-13 16:11:56 +01:00
Hugh Nimmo-Smith
81f2197199 Another default value fix 2022-10-13 16:11:41 +01:00
Hugh Nimmo-Smith
b5e81d27d6 Set default value for optional params 2022-10-13 16:08:59 +01:00
Hugh Nimmo-Smith
c6e7185f8b Set default value for optional params 2022-10-13 16:08:50 +01:00
Hugh Nimmo-Smith
579df74257 Add missing binding 2022-10-13 16:03:20 +01:00
Hugh Nimmo-Smith
8c86b3d297 Add missing binding 2022-10-13 16:02:57 +01:00