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

Fix VPN denial prompt loop #2728

Merged
merged 1 commit into from
Apr 12, 2024
Merged

Conversation

graeme
Copy link
Contributor

@graeme graeme commented Apr 12, 2024

Task/Issue URL: https://app.asana.com/0/0/1207063218351169/f

Description:

When I added logic to prevent a pixel being sent on system VPN config permission prompt denial, I returned too early rather than bubbling up the error which resulted in an endless loop of prompts showing whenever Cancel is tapped.

Steps to test this PR:

  1. Make sure any existing VPN config is deleted from iOS settings
  2. Make sure you have access to the VPN via Privacy Pro
  3. Go to Settings -> VPN and connect
  4. When the prompt shows, make sure you deny it.

Expected
The prompt should be dismissed and connection cancelled.

Copy Testing:

  • Use of correct apostrophes in new copy, ie rather than

Orientation Testing:

  • Portrait
  • Landscape

Device Testing:

  • iPhone SE (1st Gen)
  • iPhone 8
  • iPhone X
  • iPhone 14 Pro
  • iPad

OS Testing:

  • iOS 14
  • iOS 15
  • iOS 16

Theme Testing:

  • Light theme
  • Dark theme

Internal references:

Software Engineering Expectations
Technical Design Template

@graeme graeme requested a review from diegoreymendez April 12, 2024 12:28
@graeme graeme changed the base branch from main to release/7.115.0 April 12, 2024 12:28
Copy link

🚫 The Asana task linked in the PR description is not added to iOS App Board project.

  1. Verify that the correct task is linked in the PR.
    • ⚠️ Please use the actual implementation task, rather than the Code Review subtask.
  2. Verify that the task is added to iOS App Board project.
  3. When ready, remove the bot: not in app board label to retrigger the check.

@github-actions github-actions bot added the bot: not in app board Added by automation for pull requests with tasks not added to iOS App Board Asana project label Apr 12, 2024
@graeme graeme merged commit 6ff3caf into release/7.115.0 Apr 12, 2024
20 of 23 checks passed
@graeme graeme deleted the graeme/fix-vpn-denial-prompt branch April 12, 2024 13:03
samsymons added a commit that referenced this pull request Apr 15, 2024
# By Daniel Bernal (33) and others
# Via Mariusz Śpiewak (5) and others
* main: (245 commits)
  Fix inconsistent bars state when scrolling (#2733)
  fix tests (#2732)
  Release 7.115.0-4 (#2729)
  Fix VPN denial prompt loop (#2728)
  Small UI Fixes for subscriptions (#2690)
  SPM updated: SwiftSoup, Lottie, ZIPFoundation (#2724)
  Release 7.115.0-3 (#2727)
  VPN: Specific TunnelController start failure reporting (#2714)
  update bsk dependency (#2725)
  Subscriptions: Fix thread issue on Subscription Restore (#2719)
  Manage ‘Stale’ PRs (#2723)
  maestro: hide dax dialogs if visible and cancel keyboard after fireproof (#2695)
  Remove timezone offset from the VPN server object (#2701)
  Reverting accidental push to main (#2718)
  Add SubscriptionContainerViewModel and
  Manually hide loader + Pixel (#2687)
  Release 7.115.0-2 (#2712)
  soft revert history suggestions (#2711)
  Bring back accessibility identifiers for onboarding buttons (#2709)
  BSK release 133.1.0 (#2708)
  ...

# Conflicts:
#	Core/Pixel.swift
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bot: not in app board Added by automation for pull requests with tasks not added to iOS App Board Asana project
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants