Skip to content

fix: require startup data-use consent before app access #4

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

Merged
tkgstrator merged 8 commits into from
Oct 5, 2026
Merged

fix: require startup data-use consent before app access #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
897d707
fix: separate consent flow from settings disclosure
tkgstrator Oct 4, 2026
618f19f
fix: use native toolbar actions for capture consent
tkgstrator Oct 4, 2026
ad2047f
docs: record TestFlight build 30 delivery and verification
tkgstrator Oct 5, 2026
cc3936e
docs: draft build 30 App Review notes pending device verification
tkgstrator Oct 5, 2026
fd9ca0e
fix: require data-use agreement at app startup
tkgstrator Oct 5, 2026
4ca3c82
style: present startup data-use notice as icon cards
tkgstrator Oct 5, 2026
f01d104
fix: pin optional setup flow for App Review submission
tkgstrator Oct 5, 2026
10c7147
docs: shorten build 31 reviewer instructions
tkgstrator Oct 5, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/ios.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ jobs:
uses: actions/checkout@v4
with:
repository: qtmleap/Mudmouth
ref: 698d5bcb25245a26a3be925c34ded8a4c8a2ff6a
ref: 5c97774f645023b22366db5abe86797915da2d33
path: Mudmouth
persist-credentials: false

Expand Down
16 changes: 8 additions & 8 deletions Interceptor.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -574,7 +574,7 @@
CODE_SIGN_ENTITLEMENTS = Interceptor/Interceptor.entitlements;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 29;
CURRENT_PROJECT_VERSION = 30;
DEVELOPMENT_TEAM = 5Q94QJ7G98;
ENABLE_PREVIEWS = YES;
GENERATE_INFOPLIST_FILE = YES;
Expand Down Expand Up @@ -612,7 +612,7 @@
CODE_SIGN_ENTITLEMENTS = Interceptor/Interceptor.entitlements;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 29;
CURRENT_PROJECT_VERSION = 30;
DEVELOPMENT_TEAM = 5Q94QJ7G98;
ENABLE_PREVIEWS = YES;
GENERATE_INFOPLIST_FILE = YES;
Expand Down Expand Up @@ -647,7 +647,7 @@
buildSettings = {
BUNDLE_LOADER = "$(TEST_HOST)";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 29;
CURRENT_PROJECT_VERSION = 30;
DEVELOPMENT_TEAM = 5Q94QJ7G98;
GENERATE_INFOPLIST_FILE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 18.5;
Expand All @@ -666,7 +666,7 @@
buildSettings = {
BUNDLE_LOADER = "$(TEST_HOST)";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 29;
CURRENT_PROJECT_VERSION = 30;
DEVELOPMENT_TEAM = 5Q94QJ7G98;
GENERATE_INFOPLIST_FILE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 18.5;
Expand All @@ -684,7 +684,7 @@
isa = XCBuildConfiguration;
buildSettings = {
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 29;
CURRENT_PROJECT_VERSION = 30;
DEVELOPMENT_TEAM = 5Q94QJ7G98;
GENERATE_INFOPLIST_FILE = YES;
MARKETING_VERSION = 1.0;
Expand All @@ -701,7 +701,7 @@
isa = XCBuildConfiguration;
buildSettings = {
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 29;
CURRENT_PROJECT_VERSION = 30;
DEVELOPMENT_TEAM = 5Q94QJ7G98;
GENERATE_INFOPLIST_FILE = YES;
MARKETING_VERSION = 1.0;
Expand All @@ -720,7 +720,7 @@
CODE_SIGN_ENTITLEMENTS = PacketTunnel/PacketTunnel.entitlements;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 29;
CURRENT_PROJECT_VERSION = 30;
DEVELOPMENT_TEAM = 5Q94QJ7G98;
GENERATE_INFOPLIST_FILE = YES;
INFOPLIST_FILE = PacketTunnel/Info.plist;
Expand Down Expand Up @@ -752,7 +752,7 @@
CODE_SIGN_ENTITLEMENTS = PacketTunnel/PacketTunnel.entitlements;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 29;
CURRENT_PROJECT_VERSION = 30;
DEVELOPMENT_TEAM = 5Q94QJ7G98;
GENERATE_INFOPLIST_FILE = YES;
INFOPLIST_FILE = PacketTunnel/Info.plist;
Expand Down
8 changes: 8 additions & 0 deletions Interceptor/Classes/Tuberose.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,14 @@ public final class Tuberose: ObservableObject {
mudmouth.stopVPNTunnel()
}

func withdrawCaptureConsent() {
CaptureAuthorization.revoke()
activateOnForeground = false
stopVPNTunnel()
UNUserNotificationCenter.current().removeAllPendingNotificationRequests()
UNUserNotificationCenter.current().removeAllDeliveredNotifications()
}

func setToken(_ value: UNNotificationResponse) throws {
try CaptureAuthorization.requireConsent()
guard let rawID = value.notification.request.content.userInfo["recordID"] as? String,
Expand Down
50 changes: 34 additions & 16 deletions Interceptor/ContentView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,42 @@ import SwiftyLogger

struct ContentView: View {
@Environment(\.isFirstLaunch) private var isFirstLaunch: Binding<Bool>
@AppStorage("CaptureConsentDecided") private var consentDecided = false
@State private var showConsent = false
@EnvironmentObject private var client: Tuberose
@Environment(\.scenePhase) private var scenePhase
@AppStorage(CaptureAuthorization.key, store: CaptureAuthorization.defaults) private var consentVersion = 0

private var requiresConsent: Bool { consentVersion != CaptureAuthorization.version }

var body: some View {
Group {
if requiresConsent {
// Keep history, settings and their presentations unavailable until agreement.
Color(.systemBackground).ignoresSafeArea()
} else {
mainTabs
}
}
.onAppear { stopCaptureIfUnauthorized() }
.onChange(of: consentVersion) { stopCaptureIfUnauthorized() }
.onChange(of: scenePhase) {
if scenePhase == .active {
consentVersion = CaptureAuthorization.defaults.integer(forKey: CaptureAuthorization.key)
stopCaptureIfUnauthorized()
}
}
.fullScreenCover(isPresented: Binding(get: { requiresConsent }, set: { _ in })) {
NavigationStack {
DataUseConsentView { isFirstLaunch.wrappedValue = false }
}
.interactiveDismissDisabled()
}
}

private func stopCaptureIfUnauthorized() {
if !CaptureAuthorization.isGranted { client.stopVPNTunnel() }
}

private var mainTabs: some View {
TabView(content: {
NavigationView(content: {
HomeView()
Expand Down Expand Up @@ -50,20 +82,6 @@ struct ContentView: View {
tabView.tabBar.backgroundColor = .systemBackground
tabView.tabBar.isTranslucent = true
})
.onAppear {
let version = CaptureAuthorization.defaults.integer(forKey: CaptureAuthorization.key)
showConsent = !consentDecided || (version != 0 && version != CaptureAuthorization.version)
if !CaptureAuthorization.isGranted { Tuberose.default.stopVPNTunnel() }
}
.fullScreenCover(isPresented: $showConsent) {
NavigationStack {
DataUseConsentView { _ in
consentDecided = true
isFirstLaunch.wrappedValue = false
showConsent = false
}
}.interactiveDismissDisabled()
}
}
}

Expand Down
Loading
Loading