Commit Graph
1073 Commits
Author SHA1 Message Date
Max Lv 6e974da8ca Merge pull request #439 from Mygod/master
Add realtime traffic in profiles selector
2015-11-21 16:11:25 +08:00
Mygod 407ba8beaa Add realtime traffic in profiles selector 2015-11-21 16:04:55 +08:00
Mygod c08296890a Refine traffic display 2015-11-21 15:11:48 +08:00
Max Lv c3638b96e8 refine strings 2015-11-21 12:19:34 +08:00
Max Lv ff23bae671 fix #424 2015-11-21 11:59:05 +08:00
Max Lv e636b9f78e Disable log of pdnsd 2015-11-21 10:15:11 +08:00
Max Lv f833808bbc fix an issue that redsocks is blocked by stdout 2015-11-21 09:18:46 +08:00
Max Lv f2292fb86b use ProcessBuilder instead of fork/exec 2015-11-20 13:00:59 +08:00
Max Lv fe81182d25 Merge pull request #438 from Mygod/master
Fix #437
2015-11-20 11:00:30 +08:00
Mygod 6766b8c3a3 Update dependency 2015-11-20 09:13:14 +08:00
Mygod 946affb219 Fix #437 2015-11-20 08:58:13 +08:00
Mygod 408e74384e Debugging an HTC device 2015-11-20 00:39:47 +08:00
Max Lv 84da64fa21 Merge pull request #436 from Mygod/master
Fix rate display
2015-11-19 14:36:37 +08:00
Mygod 52cd6d1576 Merge branch 'master' of https://github.com/shadowsocks/shadowsocks-android 2015-11-19 14:34:02 +08:00
Mygod 81587b0551 Use AlertDialogs in support lib 2015-11-19 14:33:10 +08:00
Mygod 24c1497a6d Fix flashing 2015-11-19 13:49:31 +08:00
Max Lv bcbd409cd7 fix a weird UI issue when hiding progress circle 2015-11-19 13:13:05 +08:00
Mygod 5e1f5cd4a0 Merge fix #434 2015-11-19 12:57:30 +08:00
Mygod 9921823869 Fix units 2015-11-19 12:55:27 +08:00
Mygod 0d2663c942 Remove unnecessary resets 2015-11-19 12:46:45 +08:00
Max Lv c63d17350c fix #434 2015-11-19 12:34:24 +08:00
Max Lv f345c7d788 Merge pull request #433 from Mygod/master
Fix #432
2015-11-19 07:16:54 +08:00
Mygod 9adf11713f Hide stats for profiles that have no traffic 2015-11-18 23:23:36 +08:00
Mygod c4c1682983 Fix flashing 2015-11-18 23:15:36 +08:00
Mygod 79ade0ef7f Fix stat_summary 2015-11-18 23:06:52 +08:00
Mygod 509a4e79fc Add network traffic display in profile selector 2015-11-18 23:06:25 +08:00
Mygod f4401f8b93 Optimize DBHelper 2015-11-18 22:24:25 +08:00
Mygod a57d631ef2 Add some spaces 2015-11-18 22:16:21 +08:00
Mygod 3f8acd85ab Optimize timer code.
Apparently onStop will be executed when the screen goes off.
2015-11-18 22:12:31 +08:00
Mygod 14414c644d Copy feature settings from the current profile to the new profile.
And fix #432.
2015-11-18 21:40:33 +08:00
Mygod 95952f0fec Fix division by zero 2015-11-18 21:19:20 +08:00
Mygod eed2f47c83 Trim styles 2015-11-18 20:43:19 +08:00
Mygod 946c876327 Merge branch 'master' of https://github.com/shadowsocks/shadowsocks-android into HEAD 2015-11-18 20:31:22 +08:00
Max Lv 5ac7f2b9fb add missing style file 2015-11-18 20:29:54 +08:00
Max Lv 811ad74acb fix #430 2015-11-18 20:29:19 +08:00
Mygod fa4b88dc95 Update dependencies 2015-11-18 20:22:42 +08:00
Max Lv 07b9cfa7f1 refine the traffic stat 2015-11-18 14:53:56 +08:00
Max Lv e667a77b71 Merge pull request #429 from shadowsocks/traffic-stat
Add Traffic stat
2015-11-18 14:03:27 +08:00
Max Lv f0abbb7304 add TrafficMonitor to the main activity 2015-11-18 14:02:29 +08:00
Max Lv 92e72830bb Merge branch 'master' into traffic-stat 2015-11-18 12:40:45 +08:00
Max Lv e50a26f341 fix #388 2015-11-15 18:48:22 +08:00
Max Lv 6fb8db771a fix typo 2015-11-12 13:03:04 +08:00
Max Lv 6749afd263 add TrafficMonitor 2015-11-12 12:10:38 +08:00
Max Lv 4e4e0514d8 update redsocks 2015-11-11 13:39:55 +08:00
Max Lv 37cdf8f9a6 Merge pull request #422 from Mygod/master
Some fixes
2015-11-11 10:47:39 +08:00
Max Lv 24b8a5ab15 refine the pref order 2015-11-11 10:36:38 +08:00
Mygod 6f6cb461ed Fix ParserActivity 2015-11-10 21:02:42 +08:00
Mygod 42c5a01d3e Fix default configuration 2015-11-10 20:25:10 +08:00
Mygod 8045c961ea Fix NAT default value 2015-11-10 19:50:29 +08:00
Max Lv 83a6d88659 Merge pull request #420 from Mygod/master
Switch to another profile while connected
2015-11-10 19:23:52 +08:00