[app] Remove variant switch in manager (#244)
This commit is contained in:
parent
1a50024cb8
commit
02b4ba01d8
|
|
@ -42,7 +42,6 @@ import androidx.recyclerview.widget.RecyclerView;
|
|||
|
||||
import com.google.android.material.snackbar.Snackbar;
|
||||
import com.takisoft.preferencex.PreferenceFragmentCompat;
|
||||
import com.takisoft.preferencex.SimpleMenuPreference;
|
||||
|
||||
import java.util.Calendar;
|
||||
import java.util.Locale;
|
||||
|
|
@ -52,7 +51,6 @@ import io.github.lsposed.manager.ConfigManager;
|
|||
import io.github.lsposed.manager.R;
|
||||
import io.github.lsposed.manager.databinding.ActivitySettingsBinding;
|
||||
import io.github.lsposed.manager.ui.activity.base.BaseActivity;
|
||||
import io.github.lsposed.manager.ui.fragment.StatusDialogBuilder;
|
||||
import io.github.lsposed.manager.util.BackupUtils;
|
||||
import io.github.lsposed.manager.util.theme.ThemeUtil;
|
||||
import rikka.core.util.ResourceUtils;
|
||||
|
|
@ -224,26 +222,6 @@ public class SettingsActivity extends BaseActivity {
|
|||
prefEnableResources.setOnPreferenceChangeListener((preference, newValue) -> ConfigManager.setResourceHookEnabled((boolean) newValue));
|
||||
}
|
||||
|
||||
SimpleMenuPreference prefVariant = findPreference("variant");
|
||||
if (prefVariant != null) {
|
||||
if (StatusDialogBuilder.getArch().contains("x86") || requireActivity().getApplicationInfo().uid / 100000 != 0) {
|
||||
prefVariant.setVisible(false);
|
||||
} else {
|
||||
prefVariant.setEnabled(installed);
|
||||
prefVariant.setValue(String.valueOf(ConfigManager.getVariant()));
|
||||
prefVariant.setOnPreferenceChangeListener((preference, newValue) -> {
|
||||
if (newValue.equals("2")) {
|
||||
new AlertDialog.Builder(requireActivity())
|
||||
.setCancelable(true)
|
||||
.setMessage(R.string.settings_sandhook_deprecated_warning)
|
||||
.setPositiveButton(android.R.string.ok, null)
|
||||
.show();
|
||||
}
|
||||
return ConfigManager.setVariant(Integer.parseInt((String) newValue));
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
Preference backup = findPreference("backup");
|
||||
if (backup != null) {
|
||||
backup.setEnabled(installed);
|
||||
|
|
|
|||
|
|
@ -140,8 +140,6 @@
|
|||
<string name="settings_restoring">Restauration…</string>
|
||||
<string name="settings_restore_success">Restauration terminée!</string>
|
||||
<string name="settings_restore_failed">Échec de la restauration</string>
|
||||
<string name="settings_variant_sandhook">SandHook (Déprécié)</string>
|
||||
<string name="settings_sandhook_deprecated_warning">Avertissement: SandHook est déprécié et sera supprimé dans le future. \nMerci de prendre en considération de migrer vers YAHFA.</string>
|
||||
<string name="group_network">Réseau</string>
|
||||
<string name="dns_over_http">DNS sur HTTPS</string>
|
||||
<string name="dns_over_http_summary">Contourner la censure DNS dans certains pays</string>
|
||||
|
|
|
|||
|
|
@ -149,8 +149,6 @@
|
|||
<string name="settings_restoring">恢复中…</string>
|
||||
<string name="settings_restore_success">恢复成功!</string>
|
||||
<string name="settings_restore_failed">恢复失败</string>
|
||||
<string name="settings_variant_sandhook">SandHook(已废弃)</string>
|
||||
<string name="settings_sandhook_deprecated_warning">警告:SandHook 现已废弃,并且将在以后的版本中移除。\n请考虑切换到 YAHFA。</string>
|
||||
<string name="menu_backup_and_restore">备份…</string>
|
||||
<string name="menu_backup">备份</string>
|
||||
<string name="menu_restore">恢复</string>
|
||||
|
|
|
|||
|
|
@ -32,14 +32,4 @@
|
|||
<item>MODE_NIGHT_YES</item>
|
||||
<item>MODE_NIGHT_FOLLOW_SYSTEM</item>
|
||||
</string-array>
|
||||
|
||||
<string-array name="variant_texts">
|
||||
<item>YAHFA</item>
|
||||
<item>@string/settings_variant_sandhook</item>
|
||||
</string-array>
|
||||
<string-array name="variant_values" translatable="false">
|
||||
<item>1</item>
|
||||
<item>2</item>
|
||||
</string-array>
|
||||
|
||||
</resources>
|
||||
|
|
|
|||
|
|
@ -140,8 +140,6 @@
|
|||
<string name="settings_restoring">Restoring…</string>
|
||||
<string name="settings_restore_success">Restore finished!</string>
|
||||
<string name="settings_restore_failed">Failed to restore</string>
|
||||
<string name="settings_variant_sandhook">SandHook (Deprecated)</string>
|
||||
<string name="settings_sandhook_deprecated_warning">Warning: SandHook is deprecated and will be removed in the future. \nPlease consider migrating to YAHFA.</string>
|
||||
<string name="group_network">Network</string>
|
||||
<string name="dns_over_http">DNS over HTTPS</string>
|
||||
<string name="dns_over_http_summary">Workaround DNS poisoning in some nations</string>
|
||||
|
|
|
|||
|
|
@ -62,16 +62,6 @@
|
|||
android:title="@string/settings_group_framework"
|
||||
app:iconSpaceReserved="false">
|
||||
|
||||
<com.takisoft.preferencex.SimpleMenuPreference
|
||||
android:defaultValue="1"
|
||||
android:entries="@array/variant_texts"
|
||||
android:entryValues="@array/variant_values"
|
||||
android:key="variant"
|
||||
android:summary="%s"
|
||||
android:title="@string/settings_variant"
|
||||
android:persistent="false"
|
||||
app:iconSpaceReserved="false" />
|
||||
|
||||
<SwitchPreference
|
||||
android:defaultValue="false"
|
||||
android:key="enable_resources"
|
||||
|
|
|
|||
Loading…
Reference in New Issue