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

Fix DBP interrupt function not being cleared on succesful completion #2690

Merged
merged 2 commits into from
Apr 24, 2024
Merged

Fix DBP interrupt function not being cleared on succesful completion #2690

merged 2 commits into from
Apr 24, 2024

Conversation

THISISDINOSAUR
Copy link
Contributor

Task/Issue URL: https://app.asana.com/0/1199230911884351/1207152863082294/f
Tech Design URL:
CC:

Description:
Straightforward, as title

Steps to test this PR:

  1. test DBP still works
  2. Test the various pixels still work as expected. Test the interrupt pixel is called only when a function is actually interrupted
  3. Test that an interrupt pixel and a completed successfully pixel are never fired at the same time
Internal references:

Pull Request Review Checklist
Software Engineering Expectations
Technical Design Template
Pull Request Documentation

@THISISDINOSAUR THISISDINOSAUR requested a review from Bunn April 23, 2024 18:08
Bunn
Bunn approved these changes Apr 23, 2024
View reviewed changes
Copy link
Collaborator

@Bunn Bunn left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, small comment about using [weak self]

@THISISDINOSAUR THISISDINOSAUR merged commit 99408c1 into main Apr 24, 2024
16 checks passed
@THISISDINOSAUR THISISDINOSAUR deleted the elle/dbp-fix-clearing-function-to-interrupt branch April 24, 2024 10:43
This was referenced Apr 24, 2024
Closed
Merged
THISISDINOSAUR added a commit that referenced this pull request Apr 24, 2024
@THISISDINOSAUR
DBP interrupt fixes for release (#2696)
68122b2 
Task/Issue URL:
https://app.asana.com/0/1199230911884351/1207148631921399/f and
https://app.asana.com/0/1199230911884351/1207152863082294/f
Tech Design URL:
CC:

**Description**:
Combines #2685 and
#2690 to merge them into
an internal release

**Steps to test this PR**:
1. Follow the steps in the two individual PRs

<!--
Tagging instructions
If this PR isn't ready to be merged for whatever reason it should be
marked with the `DO NOT MERGE` label (particularly if it's a draft)
If it's pending Product Review/PFR, please add the `Pending Product
Review` label.

If at any point it isn't actively being worked on/ready for
review/otherwise moving forward (besides the above PR/PFR exception)
strongly consider closing it (or not opening it in the first place). If
you decide not to close it, make sure it's labelled to make it clear the
PRs state and comment with more information.
-->

---
###### Internal references:
[Pull Request Review
Checklist](https://app.asana.com/0/1202500774821704/1203764234894239/f)
[Software Engineering
Expectations](https://app.asana.com/0/59792373528535/199064865822552)
[Technical Design
Template](https://app.asana.com/0/59792373528535/184709971311943)
[Pull Request
Documentation](https://app.asana.com/0/1202500774821704/1204012835277482/f)
ayoy pushed a commit that referenced this pull request Apr 24, 2024
@THISISDINOSAUR @ayoy
DBP interrupt fixes for release (#2696)
410d1a3 
Task/Issue URL:
https://app.asana.com/0/1199230911884351/1207148631921399/f
https://app.asana.com/0/1199230911884351/1207152863082294/f
Tech Design URL:
CC:

**Description**:
Combines #2685 and
#2690 to merge them into
an internal release

**Steps to test this PR**:
1. Follow the steps in the two individual PRs

<!--
Tagging instructions
If this PR isn't ready to be merged for whatever reason it should be
marked with the `DO NOT MERGE` label (particularly if it's a draft)
If it's pending Product Review/PFR, please add the `Pending Product
Review` label.

If at any point it isn't actively being worked on/ready for
review/otherwise moving forward (besides the above PR/PFR exception)
strongly consider closing it (or not opening it in the first place). If
you decide not to close it, make sure it's labelled to make it clear the
PRs state and comment with more information.
-->

---
[Pull Request Review
Checklist](https://app.asana.com/0/1202500774821704/1203764234894239/f)
[Software Engineering
Expectations](https://app.asana.com/0/59792373528535/199064865822552)
[Technical Design
Template](https://app.asana.com/0/59792373528535/184709971311943)
[Pull Request
Documentation](https://app.asana.com/0/1202500774821704/1204012835277482/f)
samsymons added a commit that referenced this pull request Apr 24, 2024
@samsymons
Merge branch 'main' into sam/add-subscription-status-to-macos-metadata
cbf830b 
* main: (22 commits)
  Fix DataBrokerProtectionProcessor.swift lint
  Fix SwiftLint
  Add parameter allowed encoding to error descriptions (#2691)
  Remove debug flags
  Bump version to 1.85.0 (174)
  Revert interrupt logic (#2699)
  Fix downloads not appearing (#2693)
  Bump version to 1.85.0 (173)
  DBP interrupt fixes for release  (#2696)
  Bookmark All Tabs (#2683)
  Fix DBP interrupt function not being cleared on succesful completion (#2690)
  Bump version to 1.85.0 (172)
  Validate DBP permissions (#2673)
  Bump BSK (#2688)
  Add Untitled tab title (#2650)
  Stop first scan completed notification being sent if there's an error (#2685)
  DBP: Rename scanAllBrokers to startManualScan (#2679)
  macOS: Bundle-Specfic Autofill Secure Vault Keychain Items (#2652)
  Bump version to 1.85.0 (171)
  [Release PR] Link Lottie with the NetworkProtectionUI library (#2676)
  ...
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Bunn Bunn Bunn approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@THISISDINOSAUR @Bunn