Skip to content

Commit b595aa3

Browse files
hijohnnylinhijohnnylin
committed
Fix widget toggle behavior, update localization for Spanish, Japanese.
1 parent 2ca6323 commit b595aa3

File tree

8 files changed

+169
-158
lines changed

8 files changed

+169
-158
lines changed

‎LockdownFirewallWidget/LockdownFirewallWidget.swift

+2-2
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ struct LockdownFirewallWidgetEntryView : View {
6060
circleColor: entry.buttonColor
6161
),
6262
side: entry.size.height,
63-
link: "lockdown://toggleFirewall"
63+
link: "lockdown://"
6464
)
6565
.padding(EdgeInsets(top: 12, leading: 0, bottom: 2, trailing: 0))
6666
if entry.isFirewallEnabled {
@@ -137,7 +137,7 @@ struct LockdownVPNWidgetEntryView : View {
137137
circleColor: entry.buttonColor
138138
),
139139
side: entry.size.height,
140-
link: "lockdown://toggleVPN"
140+
link: "lockdown://"
141141
)
142142
.padding(EdgeInsets(top: 12, leading: 0, bottom: 2, trailing: 0))
143143
if entry.isVPNEnabled {

‎LockdowniOS.xcodeproj/project.pbxproj

+24-24
Original file line numberDiff line numberDiff line change
@@ -2214,7 +2214,7 @@
22142214
CODE_SIGN_IDENTITY = "iPhone Developer";
22152215
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
22162216
CODE_SIGN_STYLE = Automatic;
2217-
CURRENT_PROJECT_VERSION = 5;
2217+
CURRENT_PROJECT_VERSION = 1;
22182218
DEVELOPMENT_TEAM = V8J3Z26F6Z;
22192219
FRAMEWORK_SEARCH_PATHS = (
22202220
"$(inherited)",
@@ -2224,7 +2224,7 @@
22242224
INFOPLIST_FILE = "Lockdown Firewall Today/Info.plist";
22252225
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
22262226
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks";
2227-
MARKETING_VERSION = 1.1.9;
2227+
MARKETING_VERSION = 1.2.0;
22282228
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
22292229
MTL_FAST_MATH = YES;
22302230
PRODUCT_BUNDLE_IDENTIFIER = "com.confirmed.lockdown.Lockdown-Firewall-Today";
@@ -2246,7 +2246,7 @@
22462246
CODE_SIGN_IDENTITY = "iPhone Developer";
22472247
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
22482248
CODE_SIGN_STYLE = Automatic;
2249-
CURRENT_PROJECT_VERSION = 5;
2249+
CURRENT_PROJECT_VERSION = 1;
22502250
DEVELOPMENT_TEAM = V8J3Z26F6Z;
22512251
FRAMEWORK_SEARCH_PATHS = (
22522252
"$(inherited)",
@@ -2256,7 +2256,7 @@
22562256
INFOPLIST_FILE = "Lockdown Firewall Today/Info.plist";
22572257
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
22582258
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks";
2259-
MARKETING_VERSION = 1.1.9;
2259+
MARKETING_VERSION = 1.2.0;
22602260
MTL_FAST_MATH = YES;
22612261
PRODUCT_BUNDLE_IDENTIFIER = "com.confirmed.lockdown.Lockdown-Firewall-Today";
22622262
PRODUCT_NAME = "$(TARGET_NAME)";
@@ -2326,13 +2326,13 @@
23262326
CODE_SIGN_IDENTITY = "iPhone Developer";
23272327
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
23282328
CODE_SIGN_STYLE = Automatic;
2329-
CURRENT_PROJECT_VERSION = 5;
2329+
CURRENT_PROJECT_VERSION = 1;
23302330
DEVELOPMENT_TEAM = V8J3Z26F6Z;
23312331
GCC_C_LANGUAGE_STANDARD = gnu11;
23322332
INFOPLIST_FILE = LockdownFirewallWidget/Info.plist;
23332333
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
23342334
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks";
2335-
MARKETING_VERSION = 1.1.9;
2335+
MARKETING_VERSION = 1.2.0;
23362336
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
23372337
MTL_FAST_MATH = YES;
23382338
PRODUCT_BUNDLE_IDENTIFIER = com.confirmed.lockdown.LockdownFirewallWidget;
@@ -2356,13 +2356,13 @@
23562356
CODE_SIGN_IDENTITY = "iPhone Developer";
23572357
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
23582358
CODE_SIGN_STYLE = Automatic;
2359-
CURRENT_PROJECT_VERSION = 5;
2359+
CURRENT_PROJECT_VERSION = 1;
23602360
DEVELOPMENT_TEAM = V8J3Z26F6Z;
23612361
GCC_C_LANGUAGE_STANDARD = gnu11;
23622362
INFOPLIST_FILE = LockdownFirewallWidget/Info.plist;
23632363
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
23642364
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks";
2365-
MARKETING_VERSION = 1.1.9;
2365+
MARKETING_VERSION = 1.2.0;
23662366
MTL_FAST_MATH = YES;
23672367
PRODUCT_BUNDLE_IDENTIFIER = com.confirmed.lockdown.LockdownFirewallWidget;
23682368
PRODUCT_NAME = "$(TARGET_NAME)";
@@ -2498,7 +2498,7 @@
24982498
CODE_SIGN_IDENTITY = "iPhone Developer";
24992499
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
25002500
CODE_SIGN_STYLE = Automatic;
2501-
CURRENT_PROJECT_VERSION = 5;
2501+
CURRENT_PROJECT_VERSION = 1;
25022502
DEVELOPMENT_TEAM = V8J3Z26F6Z;
25032503
ENABLE_BITCODE = NO;
25042504
FRAMEWORK_SEARCH_PATHS = (
@@ -2512,7 +2512,7 @@
25122512
INFOPLIST_FILE = "$(SRCROOT)/LockdowniOS/Info.plist";
25132513
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
25142514
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
2515-
MARKETING_VERSION = 1.1.9;
2515+
MARKETING_VERSION = 1.2.0;
25162516
PRODUCT_BUNDLE_IDENTIFIER = com.confirmed.lockdown;
25172517
PRODUCT_NAME = "$(TARGET_NAME)";
25182518
PROVISIONING_PROFILE = "";
@@ -2533,7 +2533,7 @@
25332533
CODE_SIGN_IDENTITY = "iPhone Developer";
25342534
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
25352535
CODE_SIGN_STYLE = Automatic;
2536-
CURRENT_PROJECT_VERSION = 5;
2536+
CURRENT_PROJECT_VERSION = 1;
25372537
DEVELOPMENT_TEAM = V8J3Z26F6Z;
25382538
ENABLE_BITCODE = NO;
25392539
FRAMEWORK_SEARCH_PATHS = (
@@ -2547,7 +2547,7 @@
25472547
INFOPLIST_FILE = "$(SRCROOT)/LockdowniOS/Info.plist";
25482548
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
25492549
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
2550-
MARKETING_VERSION = 1.1.9;
2550+
MARKETING_VERSION = 1.2.0;
25512551
PRODUCT_BUNDLE_IDENTIFIER = com.confirmed.lockdown;
25522552
PRODUCT_NAME = "$(TARGET_NAME)";
25532553
PROVISIONING_PROFILE = "";
@@ -2574,7 +2574,7 @@
25742574
CODE_SIGN_IDENTITY = "iPhone Developer";
25752575
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
25762576
CODE_SIGN_STYLE = Automatic;
2577-
CURRENT_PROJECT_VERSION = 5;
2577+
CURRENT_PROJECT_VERSION = 1;
25782578
DEVELOPMENT_TEAM = V8J3Z26F6Z;
25792579
FRAMEWORK_SEARCH_PATHS = (
25802580
"$(inherited)",
@@ -2584,7 +2584,7 @@
25842584
INFOPLIST_FILE = Today/Info.plist;
25852585
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
25862586
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks";
2587-
MARKETING_VERSION = 1.1.9;
2587+
MARKETING_VERSION = 1.2.0;
25882588
PRODUCT_BUNDLE_IDENTIFIER = "com.confirmed.lockdown.Lockdown-VPN-Today";
25892589
PRODUCT_NAME = "$(TARGET_NAME)";
25902590
PROVISIONING_PROFILE = "";
@@ -2612,7 +2612,7 @@
26122612
CODE_SIGN_IDENTITY = "iPhone Developer";
26132613
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
26142614
CODE_SIGN_STYLE = Automatic;
2615-
CURRENT_PROJECT_VERSION = 5;
2615+
CURRENT_PROJECT_VERSION = 1;
26162616
DEVELOPMENT_TEAM = V8J3Z26F6Z;
26172617
FRAMEWORK_SEARCH_PATHS = (
26182618
"$(inherited)",
@@ -2622,7 +2622,7 @@
26222622
INFOPLIST_FILE = Today/Info.plist;
26232623
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
26242624
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks";
2625-
MARKETING_VERSION = 1.1.9;
2625+
MARKETING_VERSION = 1.2.0;
26262626
PRODUCT_BUNDLE_IDENTIFIER = "com.confirmed.lockdown.Lockdown-VPN-Today";
26272627
PRODUCT_NAME = "$(TARGET_NAME)";
26282628
PROVISIONING_PROFILE = "";
@@ -2643,13 +2643,13 @@
26432643
CODE_SIGN_IDENTITY = "iPhone Developer";
26442644
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
26452645
CODE_SIGN_STYLE = Automatic;
2646-
CURRENT_PROJECT_VERSION = 5;
2646+
CURRENT_PROJECT_VERSION = 1;
26472647
DEVELOPMENT_TEAM = V8J3Z26F6Z;
26482648
GCC_C_LANGUAGE_STANDARD = gnu11;
26492649
INFOPLIST_FILE = "Lockdown Blocker/Info.plist";
26502650
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
26512651
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks";
2652-
MARKETING_VERSION = 1.1.9;
2652+
MARKETING_VERSION = 1.2.0;
26532653
PRODUCT_BUNDLE_IDENTIFIER = "com.confirmed.lockdown.Confirmed-Blocker";
26542654
PRODUCT_NAME = "$(TARGET_NAME)";
26552655
PROVISIONING_PROFILE_SPECIFIER = "";
@@ -2669,13 +2669,13 @@
26692669
CODE_SIGN_IDENTITY = "iPhone Developer";
26702670
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
26712671
CODE_SIGN_STYLE = Automatic;
2672-
CURRENT_PROJECT_VERSION = 5;
2672+
CURRENT_PROJECT_VERSION = 1;
26732673
DEVELOPMENT_TEAM = V8J3Z26F6Z;
26742674
GCC_C_LANGUAGE_STANDARD = gnu11;
26752675
INFOPLIST_FILE = "Lockdown Blocker/Info.plist";
26762676
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
26772677
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks";
2678-
MARKETING_VERSION = 1.1.9;
2678+
MARKETING_VERSION = 1.2.0;
26792679
PRODUCT_BUNDLE_IDENTIFIER = "com.confirmed.lockdown.Confirmed-Blocker";
26802680
PRODUCT_NAME = "$(TARGET_NAME)";
26812681
PROVISIONING_PROFILE_SPECIFIER = "";
@@ -2697,7 +2697,7 @@
26972697
CODE_SIGN_IDENTITY = "iPhone Developer";
26982698
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
26992699
CODE_SIGN_STYLE = Automatic;
2700-
CURRENT_PROJECT_VERSION = 5;
2700+
CURRENT_PROJECT_VERSION = 1;
27012701
DEVELOPMENT_TEAM = V8J3Z26F6Z;
27022702
FRAMEWORK_SEARCH_PATHS = (
27032703
"$(inherited)",
@@ -2707,7 +2707,7 @@
27072707
INFOPLIST_FILE = "Lockdown Tunnel/Info.plist";
27082708
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
27092709
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks";
2710-
MARKETING_VERSION = 1.1.9;
2710+
MARKETING_VERSION = 1.2.0;
27112711
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
27122712
MTL_FAST_MATH = YES;
27132713
PRODUCT_BUNDLE_IDENTIFIER = com.confirmed.lockdown.LockdownTunnel;
@@ -2729,7 +2729,7 @@
27292729
CODE_SIGN_IDENTITY = "iPhone Developer";
27302730
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
27312731
CODE_SIGN_STYLE = Automatic;
2732-
CURRENT_PROJECT_VERSION = 5;
2732+
CURRENT_PROJECT_VERSION = 1;
27332733
DEVELOPMENT_TEAM = V8J3Z26F6Z;
27342734
FRAMEWORK_SEARCH_PATHS = (
27352735
"$(inherited)",
@@ -2739,7 +2739,7 @@
27392739
INFOPLIST_FILE = "Lockdown Tunnel/Info.plist";
27402740
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
27412741
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks";
2742-
MARKETING_VERSION = 1.1.9;
2742+
MARKETING_VERSION = 1.2.0;
27432743
MTL_FAST_MATH = YES;
27442744
PRODUCT_BUNDLE_IDENTIFIER = com.confirmed.lockdown.LockdownTunnel;
27452745
PRODUCT_NAME = "$(TARGET_NAME)";

‎LockdowniOS/SignupViewController.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -394,7 +394,7 @@ extension SignupViewController {
394394
// MARK: - Functions for "Upgrade Plan" mode
395395

396396
private func configureWithActiveSubscriptions(_ activePlans: [Subscription.PlanType]) {
397-
startTrialButton.setTitle("Upgrade Plan", for: .normal)
397+
startTrialButton.setTitle(NSLocalizedString("Upgrade Plan", comment: ""), for: .normal)
398398

399399
for plan in activePlans {
400400
configureForUnavailable(plan, reason: .purchased)

‎WhitelistUtilities.swift

-1
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,6 @@ func setupLockdownWhitelistedDomains() {
9595
addLockdownWhitelistedDomainIfNotExists(domain: "disneyplus.com")
9696
addLockdownWhitelistedDomainIfNotExists(domain: "ebtedge.com")
9797
addLockdownWhitelistedDomainIfNotExists(domain: "espn.com")
98-
addLockdownWhitelistedDomainIfNotExists(domain: "espn.com")
9998
addLockdownWhitelistedDomainIfNotExists(domain: "fastly.com")
10099
addLockdownWhitelistedDomainIfNotExists(domain: "fastly.net")
101100
addLockdownWhitelistedDomainIfNotExists(domain: "firstdata.com")

‎en.lproj/Localizable.strings

+3
Original file line numberDiff line numberDiff line change
@@ -691,3 +691,6 @@
691691

692692
/* No comment provided by engineer. */
693693
"Please ensure that you have an active subscription. If you're attempting to share a subscription from the same account, you'll need to sign in with the same email address. Otherwise, start your free trial or e-mail team@lockdownprivacy.com" = "Please ensure that you have an active subscription. If you're attempting to share a subscription from the same account, you'll need to sign in with the same email address. Otherwise, start your free trial or e-mail team@lockdownprivacy.com";
694+
695+
/* No comment provided by engineer. */
696+
"Upgrade Plan" = "Upgrade Plan";

0 commit comments

Comments
 (0)