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
b570cb5b
Commit
b570cb5b
authored
Nov 17, 2017
by
topjohnwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Extract external path
parent
97bf3884
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
12 additions
and
14 deletions
+12
-14
MagiskLogFragment.java
...src/main/java/com/topjohnwu/magisk/MagiskLogFragment.java
+4
-5
HideManager.java
...rc/main/java/com/topjohnwu/magisk/asyncs/HideManager.java
+1
-2
InstallMagisk.java
.../main/java/com/topjohnwu/magisk/asyncs/InstallMagisk.java
+1
-2
ProcessRepoZip.java
...main/java/com/topjohnwu/magisk/asyncs/ProcessRepoZip.java
+1
-2
PackageReceiver.java
.../java/com/topjohnwu/magisk/receivers/PackageReceiver.java
+0
-1
Const.java
app/src/main/java/com/topjohnwu/magisk/utils/Const.java
+4
-0
Utils.java
app/src/main/java/com/topjohnwu/magisk/utils/Utils.java
+1
-2
No files found.
app/src/main/java/com/topjohnwu/magisk/MagiskLogFragment.java
View file @
b570cb5b
...
@@ -3,7 +3,6 @@ package com.topjohnwu.magisk;
...
@@ -3,7 +3,6 @@ package com.topjohnwu.magisk;
import
android.Manifest
;
import
android.Manifest
;
import
android.annotation.SuppressLint
;
import
android.annotation.SuppressLint
;
import
android.os.Bundle
;
import
android.os.Bundle
;
import
android.os.Environment
;
import
android.support.annotation.Nullable
;
import
android.support.annotation.Nullable
;
import
android.support.design.widget.Snackbar
;
import
android.support.design.widget.Snackbar
;
import
android.text.TextUtils
;
import
android.text.TextUtils
;
...
@@ -30,6 +29,7 @@ import java.io.File;
...
@@ -30,6 +29,7 @@ import java.io.File;
import
java.io.FileWriter
;
import
java.io.FileWriter
;
import
java.io.IOException
;
import
java.io.IOException
;
import
java.util.Calendar
;
import
java.util.Calendar
;
import
java.util.Locale
;
import
butterknife.BindView
;
import
butterknife.BindView
;
import
butterknife.ButterKnife
;
import
butterknife.ButterKnife
;
...
@@ -109,7 +109,6 @@ public class MagiskLogFragment extends Fragment {
...
@@ -109,7 +109,6 @@ public class MagiskLogFragment extends Fragment {
super
(
MagiskLogFragment
.
this
.
getActivity
());
super
(
MagiskLogFragment
.
this
.
getActivity
());
}
}
@SuppressLint
(
"DefaultLocale"
)
@Override
@Override
protected
Object
doInBackground
(
Object
...
params
)
{
protected
Object
doInBackground
(
Object
...
params
)
{
mode
=
(
int
)
params
[
0
];
mode
=
(
int
)
params
[
0
];
...
@@ -126,13 +125,13 @@ public class MagiskLogFragment extends Fragment {
...
@@ -126,13 +125,13 @@ public class MagiskLogFragment extends Fragment {
case
2
:
case
2
:
Calendar
now
=
Calendar
.
getInstance
();
Calendar
now
=
Calendar
.
getInstance
();
String
filename
=
String
.
format
(
String
filename
=
String
.
format
(
Locale
.
US
,
"magisk_
%s_%04d%02d%02d_%02d%02d%02d.log"
,
"error
"
,
"magisk_
log_%04d%02d%02d_%02d:%02d:%02d.log
"
,
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
));
targetFile
=
new
File
(
Environment
.
getExternalStorageDirectory
()
+
"/MagiskManager/"
+
filename
);
targetFile
=
new
File
(
Const
.
EXTERNAL_PATH
+
"/logs"
,
filename
);
if
((!
targetFile
.
getParentFile
().
exists
()
&&
!
targetFile
.
getParentFile
().
mkdirs
())
if
((!
targetFile
.
getParentFile
().
exists
()
&&
!
targetFile
.
getParentFile
().
mkdirs
())
||
(
targetFile
.
exists
()
&&
!
targetFile
.
delete
()))
{
||
(
targetFile
.
exists
()
&&
!
targetFile
.
delete
()))
{
...
...
app/src/main/java/com/topjohnwu/magisk/asyncs/HideManager.java
View file @
b570cb5b
package
com
.
topjohnwu
.
magisk
.
asyncs
;
package
com
.
topjohnwu
.
magisk
.
asyncs
;
import
android.os.Environment
;
import
android.widget.Toast
;
import
android.widget.Toast
;
import
com.topjohnwu.crypto.JarMap
;
import
com.topjohnwu.crypto.JarMap
;
...
@@ -97,7 +96,7 @@ public class HideManager extends ParallelTask<Void, Void, Boolean> {
...
@@ -97,7 +96,7 @@ public class HideManager extends ParallelTask<Void, Void, Boolean> {
MagiskManager
mm
=
MagiskManager
.
get
();
MagiskManager
mm
=
MagiskManager
.
get
();
// Generate a new unhide app with random package name
// Generate a new unhide app with random package name
File
repack
=
new
File
(
Environment
.
getExternalStorageDirectory
()
+
"/MagiskManager"
,
"repack.apk"
);
File
repack
=
new
File
(
Const
.
EXTERNAL_PATH
,
"repack.apk"
);
repack
.
getParentFile
().
mkdirs
();
repack
.
getParentFile
().
mkdirs
();
String
pkg
=
genPackageName
(
"com."
,
Const
.
ORIG_PKG_NAME
.
length
());
String
pkg
=
genPackageName
(
"com."
,
Const
.
ORIG_PKG_NAME
.
length
());
...
...
app/src/main/java/com/topjohnwu/magisk/asyncs/InstallMagisk.java
View file @
b570cb5b
...
@@ -4,7 +4,6 @@ import android.app.Activity;
...
@@ -4,7 +4,6 @@ import android.app.Activity;
import
android.content.res.AssetManager
;
import
android.content.res.AssetManager
;
import
android.net.Uri
;
import
android.net.Uri
;
import
android.os.Build
;
import
android.os.Build
;
import
android.os.Environment
;
import
android.text.TextUtils
;
import
android.text.TextUtils
;
import
com.topjohnwu.crypto.SignBoot
;
import
com.topjohnwu.crypto.SignBoot
;
...
@@ -203,7 +202,7 @@ public class InstallMagisk extends ParallelTask<Void, Void, Boolean> {
...
@@ -203,7 +202,7 @@ public class InstallMagisk extends ParallelTask<Void, Void, Boolean> {
switch
(
mode
)
{
switch
(
mode
)
{
case
PATCH_MODE:
case
PATCH_MODE:
File
dest
=
new
File
(
Environment
.
getExternalStorageDirectory
()
+
"/MagiskManager/patched_boot"
+
mm
.
bootFormat
);
File
dest
=
new
File
(
Const
.
EXTERNAL_PATH
,
patched_boot
+
mm
.
bootFormat
);
dest
.
getParentFile
().
mkdirs
();
dest
.
getParentFile
().
mkdirs
();
switch
(
mm
.
bootFormat
)
{
switch
(
mm
.
bootFormat
)
{
case
".img"
:
case
".img"
:
...
...
app/src/main/java/com/topjohnwu/magisk/asyncs/ProcessRepoZip.java
View file @
b570cb5b
...
@@ -5,7 +5,6 @@ import android.app.Activity;
...
@@ -5,7 +5,6 @@ import android.app.Activity;
import
android.app.ProgressDialog
;
import
android.app.ProgressDialog
;
import
android.content.Intent
;
import
android.content.Intent
;
import
android.net.Uri
;
import
android.net.Uri
;
import
android.os.Environment
;
import
android.os.Handler
;
import
android.os.Handler
;
import
android.support.annotation.NonNull
;
import
android.support.annotation.NonNull
;
import
android.widget.Toast
;
import
android.widget.Toast
;
...
@@ -45,7 +44,7 @@ public class ProcessRepoZip extends ParallelTask<Void, Object, Boolean> {
...
@@ -45,7 +44,7 @@ public class ProcessRepoZip extends ParallelTask<Void, Object, Boolean> {
public
ProcessRepoZip
(
Activity
context
,
String
link
,
String
filename
,
boolean
install
)
{
public
ProcessRepoZip
(
Activity
context
,
String
link
,
String
filename
,
boolean
install
)
{
super
(
context
);
super
(
context
);
mLink
=
link
;
mLink
=
link
;
mFile
=
new
File
(
Environment
.
getExternalStorageDirectory
()
+
"/MagiskManager"
,
filename
);
mFile
=
new
File
(
Const
.
EXTERNAL_PATH
,
filename
);
mInstall
=
install
;
mInstall
=
install
;
mHandler
=
new
Handler
();
mHandler
=
new
Handler
();
}
}
...
...
app/src/main/java/com/topjohnwu/magisk/receivers/PackageReceiver.java
View file @
b570cb5b
...
@@ -5,7 +5,6 @@ import android.content.Context;
...
@@ -5,7 +5,6 @@ import android.content.Context;
import
android.content.Intent
;
import
android.content.Intent
;
import
com.topjohnwu.magisk.MagiskManager
;
import
com.topjohnwu.magisk.MagiskManager
;
import
com.topjohnwu.magisk.container.Policy
;
import
com.topjohnwu.magisk.utils.Shell
;
import
com.topjohnwu.magisk.utils.Shell
;
import
com.topjohnwu.magisk.utils.Utils
;
import
com.topjohnwu.magisk.utils.Utils
;
...
...
app/src/main/java/com/topjohnwu/magisk/utils/Const.java
View file @
b570cb5b
package
com
.
topjohnwu
.
magisk
.
utils
;
package
com
.
topjohnwu
.
magisk
.
utils
;
import
android.os.Environment
;
import
java.io.File
;
import
java.util.Arrays
;
import
java.util.Arrays
;
import
java.util.List
;
import
java.util.List
;
...
@@ -22,6 +25,7 @@ public class Const {
...
@@ -22,6 +25,7 @@ public class Const {
public
static
final
String
TMP_FOLDER_PATH
=
"/dev/tmp"
;
public
static
final
String
TMP_FOLDER_PATH
=
"/dev/tmp"
;
public
static
final
String
MAGISK_LOG
=
"/cache/magisk.log"
;
public
static
final
String
MAGISK_LOG
=
"/cache/magisk.log"
;
public
static
final
String
BUSYBOXPATH
=
"/dev/magisk/bin"
;
public
static
final
String
BUSYBOXPATH
=
"/dev/magisk/bin"
;
public
static
final
File
EXTERNAL_PATH
=
new
File
(
Environment
.
getExternalStorageDirectory
(),
"MagiskManager"
);
public
static
String
MAGISK_PATH
()
{
public
static
String
MAGISK_PATH
()
{
if
(
Utils
.
itemExist
(
"/dev/magisk/img"
))
{
if
(
Utils
.
itemExist
(
"/dev/magisk/img"
))
{
...
...
app/src/main/java/com/topjohnwu/magisk/utils/Utils.java
View file @
b570cb5b
...
@@ -14,7 +14,6 @@ import android.database.Cursor;
...
@@ -14,7 +14,6 @@ import android.database.Cursor;
import
android.net.ConnectivityManager
;
import
android.net.ConnectivityManager
;
import
android.net.NetworkInfo
;
import
android.net.NetworkInfo
;
import
android.net.Uri
;
import
android.net.Uri
;
import
android.os.Environment
;
import
android.provider.OpenableColumns
;
import
android.provider.OpenableColumns
;
import
android.support.annotation.StringRes
;
import
android.support.annotation.StringRes
;
import
android.support.design.widget.Snackbar
;
import
android.support.design.widget.Snackbar
;
...
@@ -70,7 +69,7 @@ public class Utils {
...
@@ -70,7 +69,7 @@ public class Utils {
return
;
return
;
runWithPermission
(
context
,
Manifest
.
permission
.
WRITE_EXTERNAL_STORAGE
,
()
->
{
runWithPermission
(
context
,
Manifest
.
permission
.
WRITE_EXTERNAL_STORAGE
,
()
->
{
File
file
=
new
File
(
Environment
.
getExternalStorageDirectory
()
+
"/MagiskManager/"
+
filename
);
File
file
=
new
File
(
Const
.
EXTERNAL_PATH
,
filename
);
if
((!
file
.
getParentFile
().
exists
()
&&
!
file
.
getParentFile
().
mkdirs
())
if
((!
file
.
getParentFile
().
exists
()
&&
!
file
.
getParentFile
().
mkdirs
())
||
(
file
.
exists
()
&&
!
file
.
delete
()))
{
||
(
file
.
exists
()
&&
!
file
.
delete
()))
{
...
...
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