Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
M
Magisk
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Administrator
Magisk
Commits
67c139a0
Commit
67c139a0
authored
May 23, 2017
by
topjohnwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix theme changing glitch
parent
31cc0082
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
28 additions
and
36 deletions
+28
-36
MagiskFragment.java
app/src/main/java/com/topjohnwu/magisk/MagiskFragment.java
+28
-24
MainActivity.java
app/src/main/java/com/topjohnwu/magisk/MainActivity.java
+0
-12
No files found.
app/src/main/java/com/topjohnwu/magisk/MagiskFragment.java
View file @
67c139a0
...
@@ -47,7 +47,8 @@ import butterknife.ButterKnife;
...
@@ -47,7 +47,8 @@ import butterknife.ButterKnife;
import
butterknife.OnClick
;
import
butterknife.OnClick
;
import
butterknife.Unbinder
;
import
butterknife.Unbinder
;
public
class
MagiskFragment
extends
Fragment
implements
CallbackEvent
.
Listener
<
Void
>
{
public
class
MagiskFragment
extends
Fragment
implements
CallbackEvent
.
Listener
<
Void
>,
SwipeRefreshLayout
.
OnRefreshListener
{
private
static
boolean
noDialog
=
false
;
private
static
boolean
noDialog
=
false
;
private
static
int
expandHeight
=
0
;
private
static
int
expandHeight
=
0
;
...
@@ -226,7 +227,26 @@ public class MagiskFragment extends Fragment implements CallbackEvent.Listener<V
...
@@ -226,7 +227,26 @@ public class MagiskFragment extends Fragment implements CallbackEvent.Listener<V
});
});
mSwipeRefreshLayout
.
setOnRefreshListener
(()
->
{
mSwipeRefreshLayout
.
setOnRefreshListener
(
this
);
if
(
magiskManager
.
magiskVersionCode
<
0
&&
Shell
.
rootAccess
()
&&
!
noDialog
)
{
noDialog
=
true
;
new
AlertDialogBuilder
(
getActivity
())
.
setTitle
(
R
.
string
.
no_magisk_title
)
.
setMessage
(
R
.
string
.
no_magisk_msg
)
.
setCancelable
(
true
)
.
setPositiveButton
(
R
.
string
.
goto_install
,
(
d
,
i
)
->
{})
.
setNegativeButton
(
R
.
string
.
no_thanks
,
null
)
.
show
();
}
updateUI
();
return
v
;
}
@Override
public
void
onRefresh
()
{
updateUI
();
updateUI
();
magiskUpdateText
.
setText
(
R
.
string
.
checking_for_updates
);
magiskUpdateText
.
setText
(
R
.
string
.
checking_for_updates
);
...
@@ -248,22 +268,6 @@ public class MagiskFragment extends Fragment implements CallbackEvent.Listener<V
...
@@ -248,22 +268,6 @@ public class MagiskFragment extends Fragment implements CallbackEvent.Listener<V
}
else
{
}
else
{
mSwipeRefreshLayout
.
setRefreshing
(
false
);
mSwipeRefreshLayout
.
setRefreshing
(
false
);
}
}
});
if
(
magiskManager
.
magiskVersionCode
<
0
&&
Shell
.
rootAccess
()
&&
!
noDialog
)
{
noDialog
=
true
;
new
AlertDialogBuilder
(
getActivity
())
.
setTitle
(
R
.
string
.
no_magisk_title
)
.
setMessage
(
R
.
string
.
no_magisk_msg
)
.
setCancelable
(
true
)
.
setPositiveButton
(
R
.
string
.
goto_install
,
(
d
,
i
)
->
{})
.
setNegativeButton
(
R
.
string
.
no_thanks
,
null
)
.
show
();
}
updateUI
();
return
v
;
}
}
@Override
@Override
...
...
app/src/main/java/com/topjohnwu/magisk/MainActivity.java
View file @
67c139a0
...
@@ -91,18 +91,6 @@ public class MainActivity extends Activity
...
@@ -91,18 +91,6 @@ public class MainActivity extends Activity
checkHideSection
();
checkHideSection
();
}
}
@Override
protected
void
onRestoreInstanceState
(
Bundle
savedInstanceState
)
{
super
.
onRestoreInstanceState
(
savedInstanceState
);
navigate
(
savedInstanceState
.
getInt
(
MagiskManager
.
INTENT_SECTION
,
R
.
id
.
magisk
));
}
@Override
protected
void
onSaveInstanceState
(
Bundle
outState
)
{
super
.
onSaveInstanceState
(
outState
);
outState
.
putInt
(
MagiskManager
.
INTENT_SECTION
,
mDrawerItem
);
}
@Override
@Override
protected
void
onDestroy
()
{
protected
void
onDestroy
()
{
getApplicationContext
().
reloadMainActivity
.
unRegister
(
this
);
getApplicationContext
().
reloadMainActivity
.
unRegister
(
this
);
...
...
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