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

Local Notification Settings Event #7300

Merged
merged 66 commits into from
Oct 13, 2022
Merged

Local Notification Settings Event #7300

merged 66 commits into from
Oct 13, 2022

Commits on Sep 28, 2022

  1. Adds push notifications switch

    @ericdecanini
    ericdecanini committed Sep 28, 2022
    Configuration menu
    Copy the full SHA
    5ced831 View commit details
    Browse the repository at this point in the history

  2. Adds functionality to Push notification toggle

    @ericdecanini
    ericdecanini committed Sep 28, 2022
    Configuration menu
    Copy the full SHA
    e1b78b9 View commit details
    Browse the repository at this point in the history

Commits on Sep 29, 2022

  1. Adds DefaultPushersServiceTest for togglePusher

    @ericdecanini
    ericdecanini committed Sep 29, 2022
    Configuration menu
    Copy the full SHA
    233d07e View commit details
    Browse the repository at this point in the history

  2. Adds DefaultTogglePusherTaskTest

    @ericdecanini
    ericdecanini committed Sep 29, 2022
    Configuration menu
    Copy the full SHA
    da80c08 View commit details
    Browse the repository at this point in the history

  3. Adds SessionOverviewViewModelTest for toggling pusher

    @ericdecanini
    ericdecanini committed Sep 29, 2022
    Configuration menu
    Copy the full SHA
    670cceb View commit details
    Browse the repository at this point in the history

  4. Hides pusher toggle if there are no pushers of the device

    @ericdecanini
    ericdecanini committed Sep 29, 2022
    Configuration menu
    Copy the full SHA
    71558ed View commit details
    Browse the repository at this point in the history

  5. Adds changelog file

    @ericdecanini
    ericdecanini committed Sep 29, 2022
    Configuration menu
    Copy the full SHA
    3cc22c5 View commit details
    Browse the repository at this point in the history

  6. Edits changelog file

    @ericdecanini
    ericdecanini committed Sep 29, 2022
    Configuration menu
    Copy the full SHA
    66b8ebd View commit details
    Browse the repository at this point in the history

Commits on Oct 3, 2022

  1. Fixes copyrights

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

  2. Unregisters checkedChangelistener in onDetachedFromWindow for switch … 

    …view
    @ericdecanini
    ericdecanini committed Oct 3, 2022
    Configuration menu
    Copy the full SHA
    47e5491 View commit details
    Browse the repository at this point in the history

  3. Links notification settings toggle to pusher service

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

  4. Adds changelog file

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

Commits on Oct 4, 2022

  1. Adds error handling to VectorSettingsNotificationPreferenceFragment

    @ericdecanini
    ericdecanini committed Oct 4, 2022
    Configuration menu
    Copy the full SHA
    757ee1a View commit details
    Browse the repository at this point in the history

  2. Removes comment in FakePushersService

    @ericdecanini
    ericdecanini committed Oct 4, 2022
    Configuration menu
    Copy the full SHA
    121415d View commit details
    Browse the repository at this point in the history

Commits on Oct 5, 2022

  1. Adds parsing for LocalNotificationSettings event

    @ericdecanini
    ericdecanini committed Oct 5, 2022
    Configuration menu
    Copy the full SHA
    826efc0 View commit details
    Browse the repository at this point in the history

  2. Adds changelog file

    @ericdecanini
    ericdecanini committed Oct 5, 2022
    Configuration menu
    Copy the full SHA
    3cfb6a9 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'feature/eric/msc3881' into feature/eric/push-toggle-not… 

    …ifications

# Conflicts:
#	vector/src/main/java/im/vector/app/features/settings/devices/v2/overview/SessionOverviewAction.kt
#	vector/src/main/java/im/vector/app/features/settings/devices/v2/overview/SessionOverviewFragment.kt
#	vector/src/main/java/im/vector/app/features/settings/devices/v2/overview/SessionOverviewViewModel.kt
#	vector/src/main/java/im/vector/app/features/settings/devices/v2/overview/SessionOverviewViewState.kt
#	vector/src/main/res/layout/fragment_session_overview.xml
#	vector/src/test/java/im/vector/app/features/settings/devices/v2/overview/SessionOverviewViewModelTest.kt
    @ericdecanini
    ericdecanini committed Oct 5, 2022
    Configuration menu
    Copy the full SHA
    225050d View commit details
    Browse the repository at this point in the history

  4. Fixes post merge errors

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

  5. Merge branch 'feature/eric/push-toggle-notifications' into feature/er… 

    …ic/notificaton-settings-enabled

# Conflicts:
#	vector/src/test/java/im/vector/app/core/pushers/PushersManagerTest.kt
    @ericdecanini
    ericdecanini committed Oct 5, 2022
    Configuration menu
    Copy the full SHA
    2289fde View commit details
    Browse the repository at this point in the history

Commits on Oct 7, 2022

  1. Merge branch 'feature/eric/msc3881' into feature/eric/push-toggle-not… 

    …ifications
    @ericdecanini
    ericdecanini committed Oct 7, 2022
    Configuration menu
    Copy the full SHA
    1639b71 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'feature/eric/push-toggle-notifications' into feature/er… 

    …ic/notificaton-settings-enabled
    @ericdecanini
    ericdecanini committed Oct 7, 2022
    Configuration menu
    Copy the full SHA
    a1908b0 View commit details
    Browse the repository at this point in the history

  3. Fixes imports and improves string name

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

  4. Merge branch 'feature/eric/notificaton-settings-enabled' into feature… 

    …/eric/local_notification_settings
    @ericdecanini
    ericdecanini committed Oct 7, 2022
    Configuration menu
    Copy the full SHA
    008ea66 View commit details
    Browse the repository at this point in the history

Commits on Oct 9, 2022

  1. Merge branch 'feature/eric/msc3881' into feature/eric/push-toggle-not… 

    …ifications
    @ericdecanini
    ericdecanini committed Oct 9, 2022
    Configuration menu
    Copy the full SHA
    9c533bc View commit details
    Browse the repository at this point in the history

  2. Merge branch 'feature/eric/msc3881' into feature/eric/push-toggle-not… 

    …ifications
    @ericdecanini
    ericdecanini committed Oct 9, 2022
    Configuration menu
    Copy the full SHA
    4f65d5d View commit details
    Browse the repository at this point in the history

  3. Fixes legal copies

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

  4. Fixes kdoc punctuation

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

  5. Merge branch 'feature/eric/push-toggle-notifications' into feature/er… 

    …ic/notificaton-settings-enabled
    @ericdecanini
    ericdecanini committed Oct 9, 2022
    Configuration menu
    Copy the full SHA
    a9dd794 View commit details
    Browse the repository at this point in the history

  6. Fixes string error

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

  7. Removes unused imports

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

  8. Merge branch 'feature/eric/msc3881' into feature/eric/push-toggle-not… 

    …ifications
    @ericdecanini
    ericdecanini committed Oct 9, 2022
    Configuration menu
    Copy the full SHA
    c356b8c View commit details
    Browse the repository at this point in the history

  9. Merge branch 'feature/eric/push-toggle-notifications' into feature/er… 

    …ic/notificaton-settings-enabled
    @ericdecanini
    ericdecanini committed Oct 9, 2022
    Configuration menu
    Copy the full SHA
    ddc0021 View commit details
    Browse the repository at this point in the history

  10. Moves LocalNotificationSettingsContent

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

  11. Merge branch 'feature/eric/notificaton-settings-enabled' into feature… 

    …/eric/local_notification_settings
    @ericdecanini
    ericdecanini committed Oct 9, 2022
    Configuration menu
    Copy the full SHA
    126f048 View commit details
    Browse the repository at this point in the history

  12. Merge branch 'feature/eric/msc3881' into feature/eric/push-toggle-not… 

    …ifications
    @ericdecanini
    ericdecanini committed Oct 9, 2022
    Configuration menu
    Copy the full SHA
    4a8eb51 View commit details
    Browse the repository at this point in the history

  13. Fixes lint errors

    @ericdecanini
    ericdecanini committed Oct 9, 2022
    Configuration menu
    Copy the full SHA
    91e902f View commit details
    Browse the repository at this point in the history

  14. Fixes test errors

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

  15. Merge branch 'feature/eric/push-toggle-notifications' into feature/er… 

    …ic/notificaton-settings-enabled
    @ericdecanini
    ericdecanini committed Oct 9, 2022
    Configuration menu
    Copy the full SHA
    3ecd04f View commit details
    Browse the repository at this point in the history

  16. Fixes test errors

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

  17. Fixes error

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

  18. Merge branch 'feature/eric/push-toggle-notifications' into feature/er… 

    …ic/notificaton-settings-enabled
    @ericdecanini
    ericdecanini committed Oct 9, 2022
    Configuration menu
    Copy the full SHA
    6895e14 View commit details
    Browse the repository at this point in the history

  19. Merge branch 'feature/eric/notificaton-settings-enabled' into feature… 

    …/eric/local_notification_settings
    @ericdecanini
    ericdecanini committed Oct 9, 2022
    Configuration menu
    Copy the full SHA
    04a0da9 View commit details
    Browse the repository at this point in the history

  20. Fixes error

    @ericdecanini
    ericdecanini committed Oct 9, 2022
    Configuration menu
    Copy the full SHA
    971fe8e View commit details
    Browse the repository at this point in the history

  21. Merge branch 'feature/eric/push-toggle-notifications' into feature/er… 

    …ic/notificaton-settings-enabled
    @ericdecanini
    ericdecanini committed Oct 9, 2022
    Configuration menu
    Copy the full SHA
    476aab3 View commit details
    Browse the repository at this point in the history

  22. Fixes error

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

  23. Merge branch 'feature/eric/notificaton-settings-enabled' into feature… 

    …/eric/local_notification_settings
    @ericdecanini
    ericdecanini committed Oct 9, 2022
    Configuration menu
    Copy the full SHA
    7523556 View commit details
    Browse the repository at this point in the history

  24. Fixes error

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

  25. Fixes error

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

  26. Fixes error

    @ericdecanini
    ericdecanini committed Oct 9, 2022
    Configuration menu
    Copy the full SHA
    1e3dbba View commit details
    Browse the repository at this point in the history

  27. Merge branch 'feature/eric/push-toggle-notifications' into feature/er… 

    …ic/notificaton-settings-enabled
    @ericdecanini
    ericdecanini committed Oct 9, 2022
    Configuration menu
    Copy the full SHA
    49c6240 View commit details
    Browse the repository at this point in the history

  28. Merge branch 'feature/eric/notificaton-settings-enabled' into feature… 

    …/eric/local_notification_settings
    @ericdecanini
    ericdecanini committed Oct 9, 2022
    Configuration menu
    Copy the full SHA
    dfe17cd View commit details
    Browse the repository at this point in the history

  29. Fixes error

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

  30. Merge branch 'feature/eric/push-toggle-notifications' into feature/er… 

    …ic/notificaton-settings-enabled
    @ericdecanini
    ericdecanini committed Oct 9, 2022
    Configuration menu
    Copy the full SHA
    f93674d View commit details
    Browse the repository at this point in the history

  31. Merge branch 'feature/eric/notificaton-settings-enabled' into feature… 

    …/eric/local_notification_settings
    @ericdecanini
    ericdecanini committed Oct 9, 2022
    Configuration menu
    Copy the full SHA
    6457e45 View commit details
    Browse the repository at this point in the history

Commits on Oct 10, 2022

  1. Merge branch 'feature/eric/msc3881' into feature/eric/push-toggle-not… 

    …ifications
    @ericdecanini
    ericdecanini committed Oct 10, 2022
    Configuration menu
    Copy the full SHA
    110600c View commit details
    Browse the repository at this point in the history

  2. Merge branch 'feature/eric/push-toggle-notifications' into feature/er… 

    …ic/notificaton-settings-enabled
    @ericdecanini
    ericdecanini committed Oct 10, 2022
    Configuration menu
    Copy the full SHA
    2f2dc4e View commit details
    Browse the repository at this point in the history

  3. Merge branch 'feature/eric/notificaton-settings-enabled' into feature… 

    …/eric/local_notification_settings
    @ericdecanini
    ericdecanini committed Oct 10, 2022
    Configuration menu
    Copy the full SHA
    fc61d09 View commit details
    Browse the repository at this point in the history

Commits on Oct 11, 2022

  1. Merge remote-tracking branch 'origin/develop' into feature/eric/notif… 

    …icaton-settings-enabled

# Conflicts:
#	vector/src/test/java/im/vector/app/features/settings/devices/v2/overview/SessionOverviewViewModelTest.kt
#	vector/src/test/java/im/vector/app/test/fakes/FakePushersService.kt
    @ericdecanini
    ericdecanini committed Oct 11, 2022
    Configuration menu
    Copy the full SHA
    cb81451 View commit details
    Browse the repository at this point in the history

  2. Adds lost tests

    @ericdecanini
    ericdecanini committed Oct 11, 2022
    Configuration menu
    Copy the full SHA
    b02b4a3 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'feature/eric/notificaton-settings-enabled' into feature… 

    …/eric/local_notification_settings
    @ericdecanini
    ericdecanini committed Oct 11, 2022
    Configuration menu
    Copy the full SHA
    8f9b315 View commit details
    Browse the repository at this point in the history

  4. Adds PusherEntity migration

    @ericdecanini
    ericdecanini committed Oct 11, 2022
    Configuration menu
    Copy the full SHA
    c6224b1 View commit details
    Browse the repository at this point in the history

  5. Fixes session overview layout overlap

    @ericdecanini
    ericdecanini committed Oct 11, 2022
    Configuration menu
    Copy the full SHA
    d1562d3 View commit details
    Browse the repository at this point in the history

  6. Fixes switch being enabled by default

    @ericdecanini
    ericdecanini committed Oct 11, 2022
    Configuration menu
    Copy the full SHA
    992d7d3 View commit details
    Browse the repository at this point in the history

  7. Merge branch 'feature/eric/notificaton-settings-enabled' into feature… 

    …/eric/local_notification_settings
    @ericdecanini
    ericdecanini committed Oct 11, 2022
    Configuration menu
    Copy the full SHA
    b693c93 View commit details
    Browse the repository at this point in the history

Commits on Oct 12, 2022

  1. Adds device id and unstable prefix

    @ericdecanini
    ericdecanini committed Oct 12, 2022
    Configuration menu
    Copy the full SHA
    c0441ad View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'origin/develop' into feature/eric/local… 

    …_notification_settings
    @ericdecanini
    ericdecanini committed Oct 12, 2022
    Configuration menu
    Copy the full SHA
    c38bbd8 View commit details
    Browse the repository at this point in the history