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
e4df3789
Commit
e4df3789
authored
Dec 24, 2016
by
Mygod
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix back press crash
parent
25b6a307
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
3 deletions
+7
-3
src/main/scala/com/github/shadowsocks/MainActivity.scala
src/main/scala/com/github/shadowsocks/MainActivity.scala
+7
-3
No files found.
src/main/scala/com/github/shadowsocks/MainActivity.scala
View file @
e4df3789
...
...
@@ -73,6 +73,7 @@ class MainActivity extends Activity with ServiceBoundContext with Drawer.OnDrawe
var
currentProfile
=
new
Profile
var
drawer
:
Drawer
=
_
private
var
currentFragment
:
ToolbarFragment
=
_
private
lazy
val
profilesFragment
=
new
ProfilesFragment
()
private
lazy
val
globalSettingsFragment
=
new
GlobalSettingsFragment
()
...
...
@@ -341,9 +342,8 @@ class MainActivity extends Activity with ServiceBoundContext with Drawer.OnDrawe
}
private
def
displayFragment
(
fragment
:
ToolbarFragment
)
{
val
transaction
=
getFragmentManager
.
beginTransaction
().
replace
(
R
.
id
.
content
,
fragment
)
if
(
fragment
!=
profilesFragment
)
transaction
.
addToBackStack
(
null
)
transaction
.
commitAllowingStateLoss
()
currentFragment
=
fragment
getFragmentManager
.
beginTransaction
().
replace
(
R
.
id
.
content
,
fragment
).
commitAllowingStateLoss
()
drawer
.
closeDrawer
()
}
...
...
@@ -426,6 +426,10 @@ class MainActivity extends Activity with ServiceBoundContext with Drawer.OnDrawe
super
.
onStart
()
registerCallback
()
}
override
def
onBackPressed
()
:
Unit
=
if
(
currentFragment
!=
profilesFragment
)
displayFragment
(
profilesFragment
)
else
super
.
onBackPressed
()
override
def
onStop
()
{
super
.
onStop
()
unregisterCallback
()
...
...
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