Skip to content

Commit

Permalink
Temporarily remove enhancement mode
Browse files Browse the repository at this point in the history
  • Loading branch information
@MlgmXyysd
MlgmXyysd committed Feb 3, 2021
1 parent 699496e commit ee43dad
Show file tree
Hide file tree
Showing 4 changed files with 65 additions and 72 deletions.
22 changes: 9 additions & 13 deletions app/src/main/AndroidManifest.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -267,21 +267,17 @@
android:resource="@xml/file_paths" />
</provider>

<meta-data
android:name="xposedmodule"
android:value="true" />
<!-- <meta-data-->
<!-- android:name="xposedmodule"-->
<!-- android:value="true" />-->

<meta-data
android:name="xposeddescription"
android:value="@string/xposed_description" />
<!-- <meta-data-->
<!-- android:name="xposeddescription"-->
<!-- android:value="@string/xposed_description" />-->

<meta-data
android:name="xposedminversion"
android:value="82" />

<meta-data
android:name="xposedscope"
android:resource="@array/module_scope" />
<!-- <meta-data-->
<!-- android:name="xposedminversion"-->
<!-- android:value="93" />-->

</application>
</manifest>
55 changes: 28 additions & 27 deletions app/src/main/java/org/meowcat/edxposed/manager/SettingsFragment.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
import java.io.IOException;
import java.util.Objects;

import static org.meowcat.edxposed.manager.Constants.getBaseDir;
import static org.meowcat.edxposed.manager.SettingsActivity.getDarkenFactor;
import static org.meowcat.edxposed.manager.XposedApp.WRITE_EXTERNAL_PERMISSION;
import static org.meowcat.edxposed.manager.XposedApp.darkenColor;
Expand Down Expand Up @@ -60,20 +61,20 @@ public class SettingsFragment extends BasePreferenceFragment implements Preferen
Color.parseColor("#607D8B"),
Color.parseColor("#FA7298")
};
private static final File mDisableForceClientSafetyNetFlag = new File(XposedApp.BASE_DIR + "conf/disable_force_client_safetynet");
private static final File mPretendXposedInstallerFlag = new File(XposedApp.BASE_DIR + "conf/pretend_xposed_installer");
private static final File mHideEdXposedManagerFlag = new File(XposedApp.BASE_DIR + "conf/hide_edxposed_manager");
private static final File mEnableResourcesFlag = new File(XposedApp.BASE_DIR + "conf/enable_resources");
private static final File mDisableHiddenAPIBypassFlag = new File(XposedApp.BASE_DIR + "conf/disable_hidden_api_bypass");
private static final File mDynamicModulesFlag = new File(XposedApp.BASE_DIR + "conf/dynamicmodules");
private static final File mWhiteListModeFlag = new File(XposedApp.BASE_DIR + "conf/usewhitelist");
private static final File mDeoptBootFlag = new File(XposedApp.BASE_DIR + "conf/deoptbootimage");
private static final File mDisableVerboseLogsFlag = new File(XposedApp.BASE_DIR + "conf/disable_verbose_log");
private static final File mDisableModulesLogsFlag = new File(XposedApp.BASE_DIR + "conf/disable_modules_log");
private static final File mVerboseLogProcessID = new File(XposedApp.BASE_DIR + "log/all.pid");
private static final File mModulesLogProcessID = new File(XposedApp.BASE_DIR + "log/error.pid");
private static final File mUseSandHookFlag = new File(XposedApp.BASE_DIR, "conf/use_sandhook");
private static final File mDisableSandHookFlag = new File(XposedApp.BASE_DIR, "conf/disable_sandhook");
// private static final File mDisableForceClientSafetyNetFlag = new File(getBaseDir() + "conf/disable_force_client_safetynet");
// private static final File mPretendXposedInstallerFlag = new File(getBaseDir() + "conf/pretend_xposed_installer");
// private static final File mHideEdXposedManagerFlag = new File(getBaseDir() + "conf/hide_edxposed_manager");
private static final File mEnableResourcesFlag = new File(getBaseDir() + "conf/enable_resources");
private static final File mDisableHiddenAPIBypassFlag = new File(getBaseDir() + "conf/disable_hidden_api_bypass");
private static final File mDynamicModulesFlag = new File(getBaseDir() + "conf/dynamicmodules");
private static final File mWhiteListModeFlag = new File(getBaseDir() + "conf/usewhitelist");
private static final File mDeoptBootFlag = new File(getBaseDir() + "conf/deoptbootimage");
private static final File mDisableVerboseLogsFlag = new File(getBaseDir() + "conf/disable_verbose_log");
private static final File mDisableModulesLogsFlag = new File(getBaseDir() + "conf/disable_modules_log");
private static final File mVerboseLogProcessID = new File(getBaseDir() + "log/all.pid");
private static final File mModulesLogProcessID = new File(getBaseDir() + "log/error.pid");
private static final File mUseSandHookFlag = new File(getBaseDir(), "conf/use_sandhook");
private static final File mDisableSandHookFlag = new File(getBaseDir(), "conf/disable_sandhook");
private static final String DIALOG_FRAGMENT_TAG = "list_preference_dialog";
@SuppressLint("StaticFieldLeak")
static SwitchPreference navBar;
Expand Down Expand Up @@ -127,8 +128,8 @@ public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
return true;
});

Preference enhancement_status = findPreference("enhancement_status");
Objects.requireNonNull(enhancement_status).setSummary(StatusInstallerFragment.isEnhancementEnabled() ? R.string.settings_summary_enhancement_enabled : R.string.settings_summary_enhancement);
// Preference enhancement_status = findPreference("enhancement_status");
// Objects.requireNonNull(enhancement_status).setSummary(StatusInstallerFragment.isEnhancementEnabled() ? R.string.settings_summary_enhancement_enabled : R.string.settings_summary_enhancement);

SwitchPreference darkStatusBarPref = findPreference("dark_status_bar");
Objects.requireNonNull(darkStatusBarPref).setOnPreferenceChangeListener((preference, newValue) -> {
Expand All @@ -144,17 +145,17 @@ public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
Objects.requireNonNull(prefUseSandHook).setChecked(mUseSandHookFlag.exists());
prefUseSandHook.setOnPreferenceChangeListener((preference, newValue) -> setFlag(mUseSandHookFlag, (boolean) newValue));

SwitchPreference prefPassClientSafetyNet = findPreference("pass_client_safetynet");
Objects.requireNonNull(prefPassClientSafetyNet).setChecked(!mDisableForceClientSafetyNetFlag.exists());
prefPassClientSafetyNet.setOnPreferenceChangeListener((preference, newValue) -> !setFlag(mDisableHiddenAPIBypassFlag, !(boolean) newValue));

SwitchPreference prefPretendXposedInstaller = findPreference("pretend_xposed_installer");
Objects.requireNonNull(prefPretendXposedInstaller).setChecked(mPretendXposedInstallerFlag.exists());
prefPretendXposedInstaller.setOnPreferenceChangeListener((preference, newValue) -> setFlag(mPretendXposedInstallerFlag, (boolean) newValue));

SwitchPreference prefHideEdXposedManager = findPreference("hide_edxposed_manager");
Objects.requireNonNull(prefHideEdXposedManager).setChecked(mHideEdXposedManagerFlag.exists());
prefHideEdXposedManager.setOnPreferenceChangeListener((preference, newValue) -> setFlag(mHideEdXposedManagerFlag, (boolean) newValue));
// SwitchPreference prefPassClientSafetyNet = findPreference("pass_client_safetynet");
// Objects.requireNonNull(prefPassClientSafetyNet).setChecked(!mDisableForceClientSafetyNetFlag.exists());
// prefPassClientSafetyNet.setOnPreferenceChangeListener((preference, newValue) -> !setFlag(mDisableHiddenAPIBypassFlag, !(boolean) newValue));
//
// SwitchPreference prefPretendXposedInstaller = findPreference("pretend_xposed_installer");
// Objects.requireNonNull(prefPretendXposedInstaller).setChecked(mPretendXposedInstallerFlag.exists());
// prefPretendXposedInstaller.setOnPreferenceChangeListener((preference, newValue) -> setFlag(mPretendXposedInstallerFlag, (boolean) newValue));
//
// SwitchPreference prefHideEdXposedManager = findPreference("hide_edxposed_manager");
// Objects.requireNonNull(prefHideEdXposedManager).setChecked(mHideEdXposedManagerFlag.exists());
// prefHideEdXposedManager.setOnPreferenceChangeListener((preference, newValue) -> setFlag(mHideEdXposedManagerFlag, (boolean) newValue));

SwitchPreference prefWhiteListMode = findPreference("white_list_switch");
Objects.requireNonNull(prefWhiteListMode).setChecked(mWhiteListModeFlag.exists());
Expand Down
4 changes: 0 additions & 4 deletions app/src/main/res/values/arrays.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -93,8 +93,4 @@
<item>ic_launcher_staol</item>
</string-array>

<string-array name="module_scope" translatable="false">
<item>android</item>
</string-array>

</resources>
56 changes: 28 additions & 28 deletions app/src/main/res/xml/prefs.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -221,33 +221,33 @@

</PreferenceCategory>

<PreferenceCategory
android:key="group_enhancement"
android:title="@string/settings_group_enhancement">

<Preference
android:key="enhancement_status"
android:summary="@string/settings_summary_enhancement"
android:title="@string/settings_title_enhancement" />

<SwitchPreference
android:defaultValue="true"
android:key="pass_client_safetynet"
android:summary="@string/settings_summary_pass_client_safetynet"
android:title="@string/settings_title_pass_client_safetynet" />

<SwitchPreference
android:defaultValue="false"
android:key="pretend_xposed_installer"
android:summary="@string/settings_summary_pretend_xposed_installer"
android:title="@string/settings_title_pretend_xposed_installer" />

<SwitchPreference
android:defaultValue="false"
android:key="hide_edxposed_manager"
android:summary="@string/settings_summary_hide_edxposed_manager"
android:title="@string/settings_title_hide_edxposed_manager" />

</PreferenceCategory>
<!-- <PreferenceCategory-->
<!-- android:key="group_enhancement"-->
<!-- android:title="@string/settings_group_enhancement">-->

<!-- <Preference-->
<!-- android:key="enhancement_status"-->
<!-- android:summary="@string/settings_summary_enhancement"-->
<!-- android:title="@string/settings_title_enhancement" />-->

<!-- <SwitchPreference-->
<!-- android:defaultValue="true"-->
<!-- android:key="pass_client_safetynet"-->
<!-- android:summary="@string/settings_summary_pass_client_safetynet"-->
<!-- android:title="@string/settings_title_pass_client_safetynet" />-->

<!-- <SwitchPreference-->
<!-- android:defaultValue="false"-->
<!-- android:key="pretend_xposed_installer"-->
<!-- android:summary="@string/settings_summary_pretend_xposed_installer"-->
<!-- android:title="@string/settings_title_pretend_xposed_installer" />-->

<!-- <SwitchPreference-->
<!-- android:defaultValue="false"-->
<!-- android:key="hide_edxposed_manager"-->
<!-- android:summary="@string/settings_summary_hide_edxposed_manager"-->
<!-- android:title="@string/settings_title_hide_edxposed_manager" />-->

<!-- </PreferenceCategory>-->

</PreferenceScreen>

0 comments on commit ee43dad

Please sign in to comment.