Revert to 3.4.1

Author: keeshux

.github/workflows/manual_release.yml

@@ -52,9 +52,8 @@ jobs:
           git_push_gpgsign: false
       - name: Tag release
         run: |
-          tag="v$APP_VERSION"
-          git tag -as "$tag" -m "$tag"
-          git push origin "$tag"
+          git tag -as "v$APP_VERSION" -m "v$APP_VERSION"
+          git push --tags
       - name: Publish release
         uses: softprops/action-gh-release@v2
         with:

.github/workflows/release.yml

@@ -214,9 +214,8 @@ jobs:
           git_push_gpgsign: false
       - name: Tag release
         run: |
-          tag="v$APP_VERSION"
-          git tag -as "$tag" -m "$tag"
-          git push origin "$tag"
+          git tag -as "v$APP_VERSION" -m "v$APP_VERSION"
+          git push --tags
       - name: Publish release
         uses: softprops/action-gh-release@v2
         with:

CHANGELOG.txt

@@ -1 +1,3 @@
-* Revert "Send to TV" and TV QR
+* Auto-delete stale keychain entries
+* Restore auto-deletion of migrated v2 profiles
+* Extend the eligibility for the "Forever" product (#1377)

Packages/App/Sources/AppUIMain/Domain/HTTPAddressPort.swift

@@ -60,7 +60,7 @@ public struct AppCoordinator: View, AppCoordinatorConforming, SizeClassProviding
     private var paywallReason: PaywallReason?
 
     @State
-    private var paywallContinuation: (() -> Void)?
+    private var onCancelPaywall: (() -> Void)?
 
     @State
     private var modalRoute: ModalRoute?
@@ -102,9 +102,14 @@ public struct AppCoordinator: View, AppCoordinatorConforming, SizeClassProviding
         ))
         .modifier(PaywallModifier(
             reason: $paywallReason,
-            onAction: { _, _ in
-                paywallContinuation?()
-            }
+            otherTitle: Strings.Views.Paywall.Alerts.Confirmation.editProfile,
+            onOtherAction: { profile in
+                guard let profile else {
+                    return
+                }
+                onEditProfile(profile.localizedPreview)
+            },
+            onCancel: onCancelPaywall
         ))
         .themeModal(
             item: $modalRoute,
@@ -296,7 +301,7 @@ extension AppCoordinator {
     public func onPurchaseRequired(
         for profile: Profile,
         features: Set<AppFeature>,
-        continuation: (() -> Void)?
+        onCancel: (() -> Void)?
     ) {
         pp_log_g(.app, .info, "Purchase required for features: \(features)")
         guard !iapManager.isLoadingReceipt else {
@@ -310,12 +315,12 @@ extension AppCoordinator {
                     "\n\n",
                     V.Connect._2(iapManager.verificationDelayMinutes)
                 ].joined(separator: " "),
-                onDismiss: continuation
+                onDismiss: onCancel
             )
             return
         }
         pp_log_g(.app, .info, "Present paywall")
-        paywallContinuation = continuation
+        onCancelPaywall = onCancel
 
         setLater(.init(profile, requiredFeatures: features, action: .connect)) {
             paywallReason = $0

Packages/App/Sources/AppUIMain/Views/App/AppCoordinator.swift

@@ -1,5 +1,5 @@
 //
-//  ProfileSharingView.swift
+//  ProfileAttributesView.swift
 //  Passepartout
 //
 //  Created by Davide De Rosa on 11/10/24.
@@ -23,28 +23,21 @@
 //  along with Passepartout.  If not, see <http://www.gnu.org/licenses/>.
 //
 
-import CommonLibrary
 import SwiftUI
 
-public struct ProfileSharingView: View {
-    private let flags: [ProfileSharingFlag]
+struct ProfileAttributesView: View {
+    enum Attribute {
+        case shared
 
-    private let isRemoteImportingEnabled: Bool
-
-    public init(flags: [ProfileSharingFlag], isRemoteImportingEnabled: Bool) {
-        self.flags = flags
-        self.isRemoteImportingEnabled = isRemoteImportingEnabled
+        case tv
     }
 
-    public init(profileManager: ProfileManager, profileId: Profile.ID) {
-        self.init(
-            flags: profileManager.sharingFlags(for: profileId),
-            isRemoteImportingEnabled: profileManager.isRemoteImportingEnabled
-        )
-    }
+    let attributes: [Attribute]
+
+    let isRemoteImportingEnabled: Bool
 
-    public var body: some View {
-        if !flags.isEmpty {
+    var body: some View {
+        if !attributes.isEmpty {
             ZStack(alignment: .centerFirstTextBaseline) {
                 Group {
                     ThemeImage(.cloudOn)
@@ -64,11 +57,9 @@ public struct ProfileSharingView: View {
             .foregroundStyle(.secondary)
         }
     }
-}
 
-private extension ProfileSharingView {
     var imageModels: [(name: Theme.ImageName, help: String)] {
-        flags.map {
+        attributes.map {
             switch $0 {
             case .shared:
                 return (
@@ -96,8 +87,8 @@ private extension ProfileSharingView {
             .autoconnect()
 
         var body: some View {
-            ProfileSharingView(
-                flags: [.shared, .tv],
+            ProfileAttributesView(
+                attributes: [.shared, .tv],
                 isRemoteImportingEnabled: isRemoteImportingEnabled
             )
             .onReceive(timer) { _ in
@@ -117,7 +108,7 @@ private extension ProfileSharingView {
         .withMockEnvironment()
 }
 
-private struct IconsPreview: View {
+struct IconsPreview: View {
     var body: some View {
         Form {
             HStack(alignment: .firstTextBaseline) {

Packages/App/Sources/UILibrary/Views/UI/ProfileSharingView.swift renamed to Packages/App/Sources/AppUIMain/Views/App/ProfileAttributesView.swift

@@ -55,7 +55,7 @@ struct ProfileRowView: View, Routable, SizeClassProviding {
         HStack {
             cardView
             Spacer()
-            sharingView
+            attributesView
             tunnelToggle
         }
         .unanimated()
@@ -74,10 +74,10 @@ private extension ProfileRowView {
         .foregroundStyle(.primary)
     }
 
-    var sharingView: some View {
-        ProfileSharingView(
-            profileManager: profileManager,
-            profileId: preview.id
+    var attributesView: some View {
+        ProfileAttributesView(
+            attributes: attributes,
+            isRemoteImportingEnabled: profileManager.isRemoteImportingEnabled
         )
         .imageScale(isBigDevice ? .large : .medium)
     }
@@ -99,9 +99,26 @@ private extension ProfileRowView {
         profileManager.profile(withId: preview.id)
     }
 
+    var attributes: [ProfileAttributesView.Attribute] {
+        if isTV {
+            return [.tv]
+        } else if isShared {
+            return [.shared]
+        }
+        return []
+    }
+
     var requiredFeatures: Set<AppFeature>? {
         profileManager.requiredFeatures(forProfileWithId: preview.id)
     }
+
+    var isShared: Bool {
+        profileManager.isRemotelyShared(profileWithId: preview.id)
+    }
+
+    var isTV: Bool {
+        isShared && profileManager.isAvailableForTV(profileWithId: preview.id)
+    }
 }
 
 // MARK: - Previews

Packages/App/Sources/AppUIMain/Views/App/ProfileRowView.swift

@@ -90,16 +90,18 @@ private extension DNSView {
     }
 
     var routingSection: some View {
-        Picker(Strings.Modules.Dns.routeThroughVpn, selection: $draft.module.routesThroughVPN) {
-            Text(Strings.Global.Nouns.default)
-                .tag(nil as Bool?)
-            Text(Strings.Global.Nouns.yes)
-                .tag(true as Bool?)
-            Text(Strings.Global.Nouns.no)
-                .tag(false as Bool?)
+        Group {
+            Picker(Strings.Modules.Dns.routeThroughVpn, selection: $draft.module.routesThroughVPN) {
+                Text(Strings.Global.Nouns.default)
+                    .tag(nil as Bool?)
+                Text(Strings.Global.Nouns.yes)
+                    .tag(true as Bool?)
+                Text(Strings.Global.Nouns.no)
+                    .tag(false as Bool?)
+            }
+            .themeRowWithSubtitle(Strings.Modules.Dns.RouteThroughVpn.footer)
         }
-        .themeContainerWithSingleEntry(
-            footer: Strings.Modules.Dns.RouteThroughVpn.footer)
+        .themeSection(footer: Strings.Modules.Dns.RouteThroughVpn.footer)
     }
 
     var domainSection: some View {

Packages/App/Sources/AppUIMain/Views/Modules/DNSView.swift

@@ -94,12 +94,15 @@ private extension IPView {
 
     @ViewBuilder
     func ipSections(for ip: Binding<IPSettings>, family: Address.Family) -> some View {
-        ThemeTextField(
-            Strings.Global.Nouns.address,
-            text: $subnets[family] ?? "",
-            placeholder: Strings.Unlocalized.Placeholders.ipDestination(forFamily: family)
-        )
-        .themeContainerWithSingleEntry(
+        Group {
+            ThemeTextField(
+                Strings.Global.Nouns.address,
+                text: $subnets[family] ?? "",
+                placeholder: Strings.Unlocalized.Placeholders.ipDestination(forFamily: family)
+            )
+            .themeRowWithSubtitle(Strings.Modules.Ip.Address.footer)
+        }
+        .themeSection(
             header: family.localizedDescription,
             footer: Strings.Modules.Ip.Address.footer
         )

Packages/App/Sources/AppUIMain/Views/Modules/IPView.swift

@@ -93,7 +93,7 @@ private extension OnDemandView {
                 )
             }
         }
-        .themeContainerWithSingleEntry(footer: policyFooterDescription)
+        .themeSectionWithSingleRow(footer: policyFooterDescription)
     }
 
     var policyFooterDescription: String {
@@ -122,7 +122,8 @@ private extension OnDemandView {
         }
         .themeSection(
             header: Strings.Global.Nouns.networks,
-            footer: Strings.Modules.OnDemand.Networks.footer
+            footer: Strings.Modules.OnDemand.Networks.footer,
+            forcesFooter: true
         )
     }
 
@@ -232,18 +233,17 @@ private extension OnDemandView {
         "Two": false,
         "Three": false
     ]
-    return module.preview()
-//    return module.preview {
-//        OnDemandView(
-//            draft: $1[$0],
-//            parameters: .init(
-//                registry: Registry(),
-//                editor: $1,
-//                impl: nil
-//            ),
-//            observer: MockWifi()
-//        )
-//    }
+    return module.preview {
+        OnDemandView(
+            draft: $1[$0],
+            parameters: .init(
+                registry: Registry(),
+                editor: $1,
+                impl: nil
+            ),
+            observer: MockWifi()
+        )
+    }
 }
 
 private class MockWifi: WifiObserver {