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
3dba9663
Commit
3dba9663
authored
Dec 01, 2014
by
Max Lv
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix two potential FCs
parent
c9a7dc8d
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
25 additions
and
21 deletions
+25
-21
src/main/scala/com/github/shadowsocks/AppManager.scala
src/main/scala/com/github/shadowsocks/AppManager.scala
+8
-8
src/main/scala/com/github/shadowsocks/utils/Utils.scala
src/main/scala/com/github/shadowsocks/utils/Utils.scala
+17
-13
No files found.
src/main/scala/com/github/shadowsocks/AppManager.scala
View file @
3dba9663
...
@@ -61,6 +61,7 @@ import com.nostra13.universalimageloader.core.{DisplayImageOptions, ImageLoader,
...
@@ -61,6 +61,7 @@ import com.nostra13.universalimageloader.core.{DisplayImageOptions, ImageLoader,
import
com.nostra13.universalimageloader.core.display.FadeInBitmapDisplayer
import
com.nostra13.universalimageloader.core.display.FadeInBitmapDisplayer
import
com.github.shadowsocks.utils.
{
Utils
,
Scheme
,
Key
}
import
com.github.shadowsocks.utils.
{
Utils
,
Scheme
,
Key
}
import
scala.concurrent.ops._
import
scala.language.implicitConversions
import
scala.language.implicitConversions
case
class
ProxiedApp
(
uid
:
Int
,
name
:
String
,
packageName
:
String
,
var
proxied
:
Boolean
)
case
class
ProxiedApp
(
uid
:
Int
,
name
:
String
,
packageName
:
String
,
var
proxied
:
Boolean
)
...
@@ -245,18 +246,17 @@ class AppManager extends Activity with OnCheckedChangeListener with OnClickListe
...
@@ -245,18 +246,17 @@ class AppManager extends Activity with OnCheckedChangeListener with OnClickListe
}
}
})
})
bypassSwitch
.
setChecked
(
prefs
.
getBoolean
(
Key
.
isBypassApps
,
false
))
bypassSwitch
.
setChecked
(
prefs
.
getBoolean
(
Key
.
isBypassApps
,
false
))
appListView
=
findViewById
(
R
.
id
.
applistview
).
asInstanceOf
[
ListView
]
}
}
protected
override
def
onResume
()
{
protected
override
def
onResume
()
{
super
.
onResume
()
super
.
onResume
()
new
Thread
{
spawn
{
override
def
run
()
{
handler
.
post
(
loadStartRunnable
)
handler
.
post
(
loadStartRunnable
)
appListView
=
findViewById
(
R
.
id
.
applistview
).
asInstanceOf
[
ListView
]
if
(!
appsLoaded
)
loadApps
()
if
(!
appsLoaded
)
loadApps
()
handler
.
post
(
loadFinishRunnable
)
handler
.
post
(
loadFinishRunnable
)
}
}
}.
start
()
}
}
def
saveAppSettings
(
context
:
Context
)
{
def
saveAppSettings
(
context
:
Context
)
{
...
...
src/main/scala/com/github/shadowsocks/utils/Utils.scala
View file @
3dba9663
...
@@ -181,6 +181,7 @@ object Utils {
...
@@ -181,6 +181,7 @@ object Utils {
}
}
def
resolve
(
host
:
String
,
addrType
:
Int
)
:
Option
[
String
]
=
{
def
resolve
(
host
:
String
,
addrType
:
Int
)
:
Option
[
String
]
=
{
try
{
val
lookup
=
new
Lookup
(
host
,
addrType
)
val
lookup
=
new
Lookup
(
host
,
addrType
)
val
resolver
=
new
SimpleResolver
(
"114.114.114.114"
)
val
resolver
=
new
SimpleResolver
(
"114.114.114.114"
)
resolver
.
setTimeout
(
5
)
resolver
.
setTimeout
(
5
)
...
@@ -196,6 +197,9 @@ object Utils {
...
@@ -196,6 +197,9 @@ object Utils {
return
Some
(
r
.
asInstanceOf
[
AAAARecord
].
getAddress
.
getHostAddress
)
return
Some
(
r
.
asInstanceOf
[
AAAARecord
].
getAddress
.
getHostAddress
)
}
}
}
}
}
catch
{
case
e
:
Exception
=>
None
}
None
None
}
}
...
...
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