From 8569bc590c38144cc1994ff596b6c020f05f444f Mon Sep 17 00:00:00 2001
From: qinyuhang <qinyuhangxiaoxiang@gmail.com>
Date: Thu, 11 Aug 2016 11:23:09 +0800
Subject: [PATCH] finish integration basic ssr function

finish integration basic ssr function
---
 .../Base.lproj/ProxyPreferencesController.xib       |  6 +++---
 ShadowsocksX-NG/PreferencesWindowController.swift   | 13 +++++++++++++
 ShadowsocksX-NG/ServerProfile.swift                 |  4 ++--
 ShadowsocksX-NG/Utils.m                             |  4 +++-
 4 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/ShadowsocksX-NG/Base.lproj/ProxyPreferencesController.xib b/ShadowsocksX-NG/Base.lproj/ProxyPreferencesController.xib
index ef62b91..af0d887 100644
--- a/ShadowsocksX-NG/Base.lproj/ProxyPreferencesController.xib
+++ b/ShadowsocksX-NG/Base.lproj/ProxyPreferencesController.xib
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="10117" systemVersion="15F34" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="10117" systemVersion="15G31" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
     <dependencies>
         <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="10117"/>
     </dependencies>
@@ -73,11 +73,11 @@
                             <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
                         </clipView>
                         <scroller key="horizontalScroller" hidden="YES" verticalHuggingPriority="750" horizontal="YES" id="3sC-hI-IvB">
-                            <rect key="frame" x="-7" y="-14" width="0.0" height="15"/>
+                            <rect key="frame" x="1" y="-15" width="0.0" height="16"/>
                             <autoresizingMask key="autoresizingMask"/>
                         </scroller>
                         <scroller key="verticalScroller" hidden="YES" verticalHuggingPriority="750" horizontal="NO" id="6OR-N8-MXx">
-                            <rect key="frame" x="-14" y="-7" width="15" height="0.0"/>
+                            <rect key="frame" x="-15" y="1" width="16" height="0.0"/>
                             <autoresizingMask key="autoresizingMask"/>
                         </scroller>
                     </scrollView>
diff --git a/ShadowsocksX-NG/PreferencesWindowController.swift b/ShadowsocksX-NG/PreferencesWindowController.swift
index 64841c3..69b2404 100644
--- a/ShadowsocksX-NG/PreferencesWindowController.swift
+++ b/ShadowsocksX-NG/PreferencesWindowController.swift
@@ -173,6 +173,14 @@ class PreferencesWindowController: NSWindowController
             remarkTextField.bind("value", toObject: editingProfile, withKeyPath: "remark"
                 , options: [NSContinuouslyUpdatesValueBindingOption: true])
             
+            ProtocolTextField.bind("value", toObject: editingProfile, withKeyPath: "ssrProtocol", options: [NSContinuouslyUpdatesValueBindingOption: true])
+            
+            ProtocolParamTextField.bind("value", toObject: editingProfile, withKeyPath: "ssrProtocolParam", options: [NSContinuouslyUpdatesValueBindingOption: true])
+            
+            ObfsTextField.bind("value", toObject: editingProfile, withKeyPath: "ssrObfs", options: [NSContinuouslyUpdatesValueBindingOption: true])
+            
+            ObfsParamTextField.bind("value", toObject: editingProfile, withKeyPath: "ssrObfsParam", options: [NSContinuouslyUpdatesValueBindingOption: true])
+            
             otaCheckBoxBtn.bind("value", toObject: editingProfile, withKeyPath: "ota"
                 , options: [NSContinuouslyUpdatesValueBindingOption: true])
         } else {
@@ -183,6 +191,11 @@ class PreferencesWindowController: NSWindowController
             methodTextField.unbind("value")
             passwordTextField.unbind("value")
             
+            ProtocolTextField.unbind("value")
+            ProtocolParamTextField.unbind("value")
+            ObfsTextField.unbind("value")
+            ObfsParamTextField.unbind("value")
+            
             remarkTextField.unbind("value")
             
             otaCheckBoxBtn.unbind("value")
diff --git a/ShadowsocksX-NG/ServerProfile.swift b/ShadowsocksX-NG/ServerProfile.swift
index 05c618c..026b9d7 100644
--- a/ShadowsocksX-NG/ServerProfile.swift
+++ b/ShadowsocksX-NG/ServerProfile.swift
@@ -19,9 +19,9 @@ class ServerProfile: NSObject {
     var password:String = ""
     var remark:String = ""
     var ota: Bool = false // onetime authentication
-    var ssrProtocol:String = ""
+    var ssrProtocol:String = "origin"
     var ssrProtocolParam:String = ""
-    var ssrObfs:String = ""
+    var ssrObfs:String = "plain"
     var ssrObfsParam:String = ""
     
     override init() {
diff --git a/ShadowsocksX-NG/Utils.m b/ShadowsocksX-NG/Utils.m
index c5c633a..d463664 100644
--- a/ShadowsocksX-NG/Utils.m
+++ b/ShadowsocksX-NG/Utils.m
@@ -57,6 +57,8 @@ void ScanQRCodeOnScreen() {
             if ( [feature.messageString hasPrefix:@"ss://"] )
             {
                 [foundSSUrls addObject:[NSURL URLWithString:feature.messageString]];
+            }else if ( [feature.messageString hasPrefix:@"ssr://"] ){
+                [foundSSUrls addObject:[NSURL URLWithString:feature.messageString]];
             }
         }
     }
@@ -135,7 +137,7 @@ NSDictionary<NSString *, id>* ParseSSURL(NSURL* url) {
         }
 
     }else if ([[NSString stringWithContentsOfURL:url encoding:NSUTF8StringEncoding error:NULL ] hasPrefix:@"ssr://"]){
-        
+        NSLog(@"Have One ssr QR coming");
     }
        return nil;
 }