only touch!

Merge pull request #156 from catap/hide_menubar_icon
Added setting 'hide menubar icon' to panel, and implemented support at menubar app
2017-10-08 18:21:08 +02:00 · 2017-10-07 21:09:00 +02:00 · 2017-10-07 16:13:35 +04:00 · 2017-02-16 18:32:33 +01:00 · 2017-02-16 16:07:47 +04:00 · 2017-02-16 10:54:50 +01:00
29 changed files with 227 additions and 71 deletions
@@ -0,0 +1,17 @@
+
+
+
+
+
+*****************************************************************************************************************
+
+Before creating an issue, please read the FAQ: https://github.com/alterstep/dnscrypt-osxclient/blob/master/FAQ.md
+
+Informations and debug logs as explained here are almost always more useful that screenshots!
+
+Thank you!
+
+*****************************************************************************************************************
+
+
+
@@ -34,5 +34,6 @@ typedef enum {

 - (IBAction)preferencesMenuItemPushed:(NSMenuItem *)sender;
 - (IBAction)dnscryptMenuItemPushed:(NSMenuItem *)sender;
+- (IBAction)hideMenubarIconMenuItemPushed:(NSMenuItem *)sender;

@end
@@ -101,6 +101,14 @@ BOOL appUpdated = FALSE;
    }
    [self updateLedStatus];
    
+    NSString *hideMenuBar = [self fromCommand: @"/bin/csh" withArguments: [NSArray arrayWithObjects: @"-c", @"cd '" kDNSCRIPT_SCRIPTS_BASE_DIR @"' && ./get-hide-menubar-icon-status.sh | ./get-upstream-resolvers.sh", nil]];
+
+    if ([hideMenuBar isEqualToString: @"yes"]) {
+        _statusItem.visible = FALSE;
+    } else if ([hideMenuBar isEqualToString: @"no"]) {
+        _statusItem.visible = TRUE;
+    }
+
    NSString *currentResolvers = [self fromCommand: @"/bin/csh" withArguments: [NSArray arrayWithObjects: @"-c", @"cd '" kDNSCRIPT_SCRIPTS_BASE_DIR @"' && ./get-current-resolvers.sh | ./get-upstream-resolvers.sh", nil]];
    _statusResolversMenuItem.title = currentResolvers;
    
@@ -213,4 +221,17 @@ BOOL appUpdated = FALSE;
    }
 }

+- (BOOL) setHideMenubarIconOn {
+    [self showSpinners];
+    NSString *res = [self fromCommand: @"/bin/csh" withArguments: [NSArray arrayWithObjects: @"-c", @"cd '" kDNSCRIPT_SCRIPTS_BASE_DIR @"' && ./create-ticket.sh && ./switch-hide-menubar-icon-on.sh", nil]];
+    (void) res;
+    _statusItem.visible = FALSE;
+    return TRUE;
+}
+
+- (IBAction)hideMenubarIconMenuItemPushed:(NSMenuItem *)sender
+{
+    [self setHideMenubarIconOn];
+}
+
@end
@@ -17,11 +17,11 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.0.13</string>
+	<string>1.0.14</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1.0.13</string>
+	<string>1.0.14</string>
 	<key>LSApplicationCategoryType</key>
 	<string>public.app-category.utilities</string>
 	<key>LSMinimumSystemVersion</key>
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="5056" systemVersion="13D45a" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none">
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="13196" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none">
    <dependencies>
-        <deployment defaultVersion="1060" identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="5056"/>
+        <deployment identifier="macosx"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="13196"/>
    </dependencies>
    <objects>
        <customObject id="-2" userLabel="File's Owner" customClass="NSApplication">
@@ -11,7 +11,7 @@
            </connections>
        </customObject>
        <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
-        <customObject id="-3" userLabel="Application"/>
+        <customObject id="-3" userLabel="Application" customClass="NSObject"/>
        <customObject id="494" customClass="AppDelegate">
            <connections>
                <outlet property="dnscryptMenu" destination="539" id="543"/>
@@ -45,12 +45,18 @@
                    <modifierMask key="keyEquivalentModifierMask"/>
                </menuItem>
                <menuItem isSeparatorItem="YES" id="554"/>
-                <menuItem title="Hide from the menu bar" keyEquivalent="h" id="558">
+                <menuItem title="Hide from the menu bar" keyEquivalent="h" id="yYW-Ye-NGW">
+                    <connections>
+                        <action selector="hideMenubarIconMenuItemPushed:" target="494" id="QDi-0b-iiy"/>
+                    </connections>
+                </menuItem>
+                <menuItem title="Quit" keyEquivalent="q" id="558">
                    <connections>
                        <action selector="terminate:" target="-1" id="560"/>
                    </connections>
                </menuItem>
            </items>
+            <point key="canvasLocation" x="139" y="175.5"/>
        </menu>
    </objects>
 </document>
@@ -539,7 +539,7 @@
 				<key>USE_HFS+_COMPRESSION</key>
 				<true/>
 				<key>VERSION</key>
-				<string>1.0.13</string>
+				<string>1.0.13.1</string>
 			</dict>
 			<key>TYPE</key>
 			<integer>0</integer>
@@ -1237,42 +1237,6 @@
 		<dict>
 			<key>LIST</key>
 			<array>
-				<dict>
-					<key>BEHAVIOR</key>
-					<integer>3</integer>
-					<key>DICTIONARY</key>
-					<dict>
-						<key>IC_REQUIREMENT_CPU_ARCHITECTURE_FAMILY</key>
-						<integer>2</integer>
-						<key>IC_REQUIREMENT_CPU_INTEL_ARCHITECTURE_TYPE</key>
-						<integer>0</integer>
-						<key>IC_REQUIREMENT_CPU_MINIMUM_CPU_CORES_COUNT</key>
-						<integer>1</integer>
-						<key>IC_REQUIREMENT_CPU_MINIMUM_FREQUENCY</key>
-						<integer>866666</integer>
-						<key>IC_REQUIREMENT_CPU_POWERPC_ARCHITECTURE_TYPE</key>
-						<integer>0</integer>
-					</dict>
-					<key>IC_REQUIREMENT_CHECK_TYPE</key>
-					<integer>0</integer>
-					<key>IDENTIFIER</key>
-					<string>fr.whitebox.Packages.requirement.cpu</string>
-					<key>MESSAGE</key>
-					<array>
-						<dict>
-							<key>LANGUAGE</key>
-							<string>English</string>
-							<key>SECONDARY_VALUE</key>
-							<string></string>
-							<key>VALUE</key>
-							<string>The DNSCrypt GUI for Mac currently requires at least an Intel Core CPU.</string>
-						</dict>
-					</array>
-					<key>NAME</key>
-					<string>Processor</string>
-					<key>STATE</key>
-					<true/>
-				</dict>
 				<dict>
 					<key>BEHAVIOR</key>
 					<integer>3</integer>
@@ -1281,7 +1245,7 @@
 						<key>IC_REQUIREMENT_OS_DISK_TYPE</key>
 						<integer>0</integer>
 						<key>IC_REQUIREMENT_OS_DISTRIBUTION_TYPE</key>
-						<integer>1</integer>
+						<integer>0</integer>
 						<key>IC_REQUIREMENT_OS_MINIMUM_VERSION</key>
 						<integer>100800</integer>
 					</dict>
@@ -1482,6 +1446,11 @@
 			<string>DNSCrypt</string>
 		</dict>
 	</dict>
+	<key>SHARED_GLOBAL_DATA</key>
+	<dict>
+		<key>IC_REQUIREMENT_JAVASCRIPT_SHARED_SOURCE_CODE</key>
+		<string></string>
+	</dict>
 	<key>TYPE</key>
 	<integer>0</integer>
 	<key>VERSION</key>
@@ -1,6 +1,6 @@
 #! /bin/sh

-VERSION='1.0.13'
+VERSION='1.0.14'

 echo '*** Do not forget to increase CURRENT_VERSION in common.inc'
 sleep 10
@@ -17,11 +17,11 @@
 	<key>CFBundlePackageType</key>
 	<string>BNDL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.0.13</string>
+	<string>1.0.14</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1.0.13</string>
+	<string>1.0.14</string>
 	<key>NSHumanReadableCopyright</key>
 	<string>BSD</string>
 	<key>NSMainNibFile</key>
@@ -4,7 +4,7 @@
 #import "CHCSVParser/CHCSVParser.h"
 #import "NSPlaceHolderTextView.h"

-#define kDNSCRYPT_PACKAGE_VERSION @"1.0.13"
+#define kDNSCRYPT_PACKAGE_VERSION @"1.0.14"

 #define kDNSCRYPT_PROJECT_URL @"https://dnscrypt.org/osxclient"

@@ -42,6 +42,7 @@ typedef enum {
    NSTabViewItem *_releaseNotesTabViewItem;
    
    NSButton *_dnscryptButton;
+    NSButton *_hideMenubarIcon;
    NSButton *_disableIPv6Button;
    
    NSTextField *_currentResolverTextField;
@@ -65,6 +66,7 @@ typedef enum {
@property (nonatomic, strong) IBOutlet NSTabViewItem *releaseNotesTabViewItem;

@property (nonatomic, strong) IBOutlet NSButton *dnscryptButton;
+@property (nonatomic, strong) IBOutlet NSButton *hideMenubarIcon;
@property (nonatomic, strong) IBOutlet NSButton *disableIPv6Button;

@property (nonatomic, strong) IBOutlet NSTextField *currentResolverTextField;
@@ -90,6 +92,7 @@ typedef enum {
 - (void) mainViewDidLoad;

 - (IBAction)dnscryptButtonPressed:(NSButton *)sender;
+- (IBAction)hideMenubarIcon:(NSButton *)sender;
 - (IBAction)disableIPv6ButtonPressed:(NSButton *)sender;
 - (IBAction)providerLinkPushed:(NSButton *)sender;
 - (IBAction)uninstallPushed:(NSButton *)sender;
@@ -16,6 +16,7 @@
@synthesize blockedQueryLoggingButton = _blockedQueryLoggingButton;
@synthesize dnscryptButton = _dnscryptButton;
@synthesize disableIPv6Button = _disableIPv6Button;
+@synthesize hideMenubarIcon = _hideMenubarIcon;
@synthesize statusImageView = _statusImageView;
@synthesize statusText = _statusText;
@synthesize currentResolverTextField = _currentResolverTextField;
@@ -31,6 +32,7 @@ BOOL exceptionsUpdated = FALSE;
 - (void) setCheckBoxesEnabled: (BOOL) enabled
 {
    [_dnscryptButton setEnabled: enabled];
+    [_hideMenubarIcon setEnabled: enabled];
    [_disableIPv6Button setEnabled: enabled];
    [_resolverNamesButton setEnabled: enabled];
 }
@@ -59,6 +61,7 @@ BOOL exceptionsUpdated = FALSE;
    NSString *res;

    _dnscryptButton.state = 0;
+    _hideMenubarIcon.state = 0;
    _disableIPv6Button.state = 0;
    
    [_blacklistIPsTextView setPlaceHolderText: @"IP addresses to block.\n\nExamples:\n\n203.0.113.7\n198.51.100.*"];
@@ -69,6 +72,10 @@ BOOL exceptionsUpdated = FALSE;
    if ([res isEqualToString: @"yes"]) {
        [_dnscryptButton setState: 1];
    }
+    res = [self fromCommand: @"/bin/csh" withArguments: [NSArray arrayWithObjects: @"-f", @"-c", @"cd '" kDNSCRYPT_SCRIPTS_BASE_DIR @"' && exec ./get-hide-menubar-icon-status.sh", nil]];
+    if ([res isEqualToString: @"yes"]) {
+        [_hideMenubarIcon setState: 1];
+    }
    res = [self fromCommand: @"/bin/csh" withArguments: [NSArray arrayWithObjects: @"-f", @"-c", @"cd '" kDNSCRYPT_SCRIPTS_BASE_DIR @"' && exec ./get-aaaa-blocking-status.sh", nil]];
    if ([res isEqualToString: @"yes"]) {
        [_disableIPv6Button setState: 1];
@@ -201,6 +208,20 @@ BOOL exceptionsUpdated = FALSE;
    return TRUE;
 }

+- (BOOL) setHideMenubarIconOn {
+    [self showSpinners];
+    NSString *res = [self fromCommand: @"/bin/csh" withArguments: [NSArray arrayWithObjects: @"-f", @"-c", @"cd '" kDNSCRYPT_SCRIPTS_BASE_DIR @"' && ./create-ticket.sh && ./switch-hide-menubar-icon-on.sh", nil]];
+    (void) res;
+    return TRUE;
+}
+
+- (BOOL) setHideMenubarIconOff {
+    [self showSpinners];
+    NSString *res = [self fromCommand: @"/bin/csh" withArguments: [NSArray arrayWithObjects: @"-f", @"-c", @"cd '" kDNSCRYPT_SCRIPTS_BASE_DIR @"' && ./create-ticket.sh && ./switch-hide-menubar-icon-off.sh", nil]];
+    (void) res;
+    return TRUE;
+}
+
 - (BOOL) setDisableIPv6On {
    [self showSpinners];
    NSString *res = [self fromCommand: @"/bin/csh" withArguments: [NSArray arrayWithObjects: @"-f", @"-c", @"cd '" kDNSCRYPT_SCRIPTS_BASE_DIR @"' && ./create-ticket.sh && ./switch-aaaa-blocking-on.sh", nil]];
@@ -224,6 +245,15 @@ BOOL exceptionsUpdated = FALSE;
    }
 }

+- (IBAction)hideMenubarIcon:(NSButton *)sender
+{
+    if (sender.state != 0) {
+        [self setHideMenubarIconOn];
+    } else {
+        [self setHideMenubarIconOff];
+    }
+}
+
 - (IBAction)disableIPv6ButtonPressed:(NSButton *)sender
 {
    if (sender.state != 0) {
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="11542" systemVersion="16E144f" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="13196" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none">
    <dependencies>
        <deployment version="1070" identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="11542"/>
-        <plugIn identifier="com.apple.WebKitIBPlugin" version="11542"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="13196"/>
+        <plugIn identifier="com.apple.WebKitIBPlugin" version="13196"/>
        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
    </dependencies>
    <objects>
@@ -20,6 +20,7 @@
                <outlet property="disableIPv6Button" destination="ESJ-Kf-yNj" id="xFL-L3-vLp"/>
                <outlet property="dnscryptButton" destination="179" id="363"/>
                <outlet property="exceptionsTextView" destination="YvE-Lo-YVl" id="9u8-Sn-Poo"/>
+                <outlet property="hideMenubarIcon" destination="Y6w-zv-NQr" id="t6p-SL-hiB"/>
                <outlet property="locationText" destination="e9H-pq-zb6" id="Elc-qh-Z8b"/>
                <outlet property="providerLink" destination="323" id="Riq-Cc-CLa"/>
                <outlet property="queryLoggingButton" destination="398" id="458"/>
@@ -186,6 +187,18 @@
                                            </textFieldCell>
                                            <accessibility description="Current resolver IP addresses"/>
                                        </textField>
+                                        <button toolTip="Use the DNSCrypt protocol" misplaced="YES" id="Y6w-zv-NQr">
+                                            <rect key="frame" x="15" y="205" width="204" height="22"/>
+                                            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+                                            <buttonCell key="cell" type="check" title="Hide menubar icon" bezelStyle="regularSquare" imagePosition="left" alignment="left" inset="2" id="yaC-i9-RQL">
+                                                <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
+                                                <font key="font" metaFont="system" size="14"/>
+                                            </buttonCell>
+                                            <accessibility description="Enable DNSCrypt"/>
+                                            <connections>
+                                                <action selector="hideMenubarIcon:" target="-2" id="7kK-mO-czX"/>
+                                            </connections>
+                                        </button>
                                    </subviews>
                                </view>
                            </tabViewItem>
@@ -292,7 +305,7 @@
                                                <rect key="frame" x="1" y="1" width="171" height="139"/>
                                                <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                                <subviews>
-                                                    <textView importsGraphics="NO" richText="NO" usesFontPanel="YES" selectionGranularity="word" findStyle="panel" incrementalSearchingEnabled="YES" allowsUndo="YES" usesRuler="YES" allowsNonContiguousLayout="YES" smartInsertDelete="YES" id="Jos-8C-r8h" customClass="NSPlaceHolderTextView">
+                                                    <textView importsGraphics="NO" richText="NO" verticallyResizable="YES" usesFontPanel="YES" selectionGranularity="word" findStyle="panel" incrementalSearchingEnabled="YES" allowsUndo="YES" usesRuler="YES" allowsNonContiguousLayout="YES" smartInsertDelete="YES" id="Jos-8C-r8h" customClass="NSPlaceHolderTextView">
                                                        <rect key="frame" x="0.0" y="0.0" width="171" height="139"/>
                                                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                                        <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
@@ -325,7 +338,7 @@
                                                <rect key="frame" x="1" y="1" width="171" height="139"/>
                                                <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                                <subviews>
-                                                    <textView importsGraphics="NO" richText="NO" usesFontPanel="YES" findStyle="panel" incrementalSearchingEnabled="YES" allowsUndo="YES" usesRuler="YES" allowsNonContiguousLayout="YES" spellingCorrection="YES" smartInsertDelete="YES" id="gRF-Cw-rp9" customClass="NSPlaceHolderTextView">
+                                                    <textView importsGraphics="NO" richText="NO" verticallyResizable="YES" usesFontPanel="YES" findStyle="panel" incrementalSearchingEnabled="YES" allowsUndo="YES" usesRuler="YES" allowsNonContiguousLayout="YES" spellingCorrection="YES" smartInsertDelete="YES" id="gRF-Cw-rp9" customClass="NSPlaceHolderTextView">
                                                        <rect key="frame" x="0.0" y="0.0" width="171" height="139"/>
                                                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                                        <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
@@ -358,7 +371,7 @@
                                                <rect key="frame" x="1" y="1" width="171" height="139"/>
                                                <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                                <subviews>
-                                                    <textView importsGraphics="NO" richText="NO" usesFontPanel="YES" findStyle="panel" incrementalSearchingEnabled="YES" allowsUndo="YES" usesRuler="YES" allowsNonContiguousLayout="YES" spellingCorrection="YES" smartInsertDelete="YES" id="YvE-Lo-YVl" customClass="NSPlaceHolderTextView">
+                                                    <textView importsGraphics="NO" richText="NO" verticallyResizable="YES" usesFontPanel="YES" findStyle="panel" incrementalSearchingEnabled="YES" allowsUndo="YES" usesRuler="YES" allowsNonContiguousLayout="YES" spellingCorrection="YES" smartInsertDelete="YES" id="YvE-Lo-YVl" customClass="NSPlaceHolderTextView">
                                                        <rect key="frame" x="0.0" y="0.0" width="171" height="139"/>
                                                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                                        <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
@@ -14,6 +14,15 @@
      time
        font:
          style: italic
+  %body
+    %article
+      %h2 Version 1.0.14
+      %time Sat, Feb 11 2017
+      %p
+        The previous version (1.0.13) required a recent version of
+        openssl to be present on the system (plugins need ldns, ldns
+        needed this). The dependency has been removed.
+
  %body
    %article
      %h2 Version 1.0.13
@@ -16,6 +16,17 @@
        font-style: italic; }
    </style>
  </head>
+  <body>
+    <article>
+      <h2>Version 1.0.14</h2>
+      <time>Sat, Feb 11 2017</time>
+      <p>
+        The previous version (1.0.13) required a recent version of
+        openssl to be present on the system (plugins need ldns, ldns
+        needed this). The dependency has been removed.
+      </p>
+    </article>
+  </body>
  <body>
    <article>
      <h2>Version 1.0.13</h2>
@@ -1 +1 @@
-libldns.1.dylib
+libldns.2.dylib
@@ -7,6 +7,7 @@ rm -f "$QUERY_LOG_FILE"
 rm -f "$DEBUG_LOG_FILE"
 find -x "$RESOLVERS_LIST_STATE" -type f -mtime +1 -exec rm -f {} \; 2>/dev/null
 find -x "$APP_UPDATES_STATE" -type f -mtime +1 -exec rm -f {} \; 2>/dev/null
+find -x "$STATES_DIR" -type f -exec rm -f {} -exec rm -f {} \; 2>/dev/null

 ./clear-fw.sh

@@ -1,5 +1,5 @@

-CURRENT_VERSION=6
+CURRENT_VERSION=8

 DNSCRYPT_USR_BASE_DIR='/Library/PreferencePanes/DNSCrypt.prefPane/Contents/Resources/usr'
 DNSCRYPT_VAR_BASE_DIR='/Library/Application Support/DNSCrypt'
@@ -16,6 +16,7 @@ STATES_DIR="${DNSCRYPT_VAR_BASE_DIR}/states"

 DNSCRYPT_RESOLVER_NAME_FILE="${CONTROL_DIR}/dnscrypt-resolver-name"
 DNSCRYPT_FILE="${CONTROL_DIR}/dnscrypt"
+HIDE_MENUBAR_ICON_FILE="${CONTROL_DIR}/hide-menubar-icon"
 HANDLERS_LOCK_FILE="${DNSCRYPT_VAR_RUN_BASE_DIR}/dnscrypt-handlers.lock"
 DNSCRYPT_PROXY_PLUGINS_BASE_FILE="${CONTROL_DIR}/plugin"
 STATIC_RESOLVERS_FILE="${CONTROL_DIR}/static-resolvers"
@@ -0,0 +1,9 @@
+#! /bin/sh
+
+. ./common.inc
+
+if [ -e "$HIDE_MENUBAR_ICON_FILE" ]; then
+  echo 'yes'
+else
+  echo 'no'
+fi
@@ -17,5 +17,8 @@ if [ ! -e "$DNSCRYPT_FILE" ]; then
  rm -f "$HANDLERS_LOCK_FILE"
  exit 0
 fi
+
+rm -f "${STATES_DIR}/controls.cksum"
+
 ./switch-to-dnscrypt-if-required.sh
 rm -f "$HANDLERS_LOCK_FILE"
@@ -0,0 +1,5 @@
+#! /bin/sh
+
+. ./common.inc
+
+rm -f "$HIDE_MENUBAR_ICON_FILE"
@@ -0,0 +1,5 @@
+#! /bin/sh
+
+. ./common.inc
+
+touch "$HIDE_MENUBAR_ICON_FILE"
@@ -16,6 +16,7 @@ while [ -e "$DNSCRYPT_FILE" ]; do
  current_resolvers=$(./get-current-resolvers.sh)
  if [ "$current_resolvers" = "$INTERFACE_PROXY" ]; then
    if [ ! -e "$PROXY_PID_FILE" ]; then
+      rm -f "${STATES_DIR}/controls.cksum"
      logger_debug "The proxy should be running but it isn't."
      ./switch-to-dhcp.sh
    fi
@@ -4,17 +4,31 @@ mkdir -p extra/usr/bin
 cp /Library/PreferencePanes/DNSCrypt.prefPane/Contents/Resources/usr/bin/hostip \
   extra/usr/bin/

+nd=$(otool -L /Library/PreferencePanes/DNSCrypt.prefPane/Contents/Resources/usr/sbin/dnscrypt-proxy | wc -l)
+if [ $nd -gt 2 ]; then
+  echo '*** dnscrypt-proxy may have more dependencies than libSystem.B.dylib'
+  echo '*** make sure that libsodium was statically linked'
+  sleep 10
+fi
+
+nd=$(otool -L /Library/PreferencePanes/DNSCrypt.prefPane/Contents/Resources/usr/lib/dnscrypt-proxy/libdcplugin_example_ldns_aaaa_blocking.so | wc -l)
+if [ $nd -gt 3 ]; then
+  echo '*** plugins may have more dependencies than libSystem.B.dylib and ldns'
+  echo '*** make sure that they were linked against ldns compiled without SSL'
+  sleep 10
+fi
+
 mkdir -p extra/usr/sbin
 cp /Library/PreferencePanes/DNSCrypt.prefPane/Contents/Resources/usr/sbin/dnscrypt-proxy \
   extra/usr/sbin/

 mkdir -p extra/usr/lib

-cp /opt/ldns/lib/libldns.1.dylib \
+cp /opt/ldns/lib/libldns.2.dylib \
   extra/usr/lib/
 ( cd extra/usr/lib &&
  rm -f libldns.dylib &&
-  ln -fs libldns.1.dylib libldns.dylib )
+  ln -fs libldns.2.dylib libldns.dylib )

 if [ -f /usr/local/lib/libsodium.18.dylib ]; then
  echo '*** /usr/local/lib/libsodium.{dylib,la} found'
@@ -0,0 +1,37 @@
+# Possible answsers to Frequently Asked Questions
+
+## "It doesn't work"
+
+Sorry to hear that this application doesn't behave as expected.
+
+Let's go through a few steps that may solve the issues you are experiencing.
+
+1. **Uninstall previous versions.**
+In order to do so, open the DNSCrypt OSXClient preferences pane, and click the `Uninstall` button in the `About` tab.
+2. **Download the latest official version.**
+The package can be installed with `brew cask` or downloaded directly from GitHub: [DNSCrypt OSXClient](https://github.com/alterstep/dnscrypt-osxclient/releases/latest).
+Do **not** download this app from unauthorized sources such as MacUpdate or a different GitHub repository. The file you would download from an unauthorized source may be delivered insecurely, may be old, or may contain malware.
+3. **Optional:** if you want to double check the authenticity of the file you downloaded, also download the `.minisig` file and use [Minisign](https://jedisct1.github.io/minisign/) to verify the digital signature.
+4. **Open the OSXClient preference pane**, select a resolver and try enabling DNSCrypt.
+5. Still no joy? **Try a different resolver.** Some of them might experience a temporary outage, or may be blocked by your ISP.
+6. **Turn off your VPN.** A VPN already encrypts your data, including DNS data.
+7. **Disable antiviruses**, local and remote (router) firewalls, Little Snitch, Little Flocker and other agents preventing applications from working normally.
+These can be reenabled later, but we need to make sure that their interaction with OSXClient is not the root cause of the problems you are trying to solve.
+8. **Activate logging** by creating a file named `debug.enabled` in the `/Library/Application Support/DNSCrypt/control` directory. The content of that file is not important; only its presence will be checked so an empty file is fine.
+When this file is present, OSXClient logs its activity in `/var/log/dnscrypt-osxclient-debug.log`. Reviewing the content of that file while trying to turn DNSCrypt on and off may be very useful in order to understand why things don't work as expected.
+9. **Update your operating system** if possible. This user interface, as well as the underlying proxy, have been written for the latest stable major version of MacOS. Apple doesn't make it simple to ensure that an application works on a specific OS version without having a dedicated test device, so the developers can only guess what changes may be required to make these applications also run on older systems.
+10. **Report resolver-specific issues to the resolver operator**. OSXClient, Simple DNSCrypt, dnscrypt-proxy, dnsdist, dnscrypt-wrapper are pieces of software, not services. None of the authors work at Yandex or OpenDNS, so we can't help you with your Yandex or OpenDNS account, or with issues specific to a resolver such as a name that cannot be resolved. Please report these issues to the companies and individuals running these services instead. These issues have probably nothing to do with the DNSCrypt protocol itself.
+
+After trying all these steps, open a ticket on the [OSXClient issue tracker](https://github.com/alterstep/dnscrypt-osxclient/issues).
+
+Here are a few hints to maximize the chances for your issue to be addressed as quickly as possible:
+
+1. **Do not post screenshots** unless the bug is specifically about a graphic element of the user interface. Screenshots are not indexed by search engines (not great to helper other users with similar issues), can be hard to read, can be incomplete, don't allow copy/paste, don't play well with command-line tools developers use, and finding what to look for in a screenshot is now always intuitive. Instead, copy/paste relevant information. If that information is short, include it in the description of the issue. If that information is 15 lines or more, save it to a file, and attach the file to the ticket. Or use a GitHub [gist](https://gist.github.com/) or [zerobin](https://zerobin.net/). Short and clear descriptions are always appreciated.
+2. **Make sure that you went through the steps above** before filing an issue.
+3. **Include some information**: the OSX version you are running, the OSXClient version you installed, and a snippet of the `dnscrypt-osxclient-debug.log` file (not inline, see above). Details such as the model of your computer and the brand of your router are not required.
+4. **Summarize your problem**: what you did, what should have happened, and what actually happened. Bugs can be fixed very quickly if the developer can duplicate your problem. But they are very unlikely to be fixed if the developper struggles at understanding why something happens on your machine and not elsewhere. Use a short and meaningful summary as the title of your ticket: this will be immensely useful to other users that look for a solution to the same problem.
+5. **Do not write "doesn't work"**: explain exactly what doesn't behave as expected. See the previous point.
+6. **Do not hide information**: if you are running an old MacOS version, if didn't try without your antivirus, if you are blocking specific ports and protocols, if you altered the software, if you customized your environment in some way, please mention it.
+7. **Share your solution**: did you eventually manage to fix the issue? Fantastic! Before closing the ticket, writing a short description of what you did will be very appreciated by other users!
+
+If the command-line doesn't scare you, you may consider running [dnscrypt-proxy](https://github.com/jedisct1/dnscrypt-proxy/wiki) directly instead of OSXClient.
@@ -4,7 +4,7 @@ OSX client for managing the DNSCrypt Proxy
 The purpose of this application is to allow the user to have a better experience controlling the DNSCrypt Proxy on OSX.

 [Download dnscrypt-osxclient.dmg](https://github.com/alterstep/dnscrypt-osxclient/releases/latest)
-for OSX 10.8 (Mountain Lion), OSX 10.9 (Mavericks), OSX 10.10 (Yosemite), OSX 10.11 (El Capitan) and macOS 10.12 (Sierra).
+for macOS 10.10 (Yosemite), macOS 10.11 (El Capitan) and macOS 10.12 (Sierra).

 Compatible with all the DNS servers with DNSCrypt enabled.

@@ -18,5 +18,5 @@ You can also install this application using Homebrew Cask:
 brew cask install dnscrypt
 ```

-![Foto 1](https://raw.githubusercontent.com/alterstep/dnscrypt-osxclient/master/1.png)
-![Foto 2](https://raw.githubusercontent.com/alterstep/dnscrypt-osxclient/master/2.png)
+![Foto 1](1.png)
+![Foto 2](2.png)
@@ -1,5 +1,5 @@
-10.8 5 https://github.com/alterstep/dnscrypt-osxclient/releases/download/1.0.12/dnscrypt-osxclient-1.0.12.dmg
-10.9 5 https://github.com/alterstep/dnscrypt-osxclient/releases/download/1.0.12/dnscrypt-osxclient-1.0.12.dmg
-10.10 5 https://github.com/alterstep/dnscrypt-osxclient/releases/download/1.0.12/dnscrypt-osxclient-1.0.12.dmg
-10.11 5 https://github.com/alterstep/dnscrypt-osxclient/releases/download/1.0.12/dnscrypt-osxclient-1.0.12.dmg
-10.12 5 https://github.com/alterstep/dnscrypt-osxclient/releases/download/1.0.12/dnscrypt-osxclient-1.0.12.dmg
+10.8 8 https://github.com/alterstep/dnscrypt-osxclient/releases/download/1.0.14/dnscrypt-osxclient-1.0.14.dmg
+10.9 8 https://github.com/alterstep/dnscrypt-osxclient/releases/download/1.0.14/dnscrypt-osxclient-1.0.14.dmg
+10.10 8 https://github.com/alterstep/dnscrypt-osxclient/releases/download/1.0.14/dnscrypt-osxclient-1.0.14.dmg
+10.11 8 https://github.com/alterstep/dnscrypt-osxclient/releases/download/1.0.14/dnscrypt-osxclient-1.0.14.dmg
+10.12 8 https://github.com/alterstep/dnscrypt-osxclient/releases/download/1.0.14/dnscrypt-osxclient-1.0.14.dmg
@@ -1,4 +1,4 @@
 untrusted comment: signature from minisign secret key
-RWRvw8aArS/yEJ4dpKMNawnmT9zOyXUpQ74mVAjMsxG3VygtaF+6k7YPoire23Tqdk0lcolS16ngIg9dCJPXuNuWUFFwIzqKIQ4=
-trusted comment: timestamp:1469970056	file:versions.txt
-Sp5RYaUW/tOqKM2Lq2w1Qb1QyH9VTCBG0vwB5VatktYhnXLawYVIQ0eUoDSPhSwiDzxMGNUtPaHoQT0stumjAg==
+RWRvw8aArS/yEC0KSUJzl/E1pNue3BhV6XHpINFPjWAQxxgoA5tL8+JOqqhC6vtdgG/9K4Iq8OZeWEWiriwZj0rmshQVpcB9ZQU=
+trusted comment: timestamp:1486847028	file:versions.txt
+j2By6+I+aOudtAInQZWqMamAqk4AJyjWhTMMNjF0kmelQfuImLZO09vNcuzPrnTM0M+jFiQdzHRLbQA0Fud6AA==
Author	SHA1	Message	Date
Alter Step	fccba1dfb8	only touch!	2017-10-08 18:21:08 +02:00
Alter Step	63594470fd	Merge pull request #156 from catap/hide_menubar_icon Added setting 'hide menubar icon' to panel, and implemented support at menubar app	2017-10-07 21:09:00 +02:00
Kirill A. Korinsky	355b796d5c	Added setting 'hide menubar icon' to panel, and implemented support at menubar app	2017-10-07 16:13:35 +04:00
Alter Step	95925d9e2d	Merge pull request #140 from mkjaer/Updated-screenshots Updated screenshots to reflect latest version	2017-02-16 18:32:33 +01:00
Mikael Kjær	1510319bb8	Updated screenshots to reflect latest version	2017-02-16 16:07:47 +04:00
Alter Step	e9db17b111	Update ISSUE_TEMPLATE.md	2017-02-16 10:54:50 +01:00
Alter Step	3ec589a1ef	issue template!	2017-02-11 22:16:55 +01:00
Alter Step	ebeb963aa4	no markdown for issue templates	2017-02-11 22:16:30 +01:00
Alter Step	1b02a3dc77	issue template!	2017-02-11 22:15:42 +01:00
Alter Step	7c7dadd464	macOS >= 10.10 should be compatible	2017-02-11 22:04:50 +01:00
Alter Step	7d66d1be60	publish update	2017-02-11 22:03:53 +01:00
Alter Step	d7df143702	new version 1.0.14	2017-02-11 22:00:08 +01:00
Alter Step	8c9a6f09ff	verify that ldns doesn't need openssl / remove cksum after network change	2017-02-11 21:45:50 +01:00
Alter Step	780380a1ef	Merge pull request #137 from jedisct1/master Empty the states directory after a reboot	2017-02-11 21:39:31 +01:00
Frank Denis	63065e55c8	Empty the states directory after a reboot After a shutdown we need to remove the previous checksum file, and maybe removing everything else wouldn't hurt either. Perhaps the checksum file should also be removed after a network change.	2017-02-11 16:06:49 +01:00
Alter Step	7e6d44e2ab	Merge pull request #135 from jedisct1/master The beginning of a FAQ	2017-02-10 13:29:52 +01:00
Frank Denis	9acd96ceb7	The beginning of a FAQ	2017-02-10 12:13:20 +01:00
Alter Step	8144efe612	publish the new version	2017-02-09 22:02:43 +01:00
Alter Step	c69fdc7519	VERSION + 1	2017-02-09 21:54:48 +01:00
Alter Step	1d2778e636	CURRENT_VERSION + 1	2017-02-09 21:52:52 +01:00
Alter Step	1bdc80b76b	remove compatibility with OSX < 10.12	2017-02-09 21:04:43 +01:00
Alter Step	f971a7fe19	Delete CPU requirements	2017-02-09 13:54:10 +01:00
Alter Step	654ac623bb	update	2017-02-09 13:54:06 +01:00