From fbce20bbfb9998aa13e77888fc253f1a6d5d9cca Mon Sep 17 00:00:00 2001
From: Akash Yadav <itsaky01@gmail.com>
Date: Wed, 15 Nov 2023 10:43:01 +0530
Subject: [PATCH] fix(preferences): remove preference for JDK 11 tag pointer
 fix

---
 .../androidide/preferences/buildAndRun.kt     | 28 -------------------
 .../managers/PreferenceManager.java           |  4 ---
 .../preferences/internal/buildPreferences.kt  | 12 --------
 3 files changed, 44 deletions(-)

diff --git a/app/src/main/java/com/itsaky/androidide/preferences/buildAndRun.kt b/app/src/main/java/com/itsaky/androidide/preferences/buildAndRun.kt
index a0f48a47e..6c16aaa8f 100644
--- a/app/src/main/java/com/itsaky/androidide/preferences/buildAndRun.kt
+++ b/app/src/main/java/com/itsaky/androidide/preferences/buildAndRun.kt
@@ -18,18 +18,14 @@
 package com.itsaky.androidide.preferences
 
 import android.content.Context
-import android.os.Build.VERSION
-import android.os.Build.VERSION_CODES
 import androidx.preference.Preference
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import com.google.android.material.textfield.TextInputLayout
 import com.itsaky.androidide.R
-import com.itsaky.androidide.app.IDEBuildConfigProvider
 import com.itsaky.androidide.preferences.internal.CUSTOM_GRADLE_INSTALLATION
 import com.itsaky.androidide.preferences.internal.GRADLE_CLEAR_CACHE
 import com.itsaky.androidide.preferences.internal.GRADLE_COMMANDS
 import com.itsaky.androidide.preferences.internal.LAUNCH_APP_AFTER_INSTALL
-import com.itsaky.androidide.preferences.internal.TP_FIX
 import com.itsaky.androidide.preferences.internal.gradleInstallationDir
 import com.itsaky.androidide.preferences.internal.isBuildCacheEnabled
 import com.itsaky.androidide.preferences.internal.isDebugEnabled
@@ -39,7 +35,6 @@ import com.itsaky.androidide.preferences.internal.isScanEnabled
 import com.itsaky.androidide.preferences.internal.isStacktraceEnabled
 import com.itsaky.androidide.preferences.internal.isWarningModeAllEnabled
 import com.itsaky.androidide.preferences.internal.launchAppAfterInstall
-import com.itsaky.androidide.preferences.internal.tpFix
 import com.itsaky.androidide.resources.R.drawable
 import com.itsaky.androidide.resources.R.string
 import com.itsaky.androidide.tasks.executeAsync
@@ -75,9 +70,6 @@ private class GradleOptions(
     addPreference(GradleCommands())
     addPreference(GradleDistrubution())
     addPreference(GradleClearCache())
-    if (IDEBuildConfigProvider.getInstance().isArm64v8aBuild() && VERSION.SDK_INT == VERSION_CODES.R) {
-      addPreference(TagPointersFix())
-    }
   }
 }
 
@@ -137,26 +129,6 @@ private class GradleDistrubution(
   }
 }
 
-@Parcelize
-private class TagPointersFix(
-  override val key: String = TP_FIX,
-  override val title: Int = string.idepref_title_tpFix,
-  override val summary: Int? = string.idepref_msg_tpFix,
-  override val icon: Int? = drawable.ic_language_java,
-) : SwitchPreference() {
-
-  override fun onCreatePreference(context: Context): Preference {
-    val preference = super.onCreatePreference(context) as androidx.preference.SwitchPreference
-    preference.isChecked = tpFix
-    return preference
-  }
-
-  override fun onPreferenceChanged(preferece: Preference, newValue: Any?): Boolean {
-    tpFix = newValue as Boolean? ?: false
-    return true
-  }
-}
-
 @Parcelize
 private class GradleClearCache(
   override val key: String = GRADLE_CLEAR_CACHE,
diff --git a/common/src/main/java/com/itsaky/androidide/managers/PreferenceManager.java b/common/src/main/java/com/itsaky/androidide/managers/PreferenceManager.java
index aa0d7ac22..a816f41d7 100755
--- a/common/src/main/java/com/itsaky/androidide/managers/PreferenceManager.java
+++ b/common/src/main/java/com/itsaky/androidide/managers/PreferenceManager.java
@@ -26,7 +26,6 @@ import org.greenrobot.eventbus.EventBus;
 
 public class PreferenceManager {
 
-  public static final String KEY_TP_FIX = "idepref_build_tagPointersFix";
   private final SharedPreferences prefs;
 
   public PreferenceManager(Context ctx) {
@@ -123,7 +122,4 @@ public class PreferenceManager {
     return prefs.getInt(key, def);
   }
 
-  public boolean shouldUseLdPreload() {
-    return getBoolean(KEY_TP_FIX, false);
-  }
 }
diff --git a/preferences/src/main/java/com/itsaky/androidide/preferences/internal/buildPreferences.kt b/preferences/src/main/java/com/itsaky/androidide/preferences/internal/buildPreferences.kt
index d2b5e90d0..d898cfd47 100644
--- a/preferences/src/main/java/com/itsaky/androidide/preferences/internal/buildPreferences.kt
+++ b/preferences/src/main/java/com/itsaky/androidide/preferences/internal/buildPreferences.kt
@@ -18,7 +18,6 @@
 package com.itsaky.androidide.preferences.internal
 
 // Defined in PreferenceManager so that it could be accessible from Environment class
-import com.itsaky.androidide.managers.PreferenceManager.KEY_TP_FIX
 
 const val STACKTRACE = "idepref_gradleCmd_stacktrace"
 const val DEBUG = "idepref_gradleCmd_debug"
@@ -32,7 +31,6 @@ const val GRADLE_COMMANDS = "idepref_build_gradleCommands"
 const val GRADLE_CLEAR_CACHE = "idepref_build_gradleClearCache"
 const val CUSTOM_GRADLE_INSTALLATION = "idepref_build_customGradleInstallation"
 const val LAUNCH_APP_AFTER_INSTALL = "ide.build.run.launchAppAfterInstall"
-const val TP_FIX = KEY_TP_FIX
 
 /** Switch for Gradle `--debug` option. */
 var isDebugEnabled: Boolean
@@ -90,16 +88,6 @@ var gradleInstallationDir: String
     prefManager.putString(CUSTOM_GRADLE_INSTALLATION, value)
   }
 
-/**
- * Whether the tag pointer fix should be enabled or not. The fix is needed only if JDK 11 is being
- * used.
- */
-var tpFix: Boolean
-  get() = prefManager.getBoolean(TP_FIX, false)
-  set(value) {
-    prefManager.putBoolean(TP_FIX, value)
-  }
-
 /**
  * Whether the app should be launched automatically after installation (after build).
  */