Add a specific message when magisk is not installed.

pull/27/head
Fox2Code 3 years ago
parent c9669c1d50
commit 35fecf55c7

@ -32,9 +32,15 @@ public enum NotificationType implements NotificationTypeCst {
return !MainApplication.isShowcaseMode(); return !MainApplication.isShowcaseMode();
} }
}, },
NO_ROOT(R.string.fail_root_magisk, R.drawable.ic_baseline_numbers_24, v -> { NO_MAGISK(R.string.fail_magisk_missing, R.drawable.ic_baseline_numbers_24, v ->
IntentHelper.openUrl(v.getContext(), "https://github.com/topjohnwu/Magisk/blob/master/docs/install.md"); IntentHelper.openUrl(v.getContext(),
}) { "https://github.com/topjohnwu/Magisk/blob/master/docs/install.md")) {
@Override
public boolean shouldRemove() {
return InstallerInitializer.getErrorNotification() != this;
}
},
NO_ROOT(R.string.fail_root_magisk, R.drawable.ic_baseline_numbers_24) {
@Override @Override
public boolean shouldRemove() { public boolean shouldRemove() {
return InstallerInitializer.getErrorNotification() != this; return InstallerInitializer.getErrorNotification() != this;

@ -48,7 +48,9 @@ public class InstallerInitializer extends Shell.Initializer {
hasRoot != Boolean.FALSE) { hasRoot != Boolean.FALSE) {
return null; return null;
} }
if (hasRoot != Boolean.TRUE && HAS_MAGISK) { if (!HAS_MAGISK) {
return NotificationType.NO_MAGISK;
} else if (hasRoot != Boolean.TRUE) {
return NotificationType.ROOT_DENIED; return NotificationType.ROOT_DENIED;
} }
return NotificationType.NO_ROOT; return NotificationType.NO_ROOT;

@ -3,6 +3,7 @@
<string name="app_name_short">Fox\'s Mmm</string> <string name="app_name_short">Fox\'s Mmm</string>
<string name="fail_root_magisk">Could not access either Root or Magisk</string> <string name="fail_root_magisk">Could not access either Root or Magisk</string>
<string name="fail_root_denied">Root has been denied via the Magisk app</string> <string name="fail_root_denied">Root has been denied via the Magisk app</string>
<string name="fail_magisk_missing">Magisk is not installed on this device</string>
<string name="loading">Loading…</string> <string name="loading">Loading…</string>
<string name="updatable">Upgradable</string> <string name="updatable">Upgradable</string>
<string name="installed">Installed</string> <string name="installed">Installed</string>

Loading…
Cancel
Save