Commit Graph
1110 Commits
Author SHA1 Message Date
Lucas Liu 49a3cfdc34 NFC state check 2016-03-16 23:30:52 +08:00
Max Lv 82325ecdba Merge pull request #610 from Mygod/master
Refine #609
2016-03-16 22:41:05 +08:00
Mygod 555f4f6854 Refine #609 2016-03-16 22:31:07 +08:00
Max Lv e99a0eaafc Merge pull request #609 from AnyOfYou/master
Fix parser bug, add share profile by NFC.
2016-03-16 13:46:20 +08:00
Lucas Liu 7f2f67f27c Fix crash when cancel qrcode scan. 2016-03-16 13:22:53 +08:00
Lucas Liu 488d825637 Add share profile by NFC. 2016-03-16 12:47:10 +08:00
Lucas Liu f792c8ebfb Fix parser bug 2016-03-16 01:15:17 +08:00
Max Lv 78e57de833 Refine #602 further 2016-03-13 13:33:36 +08:00
Max Lv 017dd425a0 Refine #602 2016-03-13 13:13:37 +08:00
Max Lv 04ec29c9ea Merge pull request #603 from Mygod/master
Import/export one/all ss urls
2016-03-12 15:42:06 +08:00
Mygod 16e39f8b6c Hide quick switch if there's nothing to switch 2016-03-12 15:28:23 +08:00
Mygod 6dede5c067 Import/export one/all ss urls 2016-03-12 15:11:11 +08:00
Mygod fb3f7429b7 Refine parser 2016-03-12 14:39:00 +08:00
Mygod 0e0e65c45d Move profileTip to Key 2016-03-12 14:20:18 +08:00
Max Lv 86da4f535d Merge pull request #602 from Mygod/restart
Automatic service restart (with zero latency) after switching profile
2016-03-12 14:10:56 +08:00
Mygod ee48c0773c Automatic service restart 2016-03-12 13:40:13 +08:00
Max Lv 6ade064599 Merge pull request #600 from Mygod/master
Refine layout for #598
2016-03-12 12:45:19 +08:00
Mygod 8fd8514cc2 Refine layout for #598 2016-03-12 11:18:21 +08:00
Mygod 0aad8f13ed Merge branch 'master' of https://github.com/shadowsocks/shadowsocks-android 2016-03-12 11:17:53 +08:00
Max Lv 14a5324852 Merge pull request #598 from AnyOfYou/master
Add quick switch from notification.
2016-03-12 08:00:42 +08:00
Lucas Liu 7c5efdaa82 Add quick switch from notification. 2016-03-12 01:13:03 +08:00
Mygod 1c37c449d5 Update dependencies 2016-03-11 23:05:31 +08:00
Mygod 0f2ae6521b Oops fix a bug 2016-03-11 22:55:47 +08:00
Max Lv 3ae15514a5 Merge pull request #597 from Mygod/master
Refine #574, #583, #585, #594
2016-03-11 22:50:29 +08:00
Max Lv cee74f2563 Update setup scripts 2016-03-11 22:51:18 +08:00
Mygod 4c1a817c1b Fix a crash on Android N preview 2016-03-11 22:17:06 +08:00
Mygod 390d79c9aa Add missing volatile 2016-03-11 22:05:13 +08:00
Mygod 216cc9efe2 Refine #574 2016-03-11 22:02:52 +08:00
Mygod 3bb746254e Refine #594, again 2016-03-11 21:53:18 +08:00
Mygod 8fa2e60cf3 Remove redundant bindToService
Please do not create methods casually.
2016-03-11 20:41:46 +08:00
Mygod 8657ef87f4 Crash recovery for NAT mode
Bugfix: when NAT process is killed, Internet access is gone. Reproduce with:

    adb shell killall com.github.shadowsocks:nat

One circumstance it cannot recover from is when updating to a new version, where both processes are killed at the same time. But a reset will be executed when the new version is launched.
2016-03-11 20:39:01 +08:00
Mygod da1b404175 Remove redundant IOUtils 2016-03-11 20:19:45 +08:00
Mygod fcdeb5144a Remove ProcessUtils
It's safe to say that Shadowsocks is only instantialized in the main process, so boom, problem solved.
2016-03-11 20:18:22 +08:00
Mygod 270d436017 Refine ShadowsocksDeathRecipient and ServiceBoundContext 2016-03-11 20:17:23 +08:00
Mygod a4e186b759 Generate images with android-sdk-plugin 2016-03-11 19:27:50 +08:00
Max Lv 9965a71c93 Refine #594 2016-03-07 17:59:15 +08:00
Max Lv 9e09e0329b Merge pull request #594 from ayanamist/miui
Recover unexpected process exit on MIUI
2016-03-07 17:04:45 +08:00
ayanamist c19eb4e9e5 Convert GuardedProcess to Scala 2016-03-07 16:46:54 +08:00
ayanamist cad6d7b62a Recover unexpected process exit on MIUI 2016-03-07 15:48:37 +08:00
Max Lv e4e1a42146 Bump version v2.9.11 2016-02-27 21:09:09 +08:00
Max Lv 76108ec450 Merge pull request #585 from JLLK/master
Fix a issue in ProcessUtils
2016-02-26 14:31:16 +08:00
chentao 5b9a0d0659 Refine #585 2016-02-26 11:48:05 +08:00
Max Lv 6558f275fe Refine #577 2016-02-26 08:54:53 +08:00
chentao c13cf6f5d2 Fix a issue in ProcessUtils 2016-02-26 08:45:43 +08:00
Max Lv cacde5cff1 Fix #584 2016-02-25 21:38:57 +08:00
Max Lv bb2bd82d73 Update README.md 2016-02-25 21:12:56 +08:00
Max Lv 0a46eedba1 Update README.md 2016-02-25 21:04:09 +08:00
Max Lv 63bc60e513 Update README.md 2016-02-25 21:03:04 +08:00
Max Lv d9eb0e5163 Merge pull request #583 from JLLK/master
Fix binder ipc issue when process died unexpected
2016-02-25 21:00:51 +08:00
chentao fc3d26d626 Fix binder ipc issue when process died unexpected 2016-02-25 00:04:57 +08:00