Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
C
com.ccwangluo.accelerator
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
sheteng
com.ccwangluo.accelerator
Commits
a9a6e1c1
Commit
a9a6e1c1
authored
Aug 16, 2016
by
Mygod
Committed by
Max Lv
Aug 16, 2016
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Track caught exceptions (#810)
parent
364d873e
Changes
8
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
45 additions
and
51 deletions
+45
-51
src/main/scala/com/github/shadowsocks/Shadowsocks.scala
src/main/scala/com/github/shadowsocks/Shadowsocks.scala
+5
-2
src/main/scala/com/github/shadowsocks/ShadowsocksApplication.scala
...scala/com/github/shadowsocks/ShadowsocksApplication.scala
+6
-10
src/main/scala/com/github/shadowsocks/ShadowsocksSettings.scala
...in/scala/com/github/shadowsocks/ShadowsocksSettings.scala
+1
-1
src/main/scala/com/github/shadowsocks/ShadowsocksVpnService.scala
.../scala/com/github/shadowsocks/ShadowsocksVpnService.scala
+5
-11
src/main/scala/com/github/shadowsocks/ShadowsocksVpnThread.scala
...n/scala/com/github/shadowsocks/ShadowsocksVpnThread.scala
+6
-6
src/main/scala/com/github/shadowsocks/database/ProfileManager.scala
...cala/com/github/shadowsocks/database/ProfileManager.scala
+6
-0
src/main/scala/com/github/shadowsocks/utils/TrafficMonitorThread.scala
...a/com/github/shadowsocks/utils/TrafficMonitorThread.scala
+5
-6
src/main/scala/com/github/shadowsocks/utils/Utils.scala
src/main/scala/com/github/shadowsocks/utils/Utils.scala
+11
-15
No files found.
src/main/scala/com/github/shadowsocks/Shadowsocks.scala
View file @
a9a6e1c1
...
...
@@ -78,6 +78,7 @@ object Typefaces {
}
catch
{
case
e
:
Exception
=>
Log
.
e
(
TAG
,
"Could not get typeface '"
+
assetPath
+
"' because "
+
e
.
getMessage
)
app
.
track
(
e
)
return
null
}
}
...
...
@@ -185,8 +186,8 @@ class Shadowsocks extends AppCompatActivity with ServiceBoundContext {
snackbar
.
show
}
if
(!
app
.
settings
.
getBoolean
(
app
.
getVersionName
,
false
))
{
app
.
editor
.
putBoolean
(
app
.
getVersionName
,
true
).
apply
()
if
(!
app
.
settings
.
getBoolean
(
BuildConfig
.
VERSION_NAME
,
false
))
{
app
.
editor
.
putBoolean
(
BuildConfig
.
VERSION_NAME
,
true
).
apply
()
recovery
()
...
...
@@ -246,6 +247,7 @@ class Shadowsocks extends AppCompatActivity with ServiceBoundContext {
}
catch
{
case
e
:
IOException
=>
Log
.
e
(
TAG
,
e
.
getMessage
)
app
.
track
(
e
)
}
if
(
files
!=
null
)
{
for
(
file
<-
files
)
{
...
...
@@ -267,6 +269,7 @@ class Shadowsocks extends AppCompatActivity with ServiceBoundContext {
}
catch
{
case
ex
:
Exception
=>
Log
.
e
(
TAG
,
ex
.
getMessage
)
app
.
track
(
ex
)
}
}
}
...
...
src/main/scala/com/github/shadowsocks/ShadowsocksApplication.scala
View file @
a9a6e1c1
...
...
@@ -43,12 +43,11 @@ import java.util
import
java.util.concurrent.TimeUnit
import
android.app.Application
import
android.content.pm.PackageManager
import
android.preference.PreferenceManager
import
android.support.v7.app.AppCompatDelegate
import
com.github.shadowsocks.database.
{
DBHelper
,
ProfileManager
}
import
com.github.shadowsocks.utils.
{
Key
,
Utils
}
import
com.google.android.gms.analytics.
{
GoogleAnalytics
,
HitBuilders
}
import
com.google.android.gms.analytics.
{
GoogleAnalytics
,
HitBuilders
,
StandardExceptionParser
}
import
com.google.android.gms.common.api.ResultCallback
import
com.google.android.gms.tagmanager.
{
ContainerHolder
,
TagManager
}
import
com.j256.ormlite.logger.LocalLog
...
...
@@ -70,17 +69,14 @@ class ShadowsocksApplication extends Application {
def
isNatEnabled
=
settings
.
getBoolean
(
Key
.
isNAT
,
false
)
def
isVpnEnabled
=
!
isNatEnabled
def
getVersionName
=
try
{
getPackageManager
.
getPackageInfo
(
getPackageName
,
0
).
versionName
}
catch
{
case
_:
PackageManager.NameNotFoundException
=>
"Package name not found"
case
_:
Throwable
=>
null
}
// send event
def
track
(
category
:
String
,
action
:
String
)
=
tracker
.
send
(
new
HitBuilders
.
EventBuilder
()
.
setAction
(
action
)
.
setLabel
(
getVersionName
)
.
setLabel
(
BuildConfig
.
VERSION_NAME
)
.
build
())
def
track
(
t
:
Throwable
)
=
tracker
.
send
(
new
HitBuilders
.
ExceptionBuilder
()
.
setDescription
(
new
StandardExceptionParser
(
this
,
null
).
getDescription
(
Thread
.
currentThread
.
getName
,
t
))
.
setFatal
(
false
)
.
build
())
def
profileId
=
settings
.
getInt
(
Key
.
id
,
-
1
)
...
...
src/main/scala/com/github/shadowsocks/ShadowsocksSettings.scala
View file @
a9a6e1c1
...
...
@@ -194,7 +194,7 @@ class ShadowsocksSettings extends PreferenceFragment with OnSharedPreferenceChan
})
new
AlertDialog
.
Builder
(
activity
)
.
setTitle
(
getString
(
R
.
string
.
about_title
).
formatLocal
(
Locale
.
ENGLISH
,
app
.
getVersionName
))
.
setTitle
(
getString
(
R
.
string
.
about_title
).
formatLocal
(
Locale
.
ENGLISH
,
BuildConfig
.
VERSION_NAME
))
.
setNegativeButton
(
getString
(
android
.
R
.
string
.
ok
),
null
)
.
setView
(
web
)
.
create
()
...
...
src/main/scala/com/github/shadowsocks/ShadowsocksVpnService.scala
View file @
a9a6e1c1
...
...
@@ -48,9 +48,9 @@ import android.content.pm.PackageManager.NameNotFoundException
import
android.net.VpnService
import
android.os._
import
android.util.Log
import
com.github.shadowsocks.utils._
import
com.github.shadowsocks.ShadowsocksApplication.app
import
com.github.shadowsocks.database.Profile
import
com.github.shadowsocks.utils._
import
scala.collection.mutable.ArrayBuffer
...
...
@@ -368,7 +368,7 @@ class ShadowsocksVpnService extends VpnService with BaseService {
}
}
catch
{
case
ex
:
NameNotFoundException
=>
Log
.
e
(
TAG
,
"Invalid package name"
,
ex
)
;
Log
.
e
(
TAG
,
"Invalid package name"
,
ex
)
}
}
}
...
...
@@ -390,17 +390,11 @@ class ShadowsocksVpnService extends VpnService with BaseService {
conn
=
builder
.
establish
()
if
(
conn
==
null
)
changeState
(
State
.
STOPPED
,
getString
(
R
.
string
.
reboot_required
))
}
catch
{
case
ex
:
IllegalStateException
=>
changeState
(
State
.
STOPPED
,
ex
.
getMessage
)
conn
=
null
case
ex
:
Exception
=>
ex
.
printStackTrace
()
conn
=
null
}
if
(
conn
==
null
)
{
stopRunner
(
true
)
return
-
1
app
.
track
(
ex
)
stopRunner
(
true
,
ex
.
getMessage
)
return
-
1
}
val
fd
=
conn
.
getFd
...
...
src/main/scala/com/github/shadowsocks/ShadowsocksVpnThread.scala
View file @
a9a6e1c1
...
...
@@ -44,6 +44,7 @@ import java.util.concurrent.Executors
import
android.net.
{
LocalServerSocket
,
LocalSocket
,
LocalSocketAddress
}
import
android.util.Log
import
com.github.shadowsocks.ShadowsocksApplication.app
object
ShadowsocksVpnThread
{
val
getInt
=
classOf
[
FileDescriptor
].
getDeclaredMethod
(
"getInt$"
)
...
...
@@ -56,7 +57,7 @@ class ShadowsocksVpnThread(vpnService: ShadowsocksVpnService) extends Thread {
lazy
val
PATH
=
vpnService
.
getApplicationInfo
.
dataDir
+
"/protect_path"
@volatile
var
isRunning
:
Boolean
=
true
@volatile
var
serverSocket
:
LocalServerSocket
=
null
@volatile
var
serverSocket
:
LocalServerSocket
=
_
def
closeServerSocket
()
{
if
(
serverSocket
!=
null
)
{
...
...
@@ -76,11 +77,7 @@ class ShadowsocksVpnThread(vpnService: ShadowsocksVpnService) extends Thread {
override
def
run
()
{
try
{
new
File
(
PATH
).
delete
()
}
catch
{
case
_:
Exception
=>
// ignore
}
new
File
(
PATH
).
delete
()
try
{
val
localSocket
=
new
LocalSocket
...
...
@@ -89,6 +86,7 @@ class ShadowsocksVpnThread(vpnService: ShadowsocksVpnService) extends Thread {
}
catch
{
case
e
:
IOException
=>
Log
.
e
(
TAG
,
"unable to bind"
,
e
)
app
.
track
(
e
)
return
}
...
...
@@ -127,6 +125,7 @@ class ShadowsocksVpnThread(vpnService: ShadowsocksVpnService) extends Thread {
}
catch
{
case
e
:
Exception
=>
Log
.
e
(
TAG
,
"Error when protect socket"
,
e
)
app
.
track
(
e
)
}
// close socket
...
...
@@ -140,6 +139,7 @@ class ShadowsocksVpnThread(vpnService: ShadowsocksVpnService) extends Thread {
}
catch
{
case
e
:
IOException
=>
Log
.
e
(
TAG
,
"Error when accept socket"
,
e
)
app
.
track
(
e
)
return
}
}
...
...
src/main/scala/com/github/shadowsocks/database/ProfileManager.scala
View file @
a9a6e1c1
...
...
@@ -76,6 +76,7 @@ class ProfileManager(dbHelper: DBHelper) {
}
catch
{
case
ex
:
Exception
=>
Log
.
e
(
TAG
,
"addProfile"
,
ex
)
app
.
track
(
ex
)
p
}
}
...
...
@@ -87,6 +88,7 @@ class ProfileManager(dbHelper: DBHelper) {
}
catch
{
case
ex
:
Exception
=>
Log
.
e
(
TAG
,
"updateProfile"
,
ex
)
app
.
track
(
ex
)
false
}
}
...
...
@@ -100,6 +102,7 @@ class ProfileManager(dbHelper: DBHelper) {
}
catch
{
case
ex
:
Exception
=>
Log
.
e
(
TAG
,
"getProfile"
,
ex
)
app
.
track
(
ex
)
None
}
}
...
...
@@ -111,6 +114,7 @@ class ProfileManager(dbHelper: DBHelper) {
}
catch
{
case
ex
:
Exception
=>
Log
.
e
(
TAG
,
"delProfile"
,
ex
)
app
.
track
(
ex
)
false
}
}
...
...
@@ -122,6 +126,7 @@ class ProfileManager(dbHelper: DBHelper) {
}
catch
{
case
ex
:
Exception
=>
Log
.
e
(
TAG
,
"getAllProfiles"
,
ex
)
app
.
track
(
ex
)
None
}
}
...
...
@@ -133,6 +138,7 @@ class ProfileManager(dbHelper: DBHelper) {
}
catch
{
case
ex
:
Exception
=>
Log
.
e
(
TAG
,
"getAllProfiles"
,
ex
)
app
.
track
(
ex
)
None
}
}
...
...
src/main/scala/com/github/shadowsocks/utils/TrafficMonitorThread.scala
View file @
a9a6e1c1
...
...
@@ -46,13 +46,14 @@ import java.util.concurrent.Executors
import
android.content.Context
import
android.net.
{
LocalServerSocket
,
LocalSocket
,
LocalSocketAddress
}
import
android.util.Log
import
com.github.shadowsocks.ShadowsocksApplication.app
class
TrafficMonitorThread
(
context
:
Context
)
extends
Thread
{
val
TAG
=
"TrafficMonitorThread"
lazy
val
PATH
=
context
.
getApplicationInfo
.
dataDir
+
"/stat_path"
@volatile
var
serverSocket
:
LocalServerSocket
=
null
@volatile
var
serverSocket
:
LocalServerSocket
=
_
@volatile
var
isRunning
:
Boolean
=
true
def
closeServerSocket
()
{
...
...
@@ -73,11 +74,7 @@ class TrafficMonitorThread(context: Context) extends Thread {
override
def
run
()
{
try
{
new
File
(
PATH
).
delete
()
}
catch
{
case
_:
Exception
=>
// ignore
}
new
File
(
PATH
).
delete
()
try
{
val
localSocket
=
new
LocalSocket
...
...
@@ -113,6 +110,7 @@ class TrafficMonitorThread(context: Context) extends Thread {
}
catch
{
case
e
:
Exception
=>
Log
.
e
(
TAG
,
"Error when recv traffic stat"
,
e
)
app
.
track
(
e
)
}
// close socket
...
...
@@ -126,6 +124,7 @@ class TrafficMonitorThread(context: Context) extends Thread {
}
catch
{
case
e
:
IOException
=>
Log
.
e
(
TAG
,
"Error when accept socket"
,
e
)
app
.
track
(
e
)
return
}
}
...
...
src/main/scala/com/github/shadowsocks/utils/Utils.scala
View file @
a9a6e1c1
...
...
@@ -57,6 +57,7 @@ import com.github.shadowsocks.{BuildConfig, ShadowsocksRunnerService}
import
eu.chainfire.libsuperuser.Shell
import
org.xbill.DNS._
import
scala.collection.JavaConversions._
import
scala.concurrent.ExecutionContext.Implicits.global
import
scala.concurrent.Future
import
scala.util.
{
Failure
,
Try
}
...
...
@@ -200,29 +201,22 @@ object Utils {
*/
def
isIPv6Support
:
Boolean
=
{
try
{
val
interfaces
=
NetworkInterface
.
getNetworkInterfaces
while
(
interfaces
.
hasMoreElements
)
{
val
intf
=
interfaces
.
nextElement
()
val
addrs
=
intf
.
getInetAddresses
while
(
addrs
.
hasMoreElements
)
{
val
addr
=
addrs
.
nextElement
()
if
(!
addr
.
isLoopbackAddress
&&
!
addr
.
isLinkLocalAddress
)
{
if
(
addr
.
isInstanceOf
[
Inet6Address
])
{
if
(
BuildConfig
.
DEBUG
)
Log
.
d
(
TAG
,
"IPv6 address detected"
)
return
true
}
for
(
intf
<-
enumerationAsScalaIterator
(
NetworkInterface
.
getNetworkInterfaces
))
for
(
addr
<-
enumerationAsScalaIterator
(
intf
.
getInetAddresses
))
if
(
addr
.
isInstanceOf
[
Inet6Address
]
&&
!
addr
.
isLoopbackAddress
&&
!
addr
.
isLinkLocalAddress
)
{
if
(
BuildConfig
.
DEBUG
)
Log
.
d
(
TAG
,
"IPv6 address detected"
)
return
true
}
}
}
}
catch
{
case
ex
:
Exception
=>
Log
.
e
(
TAG
,
"Failed to get interfaces' addresses."
,
ex
)
app
.
track
(
ex
)
}
false
}
def
startSsService
(
context
:
Context
)
{
val
isInstalled
:
Boolean
=
app
.
settings
.
getBoolean
(
app
.
getVersionName
,
false
)
val
isInstalled
:
Boolean
=
app
.
settings
.
getBoolean
(
BuildConfig
.
VERSION_NAME
,
false
)
if
(!
isInstalled
)
return
val
intent
=
new
Intent
(
context
,
classOf
[
ShadowsocksRunnerService
])
...
...
@@ -235,7 +229,9 @@ object Utils {
}
private
val
handleFailure
:
Try
[
_
]
=>
Unit
=
{
case
Failure
(
e
)
=>
e
.
printStackTrace
()
case
Failure
(
e
)
=>
e
.
printStackTrace
()
app
.
track
(
e
)
case
_
=>
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment