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.

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

Update NetP launch agent logic to include build number #2015

Merged
merged 1 commit into from
Jan 4, 2024

Conversation

samsymons
Copy link
Collaborator

@samsymons samsymons commented Jan 4, 2024

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

Description:

This PR updates the NetP launch logic to include the build number. Previously it only used the version number to detect if the app had been updated and thus needed to re-install the agent, but now we publish builds with the same version number multiple times and only bump the build number.

Steps to test this PR:

  1. Open NetworkProtectionAppEvents and add a breakpoint at line 119
  2. Launch the app, and when the breakpoint hits, check that the value of currentVersion includes the build; you should see something like 1.69.0.97

Internal references:

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

@samsymons samsymons requested a review from ayoy January 4, 2024 05:34
let currentVersion = AppVersion.shared.versionNumber
let currentVersion = AppVersion.shared.versionAndBuildNumber
Copy link
Collaborator Author

Choose a reason for hiding this comment

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

This issue is easy enough to fall into without realizing that I'm considering renaming versionNumber to versionNumberWithoutBuild.

@ayoy ayoy force-pushed the sam/fix-agent-restart-logic branch from 98542dc to c903b7a Compare January 4, 2024 07:14
@ayoy ayoy changed the base branch from main to release/1.69.0 January 4, 2024 07:15
Copy link
Collaborator

@ayoy ayoy left a comment

Choose a reason for hiding this comment

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

Works great, thanks @samsymons !

@ayoy ayoy merged commit 38a6982 into release/1.69.0 Jan 4, 2024
15 checks passed
@ayoy ayoy deleted the sam/fix-agent-restart-logic branch January 4, 2024 07:35
samsymons added a commit that referenced this pull request Jan 8, 2024
* main: (35 commits)
  Update login item failure pixel (#2024)
  fix turn off sync error message (#2025)
  DBP: macOS - Scheduler Progress Notifications (#2023)
  DBP: Implement sign-out flow for DBP (#2009)
  Switch CI to Xcode 15.1 (#2022)
  fix(duckplayer): bump CSS for duckplayer nav loop fix (#1982)
  Bump Submodules/privacy-reference-tests from `a3acc21` to `6b7ad1e` (#2006)
  Bump version to 1.69.0 (99)
  DBP: Respect foreign constraints when deleting all user's data (#2014)
  DBP: Respect foreign constraints when deleting all user's data (#2014)
  Don't force reload tab when restoring state (#2016)
  Bump version to 1.69.0 (98)
  Update embedded files
  Update NetP launch agent logic to include build number (#2015)
  Always use 'sandbox' Application Support directory for Favicons Fetcher (#2013)
  Allow calculations in the address bar (#2012)
  Fix clickable area for buttons in 'Sync with Another Device' view (#2011)
  Fix for empty autofill state displayed on top of existing password items (#1998)
  Update error messages (#1999)
  Autofill never save for site (#1991)
  ...
samsymons added a commit that referenced this pull request Jan 9, 2024
# By Dax the Duck (6) and others
# Via Fernando Bunn (2) and others
* main: (36 commits)
  Send VPN system extension crashes to Sentry (#2002)
  Update login item failure pixel (#2024)
  fix turn off sync error message (#2025)
  DBP: macOS - Scheduler Progress Notifications (#2023)
  DBP: Implement sign-out flow for DBP (#2009)
  Switch CI to Xcode 15.1 (#2022)
  fix(duckplayer): bump CSS for duckplayer nav loop fix (#1982)
  Bump Submodules/privacy-reference-tests from `a3acc21` to `6b7ad1e` (#2006)
  Bump version to 1.69.0 (99)
  DBP: Respect foreign constraints when deleting all user's data (#2014)
  DBP: Respect foreign constraints when deleting all user's data (#2014)
  Don't force reload tab when restoring state (#2016)
  Bump version to 1.69.0 (98)
  Update embedded files
  Update NetP launch agent logic to include build number (#2015)
  Always use 'sandbox' Application Support directory for Favicons Fetcher (#2013)
  Allow calculations in the address bar (#2012)
  Fix clickable area for buttons in 'Sync with Another Device' view (#2011)
  Fix for empty autofill state displayed on top of existing password items (#1998)
  Update error messages (#1999)
  ...

# Conflicts:
#	DuckDuckGo.xcodeproj/project.pbxproj
#	DuckDuckGo/Statistics/PixelEvent.swift
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants