Commit 06d736b2 authored by Max Lv's avatar Max Lv

fix all issues for lollipop

parent e34d5675
<manifest xmlns:android="http://schemas.android.com/apk/res/android" <manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.github.shadowsocks" package="com.github.shadowsocks"
android:versionCode="74" android:versionCode="75"
android:versionName="2.2.6"> android:versionName="2.3.0">
<uses-permission android:name="android.permission.INTERNET"/> <uses-permission android:name="android.permission.INTERNET"/>
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/> <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
......
...@@ -827,10 +827,6 @@ class Shadowsocks ...@@ -827,10 +827,6 @@ class Shadowsocks
copyAssets(System.getABI) copyAssets(System.getABI)
if (Build.VERSION.SDK_INT >= 20) {
copyToSystem()
}
val ab = new ArrayBuffer[String] val ab = new ArrayBuffer[String]
for (executable <- Shadowsocks.EXECUTABLES) { for (executable <- Shadowsocks.EXECUTABLES) {
ab.append("chmod 755 " + Path.BASE + executable) ab.append("chmod 755 " + Path.BASE + executable)
......
...@@ -160,12 +160,8 @@ class ShadowsocksNatService extends Service with BaseService { ...@@ -160,12 +160,8 @@ class ShadowsocksNatService extends Service with BaseService {
}) })
val args = "pdnsd -c " + Path.BASE + "pdnsd.conf" val args = "pdnsd -c " + Path.BASE + "pdnsd.conf"
val cmd = Path.BASE + args
val cmd = if (Build.VERSION.SDK_INT >= 20) {
"/system/bin/" + args
} else {
Path.BASE + args
}
if (BuildConfig.DEBUG) Log.d(TAG, cmd) if (BuildConfig.DEBUG) Log.d(TAG, cmd)
Console.runRootCommand(cmd) Console.runRootCommand(cmd)
} }
...@@ -190,11 +186,7 @@ class ShadowsocksNatService extends Service with BaseService { ...@@ -190,11 +186,7 @@ class ShadowsocksNatService extends Service with BaseService {
ConfigUtils.printToFile(new File(Path.BASE + "redsocks.conf"))(p => { ConfigUtils.printToFile(new File(Path.BASE + "redsocks.conf"))(p => {
p.println(conf) p.println(conf)
}) })
val cmd = if (Build.VERSION.SDK_INT >= 20) { val cmd = Path.BASE + args
"/system/bin/" + args
} else {
Path.BASE + args
}
Console.runRootCommand(cmd) Console.runRootCommand(cmd)
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment