Hugh Nimmo-Smith
|
d3e61a23a9
|
Fix generator
|
2022-10-17 17:29:45 +01:00 |
|
Hugh Nimmo-Smith
|
c3669318c1
|
Merge branch 'feature/hughns/qr_code_login' of https://github.com/vector-im/element-android into feature/hughns/qr_code_login
|
2022-10-17 16:37:35 +01:00 |
|
Hugh Nimmo-Smith
|
1863e4c3ef
|
Use unstable prefixes
|
2022-10-17 16:34:51 +01:00 |
Onuray Sahin
|
b2dc0b33b5
|
Implement try again button action.
|
2022-10-17 18:32:35 +03:00 |
|
Hugh Nimmo-Smith
|
3d37e0b2a5
|
Fix enum JsonClass generateAdapter = false
|
2022-10-17 16:19:03 +01:00 |
|
Hugh Nimmo-Smith
|
623277e31f
|
Lint
|
2022-10-17 16:13:49 +01:00 |
|
Hugh Nimmo-Smith
|
e877feed6e
|
Add @JsonClass to all enums
|
2022-10-17 16:06:08 +01:00 |
|
Hugh Nimmo-Smith
|
29065b819f
|
Remove unused class
|
2022-10-17 16:03:47 +01:00 |
|
Hugh Nimmo-Smith
|
e01ee619d3
|
Refactor error handling and report E2EE errors
|
2022-10-17 16:02:25 +01:00 |
|
Hugh Nimmo-Smith
|
d616251f26
|
Fix merge
|
2022-10-17 13:41:27 +01:00 |
|
Hugh Nimmo-Smith
|
e89774e160
|
Merge branch 'feature/ons/qr_code_login_ui' into feature/hughns/qr_code_login
|
2022-10-17 13:26:35 +01:00 |
|
Hugh Nimmo-Smith
|
eb30ef166a
|
Improve 404 handling
|
2022-10-17 12:32:40 +01:00 |
|
Hugh Nimmo-Smith
|
1976451c81
|
Lint
|
2022-10-17 12:23:14 +01:00 |
|
Onuray Sahin
|
91bb86d3c6
|
Code review fixes.
|
2022-10-17 14:16:29 +03:00 |
|
Hugh Nimmo-Smith
|
fb86ab70a2
|
Comments and error mapping
|
2022-10-17 12:05:32 +01:00 |
|
Hugh Nimmo-Smith
|
4306c57236
|
Thread safe use of OlmSAS
|
2022-10-17 12:01:12 +01:00 |
|
Hugh Nimmo-Smith
|
506fa729ea
|
Cleanup
|
2022-10-17 11:50:56 +01:00 |
|
Hugh Nimmo-Smith
|
48de8f4e34
|
Fix bad merge
|
2022-10-17 11:48:35 +01:00 |
|
Hugh Nimmo-Smith
|
33be5c257d
|
Refactor into dedicated files and companion objects
|
2022-10-17 11:24:48 +01:00 |
|
Hugh Nimmo-Smith
|
ed6bc01bef
|
Resolve TODO
|
2022-10-17 10:54:28 +01:00 |
|
Hugh Nimmo-Smith
|
d979b50b2c
|
Logging cleanup
|
2022-10-17 10:52:24 +01:00 |
|
Hugh Nimmo-Smith
|
fdc55965ca
|
Linting
|
2022-10-14 17:23:26 +01:00 |
|
Hugh Nimmo-Smith
|
dc9b41d19a
|
Merge branch 'feature/ons/qr_code_login_ui' into feature/hughns/qr_code_login
|
2022-10-14 17:12:08 +01:00 |
|
Onuray Sahin
|
6c10a9bf2d
|
Code review fixes.
|
2022-10-14 18:10:18 +03:00 |
|
Hugh Nimmo-Smith
|
6426ff40d3
|
Linting
|
2022-10-14 14:18:50 +01:00 |
|
Hugh Nimmo-Smith
|
411b766890
|
Refactor to camelcase
|
2022-10-14 14:17:19 +01:00 |
|
Hugh Nimmo-Smith
|
4325600d27
|
Merge branch 'feature/ons/qr_code_login_ui' into feature/hughns/qr_code_login
|
2022-10-14 13:57:04 +01:00 |
|
Hugh Nimmo-Smith
|
e439b72e48
|
Handle master key trust during E2EE set up
|
2022-10-14 13:46:57 +01:00 |
|
Onuray Sahin
|
5953346b3d
|
Merge branch 'develop' into feature/ons/qr_code_login_ui
# Conflicts:
# library/ui-strings/src/main/res/values/strings.xml
# matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/AuthenticationService.kt
# matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/DefaultAuthenticationService.kt
# matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/migration/MigrateSessionTo038.kt
# 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/features/VectorFeatures.kt
|
2022-10-14 15:17:55 +03: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
|
370652c04b
|
Revert "Revert "Implementations of MSC3886 and MSC3903""
This reverts commit 489dfd7354.
|
2022-10-13 22:37:19 +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
|
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
|
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 |
|
Hugh Nimmo-Smith
|
81f2197199
|
Another default value fix
|
2022-10-13 16:11:41 +01:00 |
|
Hugh Nimmo-Smith
|
c6e7185f8b
|
Set default value for optional params
|
2022-10-13 16:08:50 +01:00 |
|
Hugh Nimmo-Smith
|
8c86b3d297
|
Add missing binding
|
2022-10-13 16:02:57 +01:00 |
|
Hugh Nimmo-Smith
|
b5b32b7fda
|
Use correct var name
|
2022-10-13 15:58:19 +01:00 |