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
b9e7d0fa
Commit
b9e7d0fa
authored
Feb 12, 2018
by
topjohnwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add option to restore Magisk Manager after repackage
parent
860b08d9
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
43 additions
and
0 deletions
+43
-0
SettingsActivity.java
src/main/java/com/topjohnwu/magisk/SettingsActivity.java
+36
-0
strings.xml
src/main/res/values/strings.xml
+2
-0
app_settings.xml
src/main/res/xml/app_settings.xml
+5
-0
No files found.
src/main/java/com/topjohnwu/magisk/SettingsActivity.java
View file @
b9e7d0fa
package
com
.
topjohnwu
.
magisk
;
import
android.Manifest
;
import
android.content.Intent
;
import
android.content.SharedPreferences
;
import
android.os.Build
;
import
android.os.Bundle
;
...
...
@@ -21,6 +22,7 @@ import android.widget.Toast;
import
com.topjohnwu.magisk.asyncs.CheckUpdates
;
import
com.topjohnwu.magisk.asyncs.HideManager
;
import
com.topjohnwu.magisk.components.Activity
;
import
com.topjohnwu.magisk.receivers.ManagerUpdate
;
import
com.topjohnwu.magisk.utils.Const
;
import
com.topjohnwu.magisk.utils.FingerprintHelper
;
import
com.topjohnwu.magisk.utils.Topic
;
...
...
@@ -99,6 +101,7 @@ public class SettingsActivity extends Activity implements Topic.Subscriber {
PreferenceCategory
magiskCategory
=
(
PreferenceCategory
)
findPreference
(
"magisk"
);
PreferenceCategory
suCategory
=
(
PreferenceCategory
)
findPreference
(
"superuser"
);
Preference
hideManager
=
findPreference
(
"hide"
);
Preference
restoreManager
=
findPreference
(
"restore"
);
findPreference
(
"clear"
).
setOnPreferenceClickListener
((
pref
)
->
{
prefs
.
edit
().
remove
(
Const
.
Key
.
ETAG_KEY
).
apply
();
mm
.
repoDB
.
clearRepo
();
...
...
@@ -152,6 +155,38 @@ public class SettingsActivity extends Activity implements Topic.Subscriber {
suCategory
.
removePreference
(
fingerprint
);
}
if
(
mm
.
magiskVersionCode
>=
1440
)
{
if
(
mm
.
getPackageName
().
equals
(
Const
.
ORIG_PKG_NAME
))
{
hideManager
.
setOnPreferenceClickListener
((
pref
)
->
{
Utils
.
runWithPermission
(
getActivity
(),
Manifest
.
permission
.
WRITE_EXTERNAL_STORAGE
,
()
->
new
HideManager
(
getActivity
()).
exec
());
return
true
;
});
generalCatagory
.
removePreference
(
restoreManager
);
}
else
{
if
(
Utils
.
checkNetworkStatus
())
{
restoreManager
.
setOnPreferenceClickListener
((
pref
)
->
{
Utils
.
runWithPermission
(
getActivity
(),
Manifest
.
permission
.
WRITE_EXTERNAL_STORAGE
,
()
->
{
Intent
intent
=
new
Intent
(
mm
,
ManagerUpdate
.
class
);
intent
.
putExtra
(
Const
.
Key
.
INTENT_SET_LINK
,
mm
.
managerLink
);
intent
.
putExtra
(
Const
.
Key
.
INTENT_SET_FILENAME
,
Utils
.
fmt
(
"MagiskManager-v%s(%d).apk"
,
mm
.
remoteManagerVersionString
,
mm
.
remoteManagerVersionCode
));
mm
.
sendBroadcast
(
intent
);
});
return
true
;
});
}
else
{
generalCatagory
.
removePreference
(
restoreManager
);
}
generalCatagory
.
removePreference
(
hideManager
);
}
}
else
{
generalCatagory
.
removePreference
(
restoreManager
);
generalCatagory
.
removePreference
(
hideManager
);
}
if
(
mm
.
getPackageName
().
equals
(
Const
.
ORIG_PKG_NAME
)
&&
mm
.
magiskVersionCode
>=
1440
)
{
hideManager
.
setOnPreferenceClickListener
((
pref
)
->
{
Utils
.
runWithPermission
(
getActivity
(),
...
...
@@ -159,6 +194,7 @@ public class SettingsActivity extends Activity implements Topic.Subscriber {
()
->
new
HideManager
(
getActivity
()).
exec
());
return
true
;
});
generalCatagory
.
removePreference
(
restoreManager
);
}
else
{
generalCatagory
.
removePreference
(
hideManager
);
}
...
...
src/main/res/values/strings.xml
View file @
b9e7d0fa
...
...
@@ -135,6 +135,8 @@
<string
name=
"settings_clear_cache_summary"
>
Clear the cached information for online repos, forces the app to refresh online
</string>
<string
name=
"settings_hide_manager_title"
>
Hide Magisk Manager
</string>
<string
name=
"settings_hide_manager_summary"
>
Repackage Magisk Manager with random package name
</string>
<string
name=
"settings_restore_manager_title"
>
Restore Magisk Manager
</string>
<string
name=
"settings_restore_manager_summary"
>
Restore Magisk Manager with original package
</string>
<string
name=
"language"
>
Language
</string>
<string
name=
"system_default"
>
(System Default)
</string>
<string
name=
"settings_update"
>
Update Settings
</string>
...
...
src/main/res/xml/app_settings.xml
View file @
b9e7d0fa
...
...
@@ -20,6 +20,11 @@
android:title=
"@string/settings_hide_manager_title"
android:summary=
"@string/settings_hide_manager_summary"
/>
<Preference
android:key=
"restore"
android:summary=
"@string/settings_restore_manager_summary"
android:title=
"@string/settings_restore_manager_title"
/>
</PreferenceCategory>
<PreferenceCategory
...
...
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