Alawn/shadowsocks-android
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

reduce the apk size

Browse Source
This commit is contained in:
Max Lv
2014-06-28 19:37:54 +08:00
parent 8923c93b6e
commit 250e41714c
5 changed files with 51 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/scala/com/github/shadowsocks/Shadowsocks.scala
+2 -5
View File
@@ -124,8 +124,7 @@ object Shadowsocks {
val FEATRUE_PREFS = Array(Key.isGFWList, Key.isGlobalProxy, Key.proxyedApps, Key.isTrafficStat,
Key.isUdpDns, Key.isAutoConnect)
val SYSTEM_EXECUTABLES = Array(Executable.PDNSD, Executable.REDSOCKS,Executable.SS_TUNNEL)
val EXECUTABLES = Array(Executable.IPTABLES) ++ SYSTEM_EXECUTABLES
val EXECUTABLES = Array(Executable.PDNSD, Executable.REDSOCKS)
// Helper functions
def updateListPreference(pref: Preference, value: String) {
@@ -329,8 +328,6 @@ class Shadowsocks
ab.append("kill -9 `cat /data/data/com.github.shadowsocks/ss-tunnel.pid`")
ab.append("kill -9 `cat /data/data/com.github.shadowsocks/tun2socks.pid`")
ab.append("killall -9 pdnsd")
ab.append("killall -9 ss-local")
ab.append("killall -9 ss-tunnel")
ab.append("killall -9 tun2socks")
ab.append("rm /data/data/com.github.shadowsocks/pdnsd.conf")
ab.append("rm /data/data/com.github.shadowsocks/pdnsd.cache")
@@ -802,7 +799,7 @@ class Shadowsocks
def copyToSystem() {
val ab = new ArrayBuffer[String]
ab.append("mount -o rw,remount -t yaffs2 /dev/block/mtdblock3 /system")
for (executable <- Shadowsocks.SYSTEM_EXECUTABLES) {
for (executable <- Shadowsocks.EXECUTABLES) {
ab.append("cp %s%s /system/bin/".format(Path.BASE, executable))
}
ab.append("mount -o ro,remount -t yaffs2 /dev/block/mtdblock3 /system")
src/main/scala/com/github/shadowsocks/ShadowsocksNatService.scala
+11 -5
View File
@@ -134,7 +134,7 @@ class ShadowsocksNatService extends Service with BaseService {
def startDnsDaemon() {
val args = if (config.isUdpDns) {
("ss-tunnel -b 127.0.0.1 -s '%s' -p '%d' -l '%d' -k '%s' -m '%s' -L 8.8.8.8:53 -u -f " +
("ss-tunnel -b 127.0.0.1 -s %s -p %d -l %d -k %s -m %s -L 8.8.8.8:53 -u -f " +
Path.BASE + "ss-tunnel.pid")
.format(config.proxy, config.remotePort, 8153, config.sitekey, config.encMethod)
} else {
@@ -155,8 +155,14 @@ class ShadowsocksNatService extends Service with BaseService {
} else {
Path.BASE + args
}
if (BuildConfig.DEBUG) Log.d(TAG, cmd)
Console.runRootCommand(cmd)
if (config.isUdpDns) {
Core.sstunnel(cmd.split(" "))
} else {
Console.runRootCommand(cmd)
}
}
def getVersionName: String = {
@@ -308,10 +314,11 @@ class ShadowsocksNatService extends Service with BaseService {
val ab = new ArrayBuffer[String]
ab.append("kill -9 `cat " + Path.BASE + "ss-tunnel.pid`")
ab.append("kill -9 `cat " + Path.BASE +"redsocks.pid`")
ab.append("killall -9 redsocks")
ab.append("kill -9 `cat " + Path.BASE + "ss-tunnel.pid`")
ab.append("killall -9 ss-tunnel")
ab.append("kill -15 `cat " + Path.BASE + "pdnsd.pid`")
ab.append("killall -15 pdnsd")
@@ -319,7 +326,6 @@ class ShadowsocksNatService extends Service with BaseService {
ab.clear()
ab.append("kill -9 `cat " + Path.BASE + "ss-local.pid`")
ab.append("killall -9 ss-local")
Console.runCommand(ab.toArray)
}