Update to 2.0.0

cbeuw · Aug 12, 2019 · f2b76d0 · f2b76d0
1 parent 2bc627a
commit f2b76d0
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 19 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -14,8 +14,8 @@ android {
         applicationId "com.github.shadowsocks.plugin.ck_client"
         minSdkVersion 19
         targetSdkVersion 26
-        versionCode 3
-        versionName '2.0.0-prealpha'
+        versionCode 4
+        versionName '2.0.0'
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
     buildTypes {

diff --git a/app/src/main/java/com/github/shadowsocks/plugin/ck_client/ConfigFragment.kt b/app/src/main/java/com/github/shadowsocks/plugin/ck_client/ConfigFragment.kt
@@ -17,7 +17,7 @@ class ConfigFragment : PreferenceFragment() {
         this._options = options
         val ary = arrayOf(Pair("ProxyMethod","shadowsocks"), Pair("EncryptionMethod","plain"),
                 Pair("UID", ""), Pair("PublicKey",""), Pair("ServerName", "bing.com"),
-                Pair("TicketTimeHint", "3600"),Pair("NumConn","4"), Pair("BrowserSig", "chrome"))
+                Pair("NumConn","4"), Pair("BrowserSig", "chrome"))
         for (element in ary) {
             val key = element.first
             val defaultValue = element.second

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -3,8 +3,7 @@
     <string name="cloak_server_name">Server Name</string>
     <string name="cloak_uid">UID</string>
     <string name="cloak_public_key">Public Key</string>
-    <string name="cloak_tieckt_time_hint">Ticket Time Hint</string>
-    <string name="cloak_num_conn">NumConn</string>
+    <string name="cloak_num_conn">Number of Connections</string>
     <string name="cloak_browser_sig">Browser Signature</string>
     <string name="cloak_encryption_method">Encryption Method</string>
     <string name="cloak_proxy_method">Proxy Method</string>

diff --git a/app/src/main/res/xml/config.xml b/app/src/main/res/xml/config.xml
@@ -26,12 +26,6 @@
             android:key="ServerName"
             android:persistent="false"
             android:title="@string/cloak_server_name" />
-        <EditTextPreference
-            android:key="TicketTimeHint"
-            android:persistent="false"
-            android:inputType="numberDecimal"
-            android:digits="0123456789"
-            android:title="@string/cloak_tieckt_time_hint" />
         <EditTextPreference
             android:key="NumConn"
             android:persistent="false"

diff --git a/app/src/make.sh b/app/src/make.sh
@@ -60,16 +60,14 @@ if [ ! -f "$ANDROID_X86_CC" ]; then
         --api $MIN_API --install-dir $ANDROID_X86_TOOLCHAIN
 fi
 
-export GOPATH=$DEPS/gopath
-
+pushd $DEPS
 echo "Getting Cloak source code"
-#go get -u github.com/cbeuw/Cloak
-git clone --single-branch --branch 2.0 https://github.com/cbeuw/Cloak $GOPATH/src/github.com/cbeuw/Cloak
-go get -u github.com/juju/ratelimit
-go get -u github.com/boltdb/bolt
-go get -u golang.org/x/crypto/curve25519
+GO111MOD=on
+git clone https://github.com/cbeuw/Cloak
+pushd Cloak
+go get
 
-pushd $GOPATH/src/github.com/cbeuw/Cloak/cmd/ck-client
+pushd cmd/ck-client
 
 echo "Cross compile ckclient for arm"
 echo $ANDROID_ARM_CC