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
160c6e65
Commit
160c6e65
authored
Sep 27, 2016
by
topjohnwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Stupid fix...
parent
a173179b
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
6 deletions
+4
-6
LogFragment.java
app/src/main/java/com/topjohnwu/magisk/LogFragment.java
+2
-2
MainActivity.java
app/src/main/java/com/topjohnwu/magisk/MainActivity.java
+2
-2
Async.java
app/src/main/java/com/topjohnwu/magisk/utils/Async.java
+0
-2
No files found.
app/src/main/java/com/topjohnwu/magisk/LogFragment.java
View file @
160c6e65
...
@@ -40,7 +40,7 @@ import butterknife.ButterKnife;
...
@@ -40,7 +40,7 @@ import butterknife.ButterKnife;
public
class
LogFragment
extends
Fragment
{
public
class
LogFragment
extends
Fragment
{
private
static
final
String
MAGISK_LOG
=
"/cache/magisk.
dev
"
;
private
static
final
String
MAGISK_LOG
=
"/cache/magisk.
log
"
;
@BindView
(
R
.
id
.
txtLog
)
TextView
txtLog
;
@BindView
(
R
.
id
.
txtLog
)
TextView
txtLog
;
@BindView
(
R
.
id
.
svLog
)
ScrollView
svLog
;
@BindView
(
R
.
id
.
svLog
)
ScrollView
svLog
;
...
@@ -154,7 +154,7 @@ public class LogFragment extends Fragment {
...
@@ -154,7 +154,7 @@ public class LogFragment extends Fragment {
Calendar
now
=
Calendar
.
getInstance
();
Calendar
now
=
Calendar
.
getInstance
();
String
filename
=
String
.
format
(
String
filename
=
String
.
format
(
"magisk_%s_%04d%02d%02d_%02d%02d%02d.
dev
"
,
"error"
,
"magisk_%s_%04d%02d%02d_%02d%02d%02d.
log
"
,
"error"
,
now
.
get
(
Calendar
.
YEAR
),
now
.
get
(
Calendar
.
MONTH
)
+
1
,
now
.
get
(
Calendar
.
YEAR
),
now
.
get
(
Calendar
.
MONTH
)
+
1
,
now
.
get
(
Calendar
.
DAY_OF_MONTH
),
now
.
get
(
Calendar
.
HOUR_OF_DAY
),
now
.
get
(
Calendar
.
DAY_OF_MONTH
),
now
.
get
(
Calendar
.
HOUR_OF_DAY
),
now
.
get
(
Calendar
.
MINUTE
),
now
.
get
(
Calendar
.
SECOND
));
now
.
get
(
Calendar
.
MINUTE
),
now
.
get
(
Calendar
.
SECOND
));
...
...
app/src/main/java/com/topjohnwu/magisk/MainActivity.java
View file @
160c6e65
...
@@ -98,7 +98,7 @@ public class MainActivity extends AppCompatActivity implements NavigationView.On
...
@@ -98,7 +98,7 @@ public class MainActivity extends AppCompatActivity implements NavigationView.On
navigationView
.
setCheckedItem
(
R
.
id
.
downloads
);
navigationView
.
setCheckedItem
(
R
.
id
.
downloads
);
}
}
}
}
hm
=
getFragmentManager
().
findFragmentByTag
(
"
dev
"
);
hm
=
getFragmentManager
().
findFragmentByTag
(
"
log
"
);
if
(
hm
!=
null
)
{
if
(
hm
!=
null
)
{
if
(
hm
.
isVisible
())
{
if
(
hm
.
isVisible
())
{
navigationView
.
setCheckedItem
(
R
.
id
.
log
);
navigationView
.
setCheckedItem
(
R
.
id
.
log
);
...
@@ -227,7 +227,7 @@ public class MainActivity extends AppCompatActivity implements NavigationView.On
...
@@ -227,7 +227,7 @@ public class MainActivity extends AppCompatActivity implements NavigationView.On
break
;
break
;
case
R
.
id
.
log
:
case
R
.
id
.
log
:
setTitle
(
R
.
string
.
log
);
setTitle
(
R
.
string
.
log
);
tag
=
"
dev
"
;
tag
=
"
log
"
;
navFragment
=
new
LogFragment
();
navFragment
=
new
LogFragment
();
break
;
break
;
case
R
.
id
.
settings
:
case
R
.
id
.
settings
:
...
...
app/src/main/java/com/topjohnwu/magisk/utils/Async.java
View file @
160c6e65
...
@@ -254,8 +254,6 @@ public class Async {
...
@@ -254,8 +254,6 @@ public class Async {
e
.
printStackTrace
();
e
.
printStackTrace
();
return
false
;
return
false
;
}
}
Logger
.
dev
(
mName
+
"; "
+
mFile
.
getPath
());
// return false;
if
(
Shell
.
rootAccess
())
{
if
(
Shell
.
rootAccess
())
{
ret
=
Shell
.
su
(
ret
=
Shell
.
su
(
"unzip -o "
+
mFile
.
getPath
()
+
" META-INF/com/google/android/* -d "
+
mFile
.
getParent
(),
"unzip -o "
+
mFile
.
getPath
()
+
" META-INF/com/google/android/* -d "
+
mFile
.
getParent
(),
...
...
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