Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Implement logic for sign in with QR #7369

Merged
merged 101 commits into from
Oct 19, 2022
Merged

Implement logic for sign in with QR #7369

merged 101 commits into from
Oct 19, 2022

Commits on Oct 13, 2022

  1. Support for login by m.login.token during QR code sign in

    @hughns
    hughns committed Oct 13, 2022
    Configuration menu
    Copy the full SHA
    21ae4c6 View commit details
    Browse the repository at this point in the history

  2. Changelog

    @hughns
    hughns committed Oct 13, 2022
    Configuration menu
    Copy the full SHA
    098c268 View commit details
    Browse the repository at this point in the history

  3. Linting

    @hughns
    hughns committed Oct 13, 2022
    Configuration menu
    Copy the full SHA
    a71ecee View commit details
    Browse the repository at this point in the history

  4. Retry scanning if not a QR code

    @hughns
    hughns committed Oct 13, 2022
    Configuration menu
    Copy the full SHA
    0d24565 View commit details
    Browse the repository at this point in the history

  5. Implementations of MSC3886 and MSC3903

    @hughns
    hughns committed Oct 13, 2022
    Configuration menu
    Copy the full SHA
    1c70d45 View commit details
    Browse the repository at this point in the history

  6. Partial implementation of QR login logic

    @hughns
    hughns committed Oct 13, 2022
    Configuration menu
    Copy the full SHA
    b192fdb View commit details
    Browse the repository at this point in the history

  7. 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
    @hughns
    Onuray Sahin authored and hughns committed Oct 13, 2022
    Configuration menu
    Copy the full SHA
    6e09d90 View commit details
    Browse the repository at this point in the history

  8. Only do completeOnNewDevice if we received a confirmation code

    @hughns
    hughns committed Oct 13, 2022
    Configuration menu
    Copy the full SHA
    8609008 View commit details
    Browse the repository at this point in the history

  9. Make initialDeviceName optional

    @hughns
    hughns committed Oct 13, 2022
    Configuration menu
    Copy the full SHA
    ebb3d20 View commit details
    Browse the repository at this point in the history

  10. Use correct var name

    @hughns
    hughns committed Oct 13, 2022
    Configuration menu
    Copy the full SHA
    5843c38 View commit details
    Browse the repository at this point in the history

  11. Add missing binding

    @hughns
    hughns committed Oct 13, 2022
    Configuration menu
    Copy the full SHA
    579df74 View commit details
    Browse the repository at this point in the history

  12. Set default value for optional params

    @hughns
    hughns committed Oct 13, 2022
    Configuration menu
    Copy the full SHA
    b5e81d2 View commit details
    Browse the repository at this point in the history

  13. Another default value fix

    @hughns
    hughns committed Oct 13, 2022
    Configuration menu
    Copy the full SHA
    22b344c View commit details
    Browse the repository at this point in the history

  14. Map for soft logout

    @hughns
    hughns committed Oct 13, 2022
    Configuration menu
    Copy the full SHA
    8dbb1b8 View commit details
    Browse the repository at this point in the history

  15. Support for navigation to home screen

    @hughns
    hughns committed Oct 13, 2022
    Configuration menu
    Copy the full SHA
    0111b93 View commit details
    Browse the repository at this point in the history

  16. QR login + E2EE set up

    @hughns
    hughns committed Oct 13, 2022
    Configuration menu
    Copy the full SHA
    1ed082d View commit details
    Browse the repository at this point in the history

  17. Reduce logging

    @hughns
    hughns committed Oct 13, 2022
    Configuration menu
    Copy the full SHA
    560fda5 View commit details
    Browse the repository at this point in the history

  18. Support for login by m.login.token during QR code sign in

    @hughns
    hughns committed Oct 13, 2022
    Configuration menu
    Copy the full SHA
    88238c0 View commit details
    Browse the repository at this point in the history

  19. Changelog

    @hughns
    hughns committed Oct 13, 2022
    Configuration menu
    Copy the full SHA
    282825d View commit details
    Browse the repository at this point in the history

  20. Linting

    @hughns
    hughns committed Oct 13, 2022
    Configuration menu
    Copy the full SHA
    d0898a2 View commit details
    Browse the repository at this point in the history

  21. Retry scanning if not a QR code

    @hughns
    hughns committed Oct 13, 2022
    Configuration menu
    Copy the full SHA
    3b3e11e View commit details
    Browse the repository at this point in the history

  22. Implementations of MSC3886 and MSC3903

    @hughns
    hughns committed Oct 13, 2022
    Configuration menu
    Copy the full SHA
    de611ca View commit details
    Browse the repository at this point in the history

  23. Partial implementation of QR login logic

    @hughns
    hughns committed Oct 13, 2022
    Configuration menu
    Copy the full SHA
    bfab07d View commit details
    Browse the repository at this point in the history

  24. 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
    @hughns
    Onuray Sahin authored and hughns committed Oct 13, 2022
    Configuration menu
    Copy the full SHA
    ef574bd View commit details
    Browse the repository at this point in the history

  25. Only do completeOnNewDevice if we received a confirmation code

    @hughns
    hughns committed Oct 13, 2022
    Configuration menu
    Copy the full SHA
    b032403 View commit details
    Browse the repository at this point in the history

  26. Make initialDeviceName optional

    @hughns
    hughns committed Oct 13, 2022
    Configuration menu
    Copy the full SHA
    1e60f3c View commit details
    Browse the repository at this point in the history

  27. Use correct var name

    @hughns
    hughns committed Oct 13, 2022
    Configuration menu
    Copy the full SHA
    e2f3dde View commit details
    Browse the repository at this point in the history

  28. Add missing binding

    @hughns
    hughns committed Oct 13, 2022
    Configuration menu
    Copy the full SHA
    ca7a6ef View commit details
    Browse the repository at this point in the history

  29. Set default value for optional params

    @hughns
    hughns committed Oct 13, 2022
    Configuration menu
    Copy the full SHA
    ac80ae5 View commit details
    Browse the repository at this point in the history

  30. Another default value fix

    @hughns
    hughns committed Oct 13, 2022
    Configuration menu
    Copy the full SHA
    bc0843e View commit details
    Browse the repository at this point in the history

  31. Map for soft logout

    @hughns
    hughns committed Oct 13, 2022
    Configuration menu
    Copy the full SHA
    991eeb1 View commit details
    Browse the repository at this point in the history

  32. Support for navigation to home screen

    @hughns
    hughns committed Oct 13, 2022
    Configuration menu
    Copy the full SHA
    9a72d65 View commit details
    Browse the repository at this point in the history

  33. QR login + E2EE set up

    @hughns
    hughns committed Oct 13, 2022
    Configuration menu
    Copy the full SHA
    dd47297 View commit details
    Browse the repository at this point in the history

  34. Reduce logging

    @hughns
    hughns committed Oct 13, 2022
    Configuration menu
    Copy the full SHA
    7bc0bd3 View commit details
    Browse the repository at this point in the history

  35. Fix bad merge

    @hughns
    hughns committed Oct 13, 2022
    Configuration menu
    Copy the full SHA
    6399032 View commit details
    Browse the repository at this point in the history

  36. Revert "Revert "Retry scanning if not a QR code"" 

    This reverts commit 9429a4f.
    @hughns
    hughns committed Oct 13, 2022
    Configuration menu
    Copy the full SHA
    958ee2d View commit details
    Browse the repository at this point in the history

  37. Revert "Revert "Implementations of MSC3886 and MSC3903"" 

    This reverts commit 489dfd7.
    @hughns
    hughns committed Oct 13, 2022
    Configuration menu
    Copy the full SHA
    370652c View commit details
    Browse the repository at this point in the history

  38. Revert "Revert "Partial implementation of QR login logic"" 

    This reverts commit e305478.
    @hughns
    hughns committed Oct 13, 2022
    Configuration menu
    Copy the full SHA
    f04f0e6 View commit details
    Browse the repository at this point in the history

  39. Merge branch 'feature/hughns/qr_code_login' of https://github.com/vec… 

    …tor-im/element-android into feature/hughns/qr_code_login
    @hughns
    hughns committed Oct 13, 2022
    Configuration menu
    Copy the full SHA
    385140a View commit details
    Browse the repository at this point in the history

  40. Fix copyright on SDK

    @hughns
    hughns committed Oct 13, 2022
    Configuration menu
    Copy the full SHA
    5abb786 View commit details
    Browse the repository at this point in the history

Commits on Oct 14, 2022

  1. Refactor code into api from internal

    @hughns
    hughns committed Oct 14, 2022
    Configuration menu
    Copy the full SHA
    c18439f View commit details
    Browse the repository at this point in the history

  2. Linting

    @hughns
    hughns committed Oct 14, 2022
    Configuration menu
    Copy the full SHA
    c00ce91 View commit details
    Browse the repository at this point in the history

  3. Revert "Retry scanning if not a QR code" 

    This reverts commit 87956e9.
    @hughns
    hughns committed Oct 14, 2022
    Configuration menu
    Copy the full SHA
    efa70fa View commit details
    Browse the repository at this point in the history

  4. Add flag to allow QR login on all servers + split flag for showing in… 

    … device manager
    @hughns
    hughns committed Oct 14, 2022
    Configuration menu
    Copy the full SHA
    d723719 View commit details
    Browse the repository at this point in the history

  5. Fix logic for showing confirm button

    @hughns
    hughns committed Oct 14, 2022
    Configuration menu
    Copy the full SHA
    de4232d View commit details
    Browse the repository at this point in the history

  6. Handle master key trust during E2EE set up

    @hughns
    hughns committed Oct 14, 2022
    Configuration menu
    Copy the full SHA
    e439b72 View commit details
    Browse the repository at this point in the history

  7. Merge branch 'feature/ons/qr_code_login_ui' into feature/hughns/qr_co… 

    …de_login
    @hughns
    hughns committed Oct 14, 2022
    Configuration menu
    Copy the full SHA
    4325600 View commit details
    Browse the repository at this point in the history

  8. Changelog

    @hughns
    hughns committed Oct 14, 2022
    Configuration menu
    Copy the full SHA
    f999e72 View commit details
    Browse the repository at this point in the history

  9. Refactor to camelcase

    @hughns
    hughns committed Oct 14, 2022
    Configuration menu
    Copy the full SHA
    411b766 View commit details
    Browse the repository at this point in the history

  10. Linting

    @hughns
    hughns committed Oct 14, 2022
    Configuration menu
    Copy the full SHA
    6426ff4 View commit details
    Browse the repository at this point in the history

  11. Merge branch 'feature/ons/qr_code_login_ui' into feature/hughns/qr_co… 

    …de_login
    @hughns
    hughns committed Oct 14, 2022
    Configuration menu
    Copy the full SHA
    dc9b41d View commit details
    Browse the repository at this point in the history

  12. Linting

    @hughns
    hughns committed Oct 14, 2022
    Configuration menu
    Copy the full SHA
    fdc5596 View commit details
    Browse the repository at this point in the history

  13. Fix compile error from bad merge

    @hughns
    hughns committed Oct 14, 2022
    Configuration menu
    Copy the full SHA
    bfe3daa View commit details
    Browse the repository at this point in the history

  14. Fix missing param

    @hughns
    hughns committed Oct 14, 2022
    Configuration menu
    Copy the full SHA
    a3fc785 View commit details
    Browse the repository at this point in the history

Commits on Oct 17, 2022

  1. Logging cleanup

    @hughns
    hughns committed Oct 17, 2022
    Configuration menu
    Copy the full SHA
    d979b50 View commit details
    Browse the repository at this point in the history

  2. Resolve TODO

    @hughns
    hughns committed Oct 17, 2022
    Configuration menu
    Copy the full SHA
    ed6bc01 View commit details
    Browse the repository at this point in the history

  3. Refactor into dedicated files and companion objects

    @hughns
    hughns committed Oct 17, 2022
    Configuration menu
    Copy the full SHA
    33be5c2 View commit details
    Browse the repository at this point in the history

  4. Remove unused val

    @hughns
    hughns committed Oct 17, 2022
    Configuration menu
    Copy the full SHA
    3be4a0c View commit details
    Browse the repository at this point in the history

  5. Fix bad merge

    @hughns
    hughns committed Oct 17, 2022
    Configuration menu
    Copy the full SHA
    48de8f4 View commit details
    Browse the repository at this point in the history

  6. Cleanup

    @hughns
    hughns committed Oct 17, 2022
    Configuration menu
    Copy the full SHA
    506fa72 View commit details
    Browse the repository at this point in the history

  7. Thread safe use of OlmSAS

    @hughns
    hughns committed Oct 17, 2022
    Configuration menu
    Copy the full SHA
    4306c57 View commit details
    Browse the repository at this point in the history

  8. Comments and error mapping

    @hughns
    hughns committed Oct 17, 2022
    Configuration menu
    Copy the full SHA
    fb86ab7 View commit details
    Browse the repository at this point in the history

  9. Lint

    @hughns
    hughns committed Oct 17, 2022
    Configuration menu
    Copy the full SHA
    1976451 View commit details
    Browse the repository at this point in the history

  10. Improve 404 handling

    @hughns
    hughns committed Oct 17, 2022
    Configuration menu
    Copy the full SHA
    eb30ef1 View commit details
    Browse the repository at this point in the history

  11. Merge branch 'feature/ons/qr_code_login_ui' into feature/hughns/qr_co… 

    …de_login
    @hughns
    hughns committed Oct 17, 2022
    Configuration menu
    Copy the full SHA
    e89774e View commit details
    Browse the repository at this point in the history

  12. Merge branch 'feature/ons/qr_code_login_ui' into feature/hughns/qr_co… 

    …de_login
    @hughns
    hughns committed Oct 17, 2022
    Configuration menu
    Copy the full SHA
    7e24f6a View commit details
    Browse the repository at this point in the history

  13. Fix merge

    @hughns
    hughns committed Oct 17, 2022
    Configuration menu
    Copy the full SHA
    d616251 View commit details
    Browse the repository at this point in the history

  14. Refactor error handling and report E2EE errors

    @hughns
    hughns committed Oct 17, 2022
    Configuration menu
    Copy the full SHA
    e01ee61 View commit details
    Browse the repository at this point in the history

  15. Remove unused class

    @hughns
    hughns committed Oct 17, 2022
    Configuration menu
    Copy the full SHA
    29065b8 View commit details
    Browse the repository at this point in the history

  16. Add @JsonClass to all enums

    @hughns
    hughns committed Oct 17, 2022
    Configuration menu
    Copy the full SHA
    e877fee View commit details
    Browse the repository at this point in the history

  17. Lint

    @hughns
    hughns committed Oct 17, 2022
    Configuration menu
    Copy the full SHA
    623277e View commit details
    Browse the repository at this point in the history

  18. Fix enum JsonClass generateAdapter = false

    @hughns
    hughns committed Oct 17, 2022
    Configuration menu
    Copy the full SHA
    3d37e0b View commit details
    Browse the repository at this point in the history

  19. Improved comment around QR generation

    @hughns
    hughns committed Oct 17, 2022
    Configuration menu
    Copy the full SHA
    552fb9d View commit details
    Browse the repository at this point in the history

  20. Implement try again button action.

    Onuray Sahin committed Oct 17, 2022
    Configuration menu
    Copy the full SHA
    b2dc0b3 View commit details
    Browse the repository at this point in the history

  21. Use unstable prefixes

    @hughns
    hughns committed Oct 17, 2022
    Configuration menu
    Copy the full SHA
    1863e4c View commit details
    Browse the repository at this point in the history

  22. Merge branch 'feature/hughns/qr_code_login' of https://github.com/vec… 

    …tor-im/element-android into feature/hughns/qr_code_login
    @hughns
    hughns committed Oct 17, 2022
    Configuration menu
    Copy the full SHA
    c366931 View commit details
    Browse the repository at this point in the history

  23. Fix generator

    @hughns
    hughns committed Oct 17, 2022
    Configuration menu
    Copy the full SHA
    d3e61a2 View commit details
    Browse the repository at this point in the history

  24. Lint

    @hughns
    hughns committed Oct 17, 2022
    Configuration menu
    Copy the full SHA
    41dbdbc View commit details
    Browse the repository at this point in the history

  25. Better function name

    @hughns
    hughns committed Oct 17, 2022
    Configuration menu
    Copy the full SHA
    8c81902 View commit details
    Browse the repository at this point in the history

  26. Lint

    @hughns
    hughns committed Oct 17, 2022
    Configuration menu
    Copy the full SHA
    8f4d998 View commit details
    Browse the repository at this point in the history

  27. remove nullability

    @hughns
    hughns committed Oct 17, 2022
    Configuration menu
    Copy the full SHA
    6d17d51 View commit details
    Browse the repository at this point in the history

  28. Wording updates

    @hughns
    hughns committed Oct 17, 2022
    Configuration menu
    Copy the full SHA
    8cfe6b1 View commit details
    Browse the repository at this point in the history

  29. Automatically try again on partial failed QR scan

    @hughns
    hughns committed Oct 17, 2022
    Configuration menu
    Copy the full SHA
    cf1c751 View commit details
    Browse the repository at this point in the history

  30. Progress to status screen on failure

    @hughns
    hughns committed Oct 17, 2022
    Configuration menu
    Copy the full SHA
    a3126b0 View commit details
    Browse the repository at this point in the history

  31. Lint

    @hughns
    hughns committed Oct 17, 2022
    Configuration menu
    Copy the full SHA
    8a62dfb View commit details
    Browse the repository at this point in the history

Commits on Oct 18, 2022

  1. Use mutex

    @hughns
    hughns committed Oct 18, 2022
    Configuration menu
    Copy the full SHA
    f297117 View commit details
    Browse the repository at this point in the history

  2. Always check master key when provided by verifying device

    @hughns
    hughns committed Oct 18, 2022
    Configuration menu
    Copy the full SHA
    a1d2944 View commit details
    Browse the repository at this point in the history

  3. Whitespce

    @hughns
    hughns committed Oct 18, 2022
    Configuration menu
    Copy the full SHA
    57a8dd4 View commit details
    Browse the repository at this point in the history

  4. Missing throws

    @hughns
    hughns committed Oct 18, 2022
    Configuration menu
    Copy the full SHA
    376cd1c View commit details
    Browse the repository at this point in the history

  5. Update library/ui-strings/src/main/res/values/strings.xml 

    Co-authored-by: Benoit Marty <benoitm@matrix.org>
    @hughns @bmarty
    hughns and bmarty authored Oct 18, 2022
    Configuration menu
    Copy the full SHA
    9fb0db3 View commit details
    Browse the repository at this point in the history

  6. Update matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/re… 

    …ndezvous/RendezvousChannel.kt

Co-authored-by: Benoit Marty <benoitm@matrix.org>
    @hughns @bmarty
    hughns and bmarty authored Oct 18, 2022
    Configuration menu
    Copy the full SHA
    0d1df3f View commit details
    Browse the repository at this point in the history

  7. Update matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/re… 

    …ndezvous/channels/ECDHRendezvousChannel.kt

Co-authored-by: Benoit Marty <benoitm@matrix.org>
    @hughns @bmarty
    hughns and bmarty authored Oct 18, 2022
    Configuration menu
    Copy the full SHA
    8530f8f View commit details
    Browse the repository at this point in the history

  8. Update matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/re… 

    …ndezvous/RendezvousChannel.kt

Co-authored-by: Benoit Marty <benoitm@matrix.org>
    @hughns @bmarty
    hughns and bmarty authored Oct 18, 2022
    Configuration menu
    Copy the full SHA
    a83fb8b View commit details
    Browse the repository at this point in the history

  9. Don't log whole QR code

    @hughns
    hughns committed Oct 18, 2022
    Configuration menu
    Copy the full SHA
    916ae65 View commit details
    Browse the repository at this point in the history

  10. Merge branch 'feature/hughns/qr_code_login' of https://github.com/vec… 

    …tor-im/element-android into feature/hughns/qr_code_login
    @hughns
    hughns committed Oct 18, 2022
    Configuration menu
    Copy the full SHA
    0acbd9c View commit details
    Browse the repository at this point in the history

  11. Reuse getDecimalCodeRepresentation from SAS instead of duplicating code

    @hughns
    hughns committed Oct 18, 2022
    Configuration menu
    Copy the full SHA
    811d6d8 View commit details
    Browse the repository at this point in the history

  12. Remove redundant annotations

    @hughns
    hughns committed Oct 18, 2022
    Configuration menu
    Copy the full SHA
    f7e0a19 View commit details
    Browse the repository at this point in the history

  13. The one that got away

    @hughns
    hughns committed Oct 18, 2022
    Configuration menu
    Copy the full SHA
    67be8c3 View commit details
    Browse the repository at this point in the history

  14. Fix layout after try again button is clicked.

    Onuray Sahin committed Oct 18, 2022
    Configuration menu
    Copy the full SHA
    0c52a7e View commit details
    Browse the repository at this point in the history

Commits on Oct 19, 2022

  1. Request changes from review

    @hughns
    hughns committed Oct 19, 2022
    Configuration menu
    Copy the full SHA
    4f652f1 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'feature/hughns/qr_code_login' of https://github.com/vec… 

    …tor-im/element-android into feature/hughns/qr_code_login
    @hughns
    hughns committed Oct 19, 2022
    Configuration menu
    Copy the full SHA
    025a89f View commit details
    Browse the repository at this point in the history