From ed1c7d679c93fd3b2b4cdc8e4c2944fa52e7e3ee Mon Sep 17 00:00:00 2001 From: Frank Denis Date: Wed, 8 Aug 2012 00:18:14 -0700 Subject: [PATCH] Embed about & release notes, so that these files can eventually match the current app. --- .../DNSCrypt.xcodeproj/project.pbxproj | 4 + DNSCrypt-Preference-Pane/DNSCrypt/DNSCrypt.m | 8 +- .../DNSCrypt/extra/html}/about.haml | 0 .../DNSCrypt/extra/html/about.html | 42 +++++++++ .../DNSCrypt/extra/html}/releasenotes.haml | 0 .../DNSCrypt/extra/html/releasenotes.html | 94 +++++++++++++++++++ 6 files changed, 144 insertions(+), 4 deletions(-) rename {Pages => DNSCrypt-Preference-Pane/DNSCrypt/extra/html}/about.haml (100%) create mode 100644 DNSCrypt-Preference-Pane/DNSCrypt/extra/html/about.html rename {Pages => DNSCrypt-Preference-Pane/DNSCrypt/extra/html}/releasenotes.haml (100%) create mode 100644 DNSCrypt-Preference-Pane/DNSCrypt/extra/html/releasenotes.html diff --git a/DNSCrypt-Preference-Pane/DNSCrypt.xcodeproj/project.pbxproj b/DNSCrypt-Preference-Pane/DNSCrypt.xcodeproj/project.pbxproj index b94350b..9512cc4 100644 --- a/DNSCrypt-Preference-Pane/DNSCrypt.xcodeproj/project.pbxproj +++ b/DNSCrypt-Preference-Pane/DNSCrypt.xcodeproj/project.pbxproj @@ -16,6 +16,7 @@ 0946B0E413F48065008277C6 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0946B0E313F48065008277C6 /* Security.framework */; }; 09640E95145CA4AD008B37EC /* opendns_logo_300.png in Resources */ = {isa = PBXBuildFile; fileRef = 09640E94145CA4AD008B37EC /* opendns_logo_300.png */; }; 09A13ABC145F2D8700B227A4 /* ajax-loader.gif in Resources */ = {isa = PBXBuildFile; fileRef = 09A13ABB145F2D8700B227A4 /* ajax-loader.gif */; }; + 09AD01A015D2483500638DCE /* html in Resources */ = {isa = PBXBuildFile; fileRef = 09AD019F15D2483500638DCE /* html */; }; 09FB094415C9DE6400B8AAB6 /* usr in Resources */ = {isa = PBXBuildFile; fileRef = 09FB094315C9DE6400B8AAB6 /* usr */; }; 4B36C4651468B87A0085B07C /* WebKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4B36C4641468B87A0085B07C /* WebKit.framework */; }; 4B89D983147CA39200872F60 /* dnscrypt_256.png in Resources */ = {isa = PBXBuildFile; fileRef = 4B89D982147CA39200872F60 /* dnscrypt_256.png */; }; @@ -45,6 +46,7 @@ 0946B0E313F48065008277C6 /* Security.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Security.framework; path = System/Library/Frameworks/Security.framework; sourceTree = SDKROOT; }; 09640E94145CA4AD008B37EC /* opendns_logo_300.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = opendns_logo_300.png; sourceTree = ""; }; 09A13ABB145F2D8700B227A4 /* ajax-loader.gif */ = {isa = PBXFileReference; lastKnownFileType = image.gif; path = "ajax-loader.gif"; sourceTree = ""; }; + 09AD019F15D2483500638DCE /* html */ = {isa = PBXFileReference; lastKnownFileType = folder; name = html; path = extra/html; sourceTree = ""; }; 09FB094315C9DE6400B8AAB6 /* usr */ = {isa = PBXFileReference; lastKnownFileType = folder; name = usr; path = extra/usr; sourceTree = ""; }; 4B36C4641468B87A0085B07C /* WebKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = WebKit.framework; path = System/Library/Frameworks/WebKit.framework; sourceTree = SDKROOT; }; 4B89D982147CA39200872F60 /* dnscrypt_256.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = dnscrypt_256.png; sourceTree = ""; }; @@ -119,6 +121,7 @@ 0946B0D713F47F53008277C6 /* DNSCrypt.tiff */, 4B89D982147CA39200872F60 /* dnscrypt_256.png */, 0946B0D913F47F53008277C6 /* DNSCrypt.xib */, + 09AD019F15D2483500638DCE /* html */, 09FB094315C9DE6400B8AAB6 /* usr */, 0946B0CE13F47F53008277C6 /* Supporting Files */, ); @@ -226,6 +229,7 @@ 09A13ABC145F2D8700B227A4 /* ajax-loader.gif in Resources */, 4B89D983147CA39200872F60 /* dnscrypt_256.png in Resources */, 09FB094415C9DE6400B8AAB6 /* usr in Resources */, + 09AD01A015D2483500638DCE /* html in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/DNSCrypt-Preference-Pane/DNSCrypt/DNSCrypt.m b/DNSCrypt-Preference-Pane/DNSCrypt/DNSCrypt.m index 76b958c..f76511a 100644 --- a/DNSCrypt-Preference-Pane/DNSCrypt/DNSCrypt.m +++ b/DNSCrypt-Preference-Pane/DNSCrypt/DNSCrypt.m @@ -306,14 +306,14 @@ DNSConfigurationState currentState = kDNS_CONFIGURATION_UNKNOWN; [_releaseNotesWebView setDrawsBackground:false]; [_releaseNotesWebView setShouldUpdateWhileOffscreen:true]; [_releaseNotesWebView setUIDelegate:self]; - NSString *releaseNotesURLText = @"http://dnscrypt.opendns.com/releasenotes.php"; - [[_releaseNotesWebView mainFrame] loadRequest:[NSURLRequest requestWithURL:[NSURL URLWithString:releaseNotesURLText]]]; + NSURL *releaseNotesURL = [NSURL fileURLWithPath: [[NSBundle bundleForClass:[self class]] pathForResource: @"html/releasenotes" ofType: @"html"] isDirectory: NO]; + [[_releaseNotesWebView mainFrame] loadRequest:[NSURLRequest requestWithURL: releaseNotesURL]]; [_aboutWebView setDrawsBackground:false]; [_aboutWebView setShouldUpdateWhileOffscreen:true]; [_aboutWebView setUIDelegate:self]; - NSString *aboutURLText = @"http://dnscrypt.opendns.com/about.php"; - [[_aboutWebView mainFrame] loadRequest:[NSURLRequest requestWithURL:[NSURL URLWithString:aboutURLText]]]; + NSURL *aboutURL = [NSURL fileURLWithPath: [[NSBundle bundleForClass:[self class]] pathForResource: @"html/about" ofType: @"html"] isDirectory: NO]; + [[_aboutWebView mainFrame] loadRequest:[NSURLRequest requestWithURL: aboutURL]]; } - (NSArray *)webView:(WebView *)sender contextMenuItemsForElement:(NSDictionary *)element diff --git a/Pages/about.haml b/DNSCrypt-Preference-Pane/DNSCrypt/extra/html/about.haml similarity index 100% rename from Pages/about.haml rename to DNSCrypt-Preference-Pane/DNSCrypt/extra/html/about.haml diff --git a/DNSCrypt-Preference-Pane/DNSCrypt/extra/html/about.html b/DNSCrypt-Preference-Pane/DNSCrypt/extra/html/about.html new file mode 100644 index 0000000..f56b7a4 --- /dev/null +++ b/DNSCrypt-Preference-Pane/DNSCrypt/extra/html/about.html @@ -0,0 +1,42 @@ + + + + + About DNSCrypt + + + +

About DNSCrypt

+

+ This software encrypts DNS packets between your computer and + OpenDNS. This prevents man-in-the-middle attacks and snooping of DNS + traffic by ISPs or others. +

+

+ Tips: +

    +
  • If you have a firewall, open TCP and UDP ports 53 and 443.
    • +
  • + If you prefer reliability over security, enable fallback to + insecure DNS. +
    • +
  • + The FamilyShield service blocks pornographic content, + including OpenDNS "Pornography", "Tasteless" and "Sexuality" + categories, in addition to proxies and anonymizers (which can render + filtering useless). It also blocks phishing and some malware. +
    • +
+

+

+ Please help by providing feedback! +

+ + diff --git a/Pages/releasenotes.haml b/DNSCrypt-Preference-Pane/DNSCrypt/extra/html/releasenotes.haml similarity index 100% rename from Pages/releasenotes.haml rename to DNSCrypt-Preference-Pane/DNSCrypt/extra/html/releasenotes.haml diff --git a/DNSCrypt-Preference-Pane/DNSCrypt/extra/html/releasenotes.html b/DNSCrypt-Preference-Pane/DNSCrypt/extra/html/releasenotes.html new file mode 100644 index 0000000..13464be --- /dev/null +++ b/DNSCrypt-Preference-Pane/DNSCrypt/extra/html/releasenotes.html @@ -0,0 +1,94 @@ + + + + + Release notes + + + +

Release Notes

+
+

Version 0.12 released!

+ +
    +
  • + The "fallback to insecure" mode now properly copes with captive + portals and firewalls. +
    • +
  • + The TCP/443 checkbox is gone. When the dnscrypt box is + checked, it tries everything in parallel and keeps whatever + works best. +
    • +
  • + IPv6 is fully supported (and automatic. If that works using + IPv6, IPv6 is used) +
    • +
  • + Familyshield is supported, with and without dnscrypt. +
    • +
  • + OpenDNS/DNSCrypt/Familyshield/Fallback settings can be set + from the menu bar. +
    • +
  • + Internal domain names like routerlogin.net are directly sent + to the router or to whatever DNS resolvers the DHCP server provides. +
    • +
  • + Packages are signed for Mountain Lion. +
    • +
  • + The interface passively watches for network changes according to the + current network configuration and the current Wifi access + point. It doesn't constantly poll for changes any more. +
    • +
  • + The proxy has been updated to version 1.0.1. +
    • +
+
+
+

Version 0.10 released!

+ +
    +
  • The orange dot has been replaced with a green one.
    • +
  • + Some content in the preferences pane wasn't always + properly loaded on Snow Leopard. This has been fixed. +
    • +
+
+
+

Version 0.9 released!

+ +
    +
  • A new icon set, due to popular request.
    • +
  • The dnscrypt settings are persistent across reboots.
    • +
+
+
+

Version 0.8 released!

+ +
    +
  • dnscrypt doesn't require administrative privileges any more.
    • +
+
+ +