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
b126c623
Commit
b126c623
authored
Sep 14, 2016
by
Mygod
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix a crash in AppManager
parent
bbaf1779
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
3 deletions
+4
-3
src/main/scala/com/github/shadowsocks/AppManager.scala
src/main/scala/com/github/shadowsocks/AppManager.scala
+4
-3
No files found.
src/main/scala/com/github/shadowsocks/AppManager.scala
View file @
b126c623
...
...
@@ -46,14 +46,13 @@ import android.content._
import
android.content.pm.PackageManager
import
android.graphics.drawable.Drawable
import
android.os.
{
Bundle
,
Handler
}
import
android.preference.PreferenceManager
import
android.support.v7.app.AppCompatActivity
import
android.support.v7.widget.Toolbar.OnMenuItemClickListener
import
android.support.v7.widget.
{
DefaultItemAnimator
,
LinearLayoutManager
,
RecyclerView
,
Toolbar
}
import
android.view._
import
android.widget._
import
com.github.shadowsocks.utils.
{
Key
,
Utils
}
import
com.github.shadowsocks.ShadowsocksApplication.app
import
com.github.shadowsocks.utils.
{
Key
,
Utils
}
import
scala.collection.JavaConversions._
import
scala.collection.mutable
...
...
@@ -143,7 +142,7 @@ class AppManager extends AppCompatActivity with OnMenuItemClickListener {
private
var
loadingView
:
View
=
_
private
val
appsLoading
=
new
AtomicBoolean
private
var
handler
:
Handler
=
_
private
val
profile
=
app
.
currentProfile
.
get
private
val
profile
=
app
.
currentProfile
.
orNull
private
def
initProxiedApps
(
str
:
String
=
profile
.
individual
)
=
proxiedApps
=
str
.
split
(
'\n'
).
to
[
mutable.HashSet
]
...
...
@@ -213,6 +212,8 @@ class AppManager extends AppCompatActivity with OnMenuItemClickListener {
protected
override
def
onCreate
(
savedInstanceState
:
Bundle
)
{
super
.
onCreate
(
savedInstanceState
)
if
(
profile
==
null
)
finish
()
handler
=
new
Handler
()
this
.
setContentView
(
R
.
layout
.
layout_apps
)
...
...
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