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

Use displayVersionString instead of versionString for OS version mism… #2138

Merged
merged 1 commit into from
Jun 5, 2022

Conversation

samschott
Copy link
Contributor

This PR fixes an issue where user-facing error messages about an operating system version mismatch (too new / too old) would show the versionString instead of the displayVersionString .

Misc Checklist

  • My change requires a documentation update on Sparkle's website repository
  • My change requires changes to generate_appcast, generate_keys, or sign_update

Only bug fixes to regressions or security fixes are being backported to the 1.x (master) branch now. If you believe your change is significant enough to backport, please also create a separate pull request against the master branch.

Testing

I tested and verified my change by using one or multiple of these methods:

  • Sparkle Test App
  • Unit Tests
  • My own app
  • Other (please specify)

(Describe all the cases that were tested)

macOS version tested: 10.13

@zorgiepoo
Copy link
Member

zorgiepoo commented Jun 5, 2022

Thanks. I now realize the documentation for displayVersionString is wrong and it shouldn't be nullable, which I'll fix separately.

@zorgiepoo zorgiepoo added this to the 2.2 milestone Jun 5, 2022
@samschott
Copy link
Contributor Author

Ah, indeed, I overlooked that it's marked as nullable. Though in practice, it looks like it is always set:

if (shortVersionString) {
_displayVersionString = [shortVersionString copy];
} else {
_displayVersionString = [_versionString copy];
}

@zorgiepoo
Copy link
Member

Indeed fixing that in #2139

@zorgiepoo zorgiepoo merged commit a33bae7 into sparkle-project:2.x Jun 5, 2022
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