diff --git a/FirewallUtilities.swift b/FirewallUtilities.swift index 5e8f4b1..68507d1 100644 --- a/FirewallUtilities.swift +++ b/FirewallUtilities.swift @@ -325,7 +325,7 @@ func setupFirewallDefaultBlockLists() { version: 1, internalID: "ifunnyTrackers", name: NSLocalizedString("iFunny Trackers", comment: "The title of a list of trackers"), - iconURL: "game_ads_icon", + iconURL: "icn_vpn", enabled: false, domains: getDomainBlockList(filename: "ifunny_trackers"), ipRanges: [:]) @@ -334,7 +334,7 @@ func setupFirewallDefaultBlockLists() { version: 1, internalID: "advancedGaming", name: NSLocalizedString("Advanced Gaming", comment: "The title of a list of trackers"), - iconURL: "game_ads_icon", + iconURL: "icn_vpn", enabled: false, domains: getDomainBlockList(filename: "advanced_gaming"), ipRanges: [:]) @@ -343,7 +343,7 @@ func setupFirewallDefaultBlockLists() { version: 1, internalID: "tiktokTrackers", name: NSLocalizedString("Tiktok Trackers", comment: "The title of a list of trackers"), - iconURL: "game_ads_icon", + iconURL: "icn_vpn", enabled: false, domains: getDomainBlockList(filename: "tiktok_trackers"), ipRanges: [:]) @@ -352,7 +352,7 @@ func setupFirewallDefaultBlockLists() { version: 1, internalID: "scams", name: NSLocalizedString("Scams", comment: "The title of a list of trackers"), - iconURL: "game_ads_icon", + iconURL: "icn_vpn", enabled: false, domains: getDomainBlockList(filename: "scams"), ipRanges: [:]) @@ -361,7 +361,7 @@ func setupFirewallDefaultBlockLists() { version: 1, internalID: "junesJourneyTrackers", name: NSLocalizedString("Junes Journey Trackers", comment: "The title of a list of trackers"), - iconURL: "game_ads_icon", + iconURL: "icn_vpn", enabled: false, domains: getDomainBlockList(filename: "junes_journey_trackers"), ipRanges: [:]) @@ -370,7 +370,7 @@ func setupFirewallDefaultBlockLists() { version: 1, internalID: "advancedAnalytics", name: NSLocalizedString("Advanced Analytics", comment: "The title of a list of trackers"), - iconURL: "game_ads_icon", + iconURL: "icn_vpn", enabled: false, domains: getDomainBlockList(filename: "advanced_analytics"), ipRanges: [:]) diff --git a/LockdowniOS/Base.lproj/Main.storyboard b/LockdowniOS/Base.lproj/Main.storyboard index a152a6b..4cf3890 100644 --- a/LockdowniOS/Base.lproj/Main.storyboard +++ b/LockdowniOS/Base.lproj/Main.storyboard @@ -237,7 +237,7 @@ - + @@ -250,13 +250,13 @@ - + - + - + - + - + - + - + @@ -3480,9 +3480,8 @@ - - - + + @@ -3674,7 +3673,7 @@ - + diff --git a/LockdowniOS/HomeViewController.swift b/LockdowniOS/HomeViewController.swift index 4d14db1..d3eef5c 100644 --- a/LockdowniOS/HomeViewController.swift +++ b/LockdowniOS/HomeViewController.swift @@ -151,7 +151,7 @@ class HomeViewController: BaseViewController, AwesomeSpotlightViewDelegate, Load //performSegue(withIdentifier: "showSignup", sender: nil) if (defaults.bool(forKey: kHasViewedTutorial) == false) { - startTutorial() +// startTutorial() } else if (defaults.bool(forKey: kHasSeenEmailSignup) == false) { AccountUI.presentCreateAccount(on: self) diff --git a/LockdowniOS/SetRegionViewController.swift b/LockdowniOS/SetRegionViewController.swift index 9dff15a..e486ffb 100644 --- a/LockdowniOS/SetRegionViewController.swift +++ b/LockdowniOS/SetRegionViewController.swift @@ -59,8 +59,8 @@ class SetRegionViewController: BaseViewController, UITableViewDataSource, UITabl WidgetCenter.shared.reloadAllTimelines() } - if vpnVC != nil { - vpnVC!.updateVPNRegionLabel() + if homeVC != nil { + homeVC!.updateVPNRegionLabel() } dismiss(animated: true, completion: { diff --git a/LockdowniOS/en.lproj/Main.strings b/LockdowniOS/en.lproj/Main.strings index 2a80e08..e8b62fd 100644 --- a/LockdowniOS/en.lproj/Main.strings +++ b/LockdowniOS/en.lproj/Main.strings @@ -145,8 +145,8 @@ /* Class = "UIButton"; normalTitle = "Button"; ObjectID = "O4a-yi-uRp"; */ "O4a-yi-uRp.normalTitle" = "Button"; -/* Class = "UITabBarItem"; title = "Home"; ObjectID = "O5a-jC-Mj1"; */ -"O5a-jC-Mj1.title" = "Home"; +/* Class = "UITabBarItem"; title = "Protect"; ObjectID = "O5a-jC-Mj1"; */ +"O5a-jC-Mj1.title" = "Protect"; /* Class = "UILabel"; text = "Location: 🇺🇸"; ObjectID = "O6b-GR-ijA"; */ "O6b-GR-ijA.text" = "Location: 🇺🇸"; @@ -361,8 +361,8 @@ /* Class = "UILabel"; text = "Forgot Password"; ObjectID = "nu2-zq-dta"; */ "nu2-zq-dta.text" = "Forgot Password"; -/* Class = "UILabel"; text = "Secure Tunnel"; ObjectID = "nuc-D4-P1M"; */ -"nuc-D4-P1M.text" = "Secure Tunnel"; +/* Class = "UILabel"; text = "Secure Tunnel VPN"; ObjectID = "nuc-D4-P1M"; */ +"nuc-D4-P1M.text" = "Secure Tunnel VPN"; /* Class = "UILabel"; text = "Sign In"; ObjectID = "oPf-b7-d1V"; */ "oPf-b7-d1V.text" = "Sign In"; diff --git a/LockdowniOS/es.lproj/Main.strings b/LockdowniOS/es.lproj/Main.strings index ad5f193..70ab14c 100644 --- a/LockdowniOS/es.lproj/Main.strings +++ b/LockdowniOS/es.lproj/Main.strings @@ -361,8 +361,8 @@ /* Class = "UILabel"; text = "Forgot Password"; ObjectID = "nu2-zq-dta"; */ "nu2-zq-dta.text" = "Olvide Mi Contraseña"; -/* Class = "UILabel"; text = "Secure Tunnel"; ObjectID = "nuc-D4-P1M"; */ -"nuc-D4-P1M.text" = "Secure Tunnel"; +/* Class = "UILabel"; text = "Secure Tunnel VPN"; ObjectID = "nuc-D4-P1M"; */ +"nuc-D4-P1M.text" = "Secure Tunnel VPN"; /* Class = "UILabel"; text = "Sign In"; ObjectID = "oPf-b7-d1V"; */ "oPf-b7-d1V.text" = "Iniciar Sesión"; diff --git a/LockdowniOS/fr.lproj/Main.strings b/LockdowniOS/fr.lproj/Main.strings index d85b11e..c7eab2a 100644 --- a/LockdowniOS/fr.lproj/Main.strings +++ b/LockdowniOS/fr.lproj/Main.strings @@ -363,8 +363,8 @@ /* Class = "UILabel"; text = "Forgot Password"; ObjectID = "nu2-zq-dta"; */ "nu2-zq-dta.text" = "Mot de passe oublié"; -/* Class = "UILabel"; text = "Secure Tunnel"; ObjectID = "nuc-D4-P1M"; */ -"nuc-D4-P1M.text" = "Tunnel Securisé"; +/* Class = "UILabel"; text = "Secure Tunnel VPN"; ObjectID = "nuc-D4-P1M"; */ +"nuc-D4-P1M.text" = "Tunnel Securisé VPN"; /* Class = "UILabel"; text = "Sign In"; ObjectID = "oPf-b7-d1V"; */ "oPf-b7-d1V.text" = "Connexion"; diff --git a/LockdowniOS/ja.lproj/Main.strings b/LockdowniOS/ja.lproj/Main.strings index 29e8764..6885c1f 100644 --- a/LockdowniOS/ja.lproj/Main.strings +++ b/LockdowniOS/ja.lproj/Main.strings @@ -361,7 +361,7 @@ /* Class = "UILabel"; text = "Forgot Password"; ObjectID = "nu2-zq-dta"; */ "nu2-zq-dta.text" = "パスワードをお忘れですか"; -/* Class = "UILabel"; text = "Secure Tunnel"; ObjectID = "nuc-D4-P1M"; */ +/* Class = "UILabel"; text = "Secure Tunnel VPN"; ObjectID = "nuc-D4-P1M"; */ "nuc-D4-P1M.text" = "セキュアトンネル"; /* Class = "UILabel"; text = "Sign In"; ObjectID = "oPf-b7-d1V"; */ diff --git a/dnscrypt-proxy.toml b/dnscrypt-proxy.toml index c35a6f5..b1d61e4 100644 --- a/dnscrypt-proxy.toml +++ b/dnscrypt-proxy.toml @@ -30,7 +30,7 @@ log_level = 2 ios_mode = true retry_count = 5 -[sources.public-resolvers] +[sources.public-resolvers ] urls = ['https://raw.githubusercontent.com/DNSCrypt/dnscrypt-resolvers/master/v3/public-resolvers.md', 'https://download.dnscrypt.info/resolvers-list/v3/public-resolvers.md', 'https://ipv6.download.dnscrypt.info/resolvers-list/v3/public-resolvers.md'] cache_file = 'public-resolvers.md' minisign_key = 'RWQf6LRCGA9i53mlYecO4IzT51TGPpvWucNSCh1CBM0QTaLn73Y7GFO3' @@ -39,7 +39,7 @@ prefix = '' [blacklist] blacklist_file = "BLOCKLIST_FILE_HERE" -log_file = 'query.log' +log_file = 'BLOCKLIST_LOG_HERE' log_format = "tsv" [static]