[VXP]: remove yield mode.

android-hacker · Jun 26, 2018 · f5a31db · f5a31db
1 parent bd64b0a
commit f5a31db
Show file tree

Hide file tree

Showing 9 changed files with 2 additions and 50 deletions.
diff --git a/VirtualApp/app/build.gradle b/VirtualApp/app/build.gradle
@@ -28,8 +28,8 @@ android {
         applicationId "io.va.exposed"
         minSdkVersion 21
         targetSdkVersion 23
-        versionCode 116
-        versionName "0.11.6"
+        versionCode 117
+        versionName "0.11.7"
         multiDexEnabled false
         android {
             defaultConfig {

diff --git a/VirtualApp/app/src/main/java/io/virtualapp/settings/SettingsActivity.java b/VirtualApp/app/src/main/java/io/virtualapp/settings/SettingsActivity.java
@@ -55,7 +55,6 @@ public class SettingsActivity extends Activity {
     private static final String INSTALL_GMS_KEY = "advance_settings_install_gms";
     public static final String DIRECTLY_BACK_KEY = "advance_settings_directly_back";
     private static final String COPY_FILE = "advance_settings_copy_file";
-    private static final String YIELD_MODE = "advance_settings_yield_mode2";
     private static final String RECOMMEND_PLUGIN = "settings_plugin_recommend";
     private static final String DISABLE_RESIDENT_NOTIFICATION = "advance_settings_disable_resident_notification";
     private static final String ALLOW_FAKE_SIGNATURE = "advance_settings_allow_fake_signature";
@@ -100,7 +99,6 @@ public void onCreate(Bundle savedInstanceState) {
             Preference copyFile = findPreference(COPY_FILE);
 
             SwitchPreference disableInstaller = (SwitchPreference) findPreference(DISABLE_INSTALLER_KEY);
-            SwitchPreference yieldMode = (SwitchPreference) findPreference(YIELD_MODE);
             SwitchPreference disableResidentNotification = (SwitchPreference) findPreference(DISABLE_RESIDENT_NOTIFICATION);
             SwitchPreference allowFakeSignature = (SwitchPreference) findPreference(ALLOW_FAKE_SIGNATURE);
             SwitchPreference disableXposed = (SwitchPreference) findPreference(DISABLE_XPOSED);
@@ -323,28 +321,6 @@ public void onCreate(Bundle savedInstanceState) {
                 return false;
             }));
 
-            yieldMode.setOnPreferenceChangeListener((preference, newValue) -> {
-
-                if (!(newValue instanceof Boolean)) {
-                    return false;
-                }
-
-                boolean on = (boolean) newValue;
-
-                File yieldFile = getActivity().getFileStreamPath("yieldMode2"); // 文件不存在代表是保守模式
-                if (!on) {
-                    boolean success;
-                    try {
-                        success = yieldFile.createNewFile();
-                    } catch (IOException e) {
-                        success = false;
-                    }
-                    return success;
-                } else {
-                    return !yieldFile.exists() || yieldFile.delete();
-                }
-            });
-
             disableXposed.setOnPreferenceChangeListener((preference, newValue) -> {
 
                 if (!(newValue instanceof Boolean)) {

diff --git a/VirtualApp/app/src/main/res/values-es/strings.xml b/VirtualApp/app/src/main/res/values-es/strings.xml
@@ -128,8 +128,6 @@
     <string name="about_feedback_tel_title">Grupo de Telegram: %1$s</string>
     <string name="advance_settings_install_gms">Instalar / Desinstalar servicios de Google</string>
     <string name="advance_settings_copy_file">Copiar archivo</string>
-    <string name="advance_settings_yield_mode_summary">Activar esta opción para un balance entre estabilidad y compatibilidad</string>
-    <string name="advance_settings_yield_mode">Modo conservativo</string>
     <string name="about_website_title">Sitio web oficial</string>
     <string name="about_feedback_title">Comentarios</string>
     <string name="about_feedback_hint">Especifique el modelo, la versión del sistema, el complemento Xposed utilizado y la versión de la aplicación correspondiente, y luego describa con el mayor detalle posible el problema que está experimentando, de lo contrario, se considera como un comentario no válido.\n</string>

diff --git a/VirtualApp/app/src/main/res/values-fr/strings.xml b/VirtualApp/app/src/main/res/values-fr/strings.xml
@@ -128,8 +128,6 @@
     <string name="advance_settings_install_gms">Installer / Désinstaller les services Google</string>
     <string name="about_feedback_tel_title">Group Telegram: %1$s</string>
     <string name="advance_settings_copy_file">Copier fichier</string>
-    <string name="advance_settings_yield_mode_summary">Ouvrir ceci pour un compromis entre la stabilité et la compatibilité.</string>
-    <string name="advance_settings_yield_mode">Mode Conservateur</string>
     <string name="about_website_title">Site web officiel</string>
     <string name="about_feedback_title">Retour utilisateurs</string>
     <string name="about_feedback_hint">Veuillez spécifier le modèle de votre téléphone, la version Android, le plugin Xposed et la version de l\'application correspondante, puis décrivez (avec le plus de détails possible) le problème que vous rencontrez, sinon il est considéré comme un feedback invalide (parce que nous ne pouvons pas résoudre efficacement le problème avec seulement \"cette application plante\"). ;) )</string>

diff --git a/VirtualApp/app/src/main/res/values-zh-rCN/strings.xml b/VirtualApp/app/src/main/res/values-zh-rCN/strings.xml
@@ -124,8 +124,6 @@
     <string name="advance_settings_install_gms">安装/移除Google服务</string>
     <string name="about_feedback_tel_title">Telegram 群组: %1$s</string>
     <string name="advance_settings_copy_file">内部文件复制</string>
-    <string name="advance_settings_yield_mode_summary">开启这个开关，可能会提高VirtualXposed的稳定性，但同时会失去对插件的一些兼容性。</string>
-    <string name="advance_settings_yield_mode">保守模式</string>
     <string name="about_website_title">官网（使用教程/历史版本下载/模块下载)</string>
     <string name="about_feedback_title">问题反馈</string>
     <string name="about_feedback_hint">请说明你的机型，系统版本，使用的Xposed插件以及对应APP版本，然后尽可能详细地描述你遇到的问题；否则视为无效反馈。\n</string>

diff --git a/VirtualApp/app/src/main/res/values-zh-rTW/strings.xml b/VirtualApp/app/src/main/res/values-zh-rTW/strings.xml
@@ -123,8 +123,6 @@
     <string name="advance_settings_install_gms">安裝/移除Google服務</string>
     <string name="about_feedback_tel_title">Telegram 群組: %1$s</string>
     <string name="advance_settings_copy_file">內部檔案複製</string>
-    <string name="advance_settings_yield_mode_summary">開啟這個開關，可能會提高VirtualXposed的穩定性，但同時會失去對插件的一些相容性。</string>
-    <string name="advance_settings_yield_mode">保守模式</string>
     <string name="about_website_title">官網（使用教學/歷史版本下載/模組下載)</string>
     <string name="about_feedback_title">問題回饋</string>
     <string name="about_feedback_hint">請說明你的機型，系統版本，使用的Xposed插件以及對應APP版本，然後儘可能詳細地描述你遇到的問題；否則視為無效回饋。\n</string>

diff --git a/VirtualApp/app/src/main/res/values/strings.xml b/VirtualApp/app/src/main/res/values/strings.xml
@@ -129,8 +129,6 @@
     <string name="advance_settings_install_gms">Install/Uninstall Google Services</string>
     <string name="about_feedback_tel_title">Telegram Group: %1$s</string>
     <string name="advance_settings_copy_file">Copy File</string>
-    <string name="advance_settings_yield_mode_summary">Open this for a trade-off between stability and compatibility.</string>
-    <string name="advance_settings_yield_mode">Conservative Mode</string>
     <string name="about_website_title">Official website</string>
     <string name="about_feedback_title">Feedback</string>
     <string name="about_feedback_hint">Please specify your phone model, Android version, Xposed plugin, and version of the corresponding app, and then describe (in as much detail as possible) the problem you are experiencing, otherwise it is considered invalid feedback (because we can\'t effectively troubleshoot and fix said problem with only \"this app crashes\" ;) )</string>

diff --git a/VirtualApp/app/src/main/res/xml/settings_preferences.xml b/VirtualApp/app/src/main/res/xml/settings_preferences.xml
@@ -74,13 +74,6 @@
             android:summary="@string/advance_settings_directly_back_summary"
             android:title="@string/advance_settings_directly_back" />
 
-        <SwitchPreference
-            android:defaultValue="true"
-            android:key="advance_settings_yield_mode2"
-            android:persistent="true"
-            android:summary="@string/advance_settings_yield_mode_summary"
-            android:title="@string/advance_settings_yield_mode" />
-
         <Preference
             android:key="settings_desktop"
             android:persistent="false"

diff --git a/VirtualApp/lib/src/main/java/com/lody/virtual/client/VClientImpl.java b/VirtualApp/lib/src/main/java/com/lody/virtual/client/VClientImpl.java
@@ -335,7 +335,6 @@ private void bindApplicationNoCheck(String packageName, String processName, Cond
         if (enableXposed) {
             VLog.i(TAG, "Xposed is enabled.");
             ClassLoader originClassLoader = context.getClassLoader();
-            initForYieldMode();
             ExposedBridge.initOnce(context, data.appInfo, originClassLoader);
             List<InstalledAppInfo> modules = VirtualCore.get().getInstalledApps(0);
             for (InstalledAppInfo module : modules) {
@@ -395,12 +394,6 @@ private void bindApplicationNoCheck(String packageName, String processName, Cond
         VirtualCore.get().getComponentDelegate().afterApplicationCreate(mInitialApplication);
     }
 
-    private void initForYieldMode() {
-        if (!VirtualCore.get().getContext().getFileStreamPath("yieldMode2").exists()) {
-            System.setProperty("yieldMode", "true");
-        }
-    }
-
     private void fixWeChatRecovery(Application app) {
         try {
             Field field = app.getClassLoader().loadClass("com.tencent.recovery.Recovery").getField("context");