Commit Graph
1289 Commits
Author SHA1 Message Date
Max Lv eb0d5ceccc Fix travis 2016-08-06 18:57:09 +08:00
Max Lv 2ffbf4c56f Fix a typo 2016-08-06 18:55:48 +08:00
Max Lv 9ee3bab7e0 Update build scripts 2016-08-06 18:47:07 +08:00
Max Lv 70a7317a1e Update kcptun 2016-08-06 18:41:56 +08:00
Max Lv 43caaa684f Add submodules for kcptun 2016-08-06 18:22:27 +08:00
Max Lv 586c5e2ae4 Bump version 2016-08-06 17:25:10 +08:00
Max Lv 416d93062f Update kcptun 2016-08-06 13:01:40 +08:00
Max Lv 66ceed8607 Restart kcptun when switching network 2016-08-06 10:55:33 +08:00
Max Lv a073f850d6 Tune yamux parameters for kcptun v3.0.0 2016-08-06 09:24:22 +08:00
Max Lv 6ab4540726 Update shadowsocks-libev 2016-08-05 20:17:08 +08:00
Max Lv 9e59201596 Strip the binary 2016-08-05 13:16:46 +08:00
Max Lv b9a33cf1db Add KCP support (#788)
Add KCP support for shadowsocks.

KCPTUN should be setup on a different port to avoid conflicts with Shadowsocks' UDP support.
2016-08-04 23:43:18 -05:00
Mygod bae5e9d06b Check bgService in ShadowsocksTileService 2016-07-22 15:44:11 +08:00
Mygod 455aa15f18 Update Android Support Library 2016-07-19 12:37:56 +08:00
Max Lv ee98d64413 Update plugin v2.10.8 2016-07-19 09:14:45 +08:00
Max Lv e9bf3ab34f Bump version 2016-07-19 08:57:57 +08:00
Max Lv 8ddf1febd9 Fix #771 2016-07-19 08:56:58 +08:00
Mygod d005953f8a Update Google Play services 2016-07-18 17:06:19 +08:00
Mygod b5ce788353 Bugfix for previous commit 2016-07-18 15:27:55 +08:00
Mygod 360b425d47 Fix #767 2016-07-18 14:37:18 +08:00
Mygod e638d90ca3 Fix targetSdkVersion in AndroidManifest 2016-07-18 14:18:21 +08:00
Max Lv 2c3b9f820f Fix #769 2016-07-18 11:04:24 +08:00
Mygod cf9cb3127b Merge branch 'master' of github.com:shadowsocks/shadowsocks-android 2016-07-16 13:12:29 +08:00
Mygod 427ca9b181 Remove useless TargetApi 2016-07-16 13:11:24 +08:00
Mygod 2f8c1ab76e Move pdnsd to submodule
For cleaner repository.
2016-07-16 13:10:51 +08:00
Max Lv 781cfb336c Enlarge dexMaxHeap 2016-07-15 09:24:33 +08:00
Max Lv d0117daf6f Fix #759 #760 v2.10.7 2016-07-14 08:58:36 +08:00
Mygod b14ff7082d Remove camera requirement 2016-07-13 11:38:23 +08:00
Max Lv 0e4cfb7a01 Bump version 2016-07-13 09:55:14 +08:00
Max Lv 73996e2ff7 Fix #722 2016-07-13 09:54:40 +08:00
Mygod 76f7306a93 Use Shell.Interactive interactively and removes iptables submodule
The following action will take only one SU request with this commit:

* Start service in NAT mode;
* Reset in NAT mode;
* Flush DNS.

And stopping service in NAT mode doesn't need SU request any more.
2016-07-13 09:42:18 +08:00
Mygod 09220ee335 Reduce notification priority 2016-07-13 00:45:19 +08:00
Mygod 6c992c5937 Refine proguard rules and flushing DNS on Android 4.x
This reverts commit 7a87eab47c.
2016-07-12 18:46:31 +08:00
Mygod 3010ed7a8b Fix incremental builds 2016-07-12 17:13:52 +08:00
Mygod 4fc56e2fea Update dependency 2016-07-12 17:12:05 +08:00
Mygod c92d66d9f3 Revert "Refine #530 again and again" and probably fix #530
This reverts commit b833cb6267.
2016-07-12 15:56:32 +08:00
Max Lv b833cb6267 Refine #530 again and again
Put ShadowsocksRunnerService into :bg process. It helped to solve #530, but
still I'm not sure why it works.

One assumption is that the startService() in BootReceiver helps to ensure :bg
process in a valid state.
2016-07-12 13:36:23 +08:00
Max Lv 9c37f8cae6 Fix #754 2016-07-12 12:17:36 +08:00
Mygod 16f4572839 Use official icons 2016-07-11 22:29:22 +08:00
Mygod 44625ae5b0 Bugfix for DropDownPreference 2016-07-11 20:43:53 +08:00
Mygod 159e1dff78 Bugfix for NAT mode 2016-07-11 19:51:47 +08:00
Mygod 84ac2b06fa Refine #530 again
Have. To. Do. More. Refinements.

Here's what happened in the buggy versions: (I think)

* `BootReceiver` starts which invokes `Utils.startSsService` which starts `ShadowsocksRunnerService`;
* `ShadowsocksRunnerService` binds to `BaseService`;
* 1s after it's connected, it invokes `bgService.use` which returns immediately after pushing `use` in the queue since it's an oneway method;
* Then `stopSelf` => `detachService`, `BaseService` now have nothing bound to it and not started either (neither foreground nor background), so the system can destroy it any time; (at this point, `BaseService.use` isn't invoked yet)
* `com.github.shadowsocks` process then probably exits since booting is a resource-heavy task, anyway it doesn't matter;
* Some time later `com.github.shadowsocks:bg` resumes running, and `BaseService` is stopped and destroyed. Now the system is no longer aware of this `BaseService` instance but it isn't garbage collected yet;
* `use` is finally invoked;
* `startService` is invoked in `startRunner` and the destroyed background service starts running; (bug of Android?)
* `startForeground` is invoked in `ShadowsocksNotification` but the system probably refused it since the service itself is already destroyed;
* When the main activity UI is brought up and requests binding, `com.github.shadowsocks:bg` which is unaware of the existing instance of `BaseService` creates another `BaseService` and thus everything gets messed up.

This commit fixes this by invoking `getState` (which isn't an oneway method) immediately after `use` so that `ShadowsocksRunnerService` will wait for `BaseService` to start itself before destroying itself and its connection to `BaseService`. And thus its return value is not used.
2016-07-11 19:22:54 +08:00
Mygod dcf190c1f5 Bugfix for NumberPickerPreference 2016-07-11 17:51:24 +08:00
Mygod 74a0e397c1 Refine #752 and NumberPickerPreference 2016-07-11 17:49:17 +08:00
Max Lv f35a4b05b5 Fix #752 v2.10.6 2016-07-10 19:22:51 +08:00
Max Lv 82e6266f09 Revert "Disable AutoFocus and Flash"
This reverts commit 9919ead15e.
2016-07-10 16:13:20 +08:00
Max Lv 9919ead15e Disable AutoFocus and Flash 2016-07-10 16:04:43 +08:00
Max Lv f6c4d2ea5e Bump version 2016-07-09 09:38:33 +08:00
Max Lv fce0ffe566 Refine #530 2016-07-09 09:00:00 +08:00
Max Lv 556d8d78bd Revert "Refine #530"
This reverts commit 56de231c4f.
2016-07-09 08:59:13 +08:00