mirror of
https://github.com/topjohnwu/Magisk.git
synced 2025-04-28 04:20:45 +00:00
Add option to restore Magisk Manager after repackage
This commit is contained in:
parent
860b08d9ed
commit
b9e7d0faea
@ -1,6 +1,7 @@
|
|||||||
package com.topjohnwu.magisk;
|
package com.topjohnwu.magisk;
|
||||||
|
|
||||||
import android.Manifest;
|
import android.Manifest;
|
||||||
|
import android.content.Intent;
|
||||||
import android.content.SharedPreferences;
|
import android.content.SharedPreferences;
|
||||||
import android.os.Build;
|
import android.os.Build;
|
||||||
import android.os.Bundle;
|
import android.os.Bundle;
|
||||||
@ -21,6 +22,7 @@ import android.widget.Toast;
|
|||||||
import com.topjohnwu.magisk.asyncs.CheckUpdates;
|
import com.topjohnwu.magisk.asyncs.CheckUpdates;
|
||||||
import com.topjohnwu.magisk.asyncs.HideManager;
|
import com.topjohnwu.magisk.asyncs.HideManager;
|
||||||
import com.topjohnwu.magisk.components.Activity;
|
import com.topjohnwu.magisk.components.Activity;
|
||||||
|
import com.topjohnwu.magisk.receivers.ManagerUpdate;
|
||||||
import com.topjohnwu.magisk.utils.Const;
|
import com.topjohnwu.magisk.utils.Const;
|
||||||
import com.topjohnwu.magisk.utils.FingerprintHelper;
|
import com.topjohnwu.magisk.utils.FingerprintHelper;
|
||||||
import com.topjohnwu.magisk.utils.Topic;
|
import com.topjohnwu.magisk.utils.Topic;
|
||||||
@ -99,6 +101,7 @@ public class SettingsActivity extends Activity implements Topic.Subscriber {
|
|||||||
PreferenceCategory magiskCategory = (PreferenceCategory) findPreference("magisk");
|
PreferenceCategory magiskCategory = (PreferenceCategory) findPreference("magisk");
|
||||||
PreferenceCategory suCategory = (PreferenceCategory) findPreference("superuser");
|
PreferenceCategory suCategory = (PreferenceCategory) findPreference("superuser");
|
||||||
Preference hideManager = findPreference("hide");
|
Preference hideManager = findPreference("hide");
|
||||||
|
Preference restoreManager = findPreference("restore");
|
||||||
findPreference("clear").setOnPreferenceClickListener((pref) -> {
|
findPreference("clear").setOnPreferenceClickListener((pref) -> {
|
||||||
prefs.edit().remove(Const.Key.ETAG_KEY).apply();
|
prefs.edit().remove(Const.Key.ETAG_KEY).apply();
|
||||||
mm.repoDB.clearRepo();
|
mm.repoDB.clearRepo();
|
||||||
@ -152,6 +155,38 @@ public class SettingsActivity extends Activity implements Topic.Subscriber {
|
|||||||
suCategory.removePreference(fingerprint);
|
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) {
|
if (mm.getPackageName().equals(Const.ORIG_PKG_NAME) && mm.magiskVersionCode >= 1440) {
|
||||||
hideManager.setOnPreferenceClickListener((pref) -> {
|
hideManager.setOnPreferenceClickListener((pref) -> {
|
||||||
Utils.runWithPermission(getActivity(),
|
Utils.runWithPermission(getActivity(),
|
||||||
@ -159,6 +194,7 @@ public class SettingsActivity extends Activity implements Topic.Subscriber {
|
|||||||
() -> new HideManager(getActivity()).exec());
|
() -> new HideManager(getActivity()).exec());
|
||||||
return true;
|
return true;
|
||||||
});
|
});
|
||||||
|
generalCatagory.removePreference(restoreManager);
|
||||||
} else {
|
} else {
|
||||||
generalCatagory.removePreference(hideManager);
|
generalCatagory.removePreference(hideManager);
|
||||||
}
|
}
|
||||||
|
@ -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_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_title">Hide Magisk Manager</string>
|
||||||
<string name="settings_hide_manager_summary">Repackage Magisk Manager with random package name</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="language">Language</string>
|
||||||
<string name="system_default">(System Default)</string>
|
<string name="system_default">(System Default)</string>
|
||||||
<string name="settings_update">Update Settings</string>
|
<string name="settings_update">Update Settings</string>
|
||||||
|
@ -20,6 +20,11 @@
|
|||||||
android:title="@string/settings_hide_manager_title"
|
android:title="@string/settings_hide_manager_title"
|
||||||
android:summary="@string/settings_hide_manager_summary" />
|
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>
|
||||||
|
|
||||||
<PreferenceCategory
|
<PreferenceCategory
|
||||||
|
Loading…
x
Reference in New Issue
Block a user