From e00626764f8882de0ba85c1b22f923d421df881d Mon Sep 17 00:00:00 2001
From: PranavPurwar <purwarpranav80@gmail.com>
Date: Sat, 30 Sep 2023 18:51:10 +0530
Subject: [PATCH] Fetch `android.jar` and `core-lambda-stubs.jar` from `Android
 SDK` for more transparency

Tested-by: Pranav Purwar <purwarpranav80@gmail.com>
Signed-off-by: PranavPurwar <purwarpranav80@gmail.com>
---
 .idea/compiler.xml                            |  3 ++
 .idea/gradle.xml                              |  2 -
 app/.gitignore                                |  4 +-
 app/build.gradle.kts                          | 54 +++++++++++++++++++
 app/src/main/kotlin/org/cosmicide/App.kt      | 23 ++++++--
 .../editor/language/KotlinLanguage.kt         |  1 -
 .../org/cosmicide/model/ProjectViewModel.kt   |  4 +-
 .../kotlin/org/cosmicide/util/ResourceUtil.kt |  2 +-
 .../org/cosmicide/rewrite/common/Prefs.kt     |  3 ++
 .../kotlin/completion/KotlinEnvironment.kt    |  3 +-
 10 files changed, 84 insertions(+), 15 deletions(-)

diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index 4397f7082..6861988a4 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -17,6 +17,9 @@
       <module name="CosmicIDE-Rewrite.bardapi.test" target="17" />
       <module name="CosmicIDE-Rewrite.completion.java" target="17" />
       <module name="CosmicIDE-Rewrite.completion.kotlin" target="17" />
+      <module name="CosmicIDE-Rewrite.feature.jaxp" target="17" />
+      <module name="CosmicIDE-Rewrite.feature.jaxp.main" target="17" />
+      <module name="CosmicIDE-Rewrite.feature.jaxp.test" target="17" />
       <module name="CosmicIDE-Rewrite.feature.rish" target="20" />
       <module name="CosmicIDE-Rewrite.java-completion" target="17" />
       <module name="CosmicIDE-Rewrite.java-completion.main" target="17" />
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 8bc91cac8..129b951f2 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -25,9 +25,7 @@
             <option value="$PROJECT_DIR$/feature/formatter/google-java-format" />
             <option value="$PROJECT_DIR$/feature/formatter/ktfmt" />
             <option value="$PROJECT_DIR$/feature/java-completion" />
-            <option value="$PROJECT_DIR$/feature/jaxp" />
             <option value="$PROJECT_DIR$/feature/project" />
-            <option value="$PROJECT_DIR$/feature/the-unsafe" />
             <option value="$PROJECT_DIR$/jgit" />
             <option value="$PROJECT_DIR$/kotlinc" />
             <option value="$PROJECT_DIR$/util" />
diff --git a/app/.gitignore b/app/.gitignore
index 42afabfd2..8242d8d25 100644
--- a/app/.gitignore
+++ b/app/.gitignore
@@ -1 +1,3 @@
-/build
\ No newline at end of file
+/build
+/src/main/assets/android.jar
+/src/main/assets/core-lambda-stubs.jar
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 5590b45e7..e83a789b2 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -15,6 +15,8 @@ android {
     namespace = "org.cosmicide"
     compileSdk = 34
 
+    moveSdkToAssetsIfNeeded()
+
     defaultConfig {
         val commit = getGitCommit()
         applicationId = "org.cosmicide"
@@ -96,6 +98,24 @@ android {
     }
 }
 
+// Copies `android.jar` and `core-lambda-stubs.jar` from Android SDK to app's assets.
+// Note: The version used is the latest one installed on the machine.
+fun moveSdkToAssetsIfNeeded() {
+    val assets = File(System.getProperty("user.dir") + "/app/src/main/assets")
+
+    val androidJar = assets.resolve("android.jar")
+    if (androidJar.exists().not()) {
+        println("Copying SDK android.jar to ${androidJar.absolutePath}")
+        getAndroidJar().copyTo(androidJar)
+    }
+
+    val coreLambdaStubs = assets.resolve("core-lambda-stubs.jar")
+    if (coreLambdaStubs.exists().not()) {
+        println("Copying SDK core-lambda-stubs.jar to ${coreLambdaStubs.absolutePath}")
+        getCoreLambdaStubs().copyTo(coreLambdaStubs)
+    }
+}
+
 fun getGitCommit(): String {
     return try {
         val commit = providers.exec {
@@ -219,3 +239,37 @@ dependencies {
 
     testImplementation("junit:junit:4.13.2")
 }
+
+// Fetches Android SDK root
+fun getSdkDir(): File {
+    var sdk = System.getProperty("ANDROID_HOME")
+
+    if (sdk.isNullOrBlank()) {
+        val f = File(System.getProperty("user.dir") + "/local.properties")
+        val localProps = f.readLines()
+        val sdkDirIndex = localProps.indexOfFirst { it.startsWith("sdk.dir=") }
+        if (sdkDirIndex != -1) {
+            sdk = localProps[sdkDirIndex].substring(8)
+        }
+    }
+
+    return File(sdk)
+}
+
+// Fetches core-lambda-stubs.jar from Android SDK
+fun getCoreLambdaStubs(): File {
+    val sdk = getSdkDir()
+
+    return sdk.resolve("build-tools").listFiles().orEmpty().sortedBy { it.name }.last()
+        .resolve("core-lambda-stubs.jar")
+}
+
+// Fetches android.jar from Android SDK
+fun getAndroidJar(): File {
+    val sdk = getSdkDir()
+
+    val sdks = sdk.resolve("platforms").listFiles().orEmpty().filter { it.isHidden.not() }
+        .sortedBy { it.name }
+    return sdks.last().resolve("android.jar")
+}
+
diff --git a/app/src/main/kotlin/org/cosmicide/App.kt b/app/src/main/kotlin/org/cosmicide/App.kt
index 242fc886f..5ca2c884b 100644
--- a/app/src/main/kotlin/org/cosmicide/App.kt
+++ b/app/src/main/kotlin/org/cosmicide/App.kt
@@ -116,8 +116,8 @@ class App : Application() {
 
         // iterate through each activity and apply theme
         registerActivityLifecycleCallbacks(object : ActivityLifecycleCallbacks {
-            override fun onActivityCreated(p0: Activity, p1: Bundle?) {
-                (p0 as? ComponentActivity)?.enableEdgeToEdge()
+            override fun onActivityCreated(activity: Activity, p1: Bundle?) {
+                (activity as? ComponentActivity)?.enableEdgeToEdge()
             }
 
             override fun onActivityStarted(p0: Activity) {}
@@ -156,6 +156,16 @@ class App : Application() {
             "kotlin-stdlib-common-1.9.0.jar",
             FileUtil.classpathDir.resolve("kotlin-stdlib-common-1.9.0.jar")
         )
+
+        extractAsset(
+            "android.jar",
+            FileUtil.classpathDir.resolve("android.jar")
+        )
+
+        extractAsset(
+            "core-lambda-stubs.jar",
+            FileUtil.classpathDir.resolve("core-lambda-stubs.jar")
+        )
     }
 
     fun extractAsset(assetName: String, targetFile: File) {
@@ -267,8 +277,11 @@ class App : Application() {
 
     override fun onConfigurationChanged(newConfig: Configuration) {
         super.onConfigurationChanged(newConfig)
-        setTheme(CommonUtils.getAccent(Prefs.appTheme))
-        applyThemeBasedOnConfiguration()
+
+        if (Prefs.isInitialized) {
+            applyThemeBasedOnConfiguration()
+            setTheme(CommonUtils.getAccent(Prefs.appTheme))
+        }
     }
 
     fun applyThemeBasedOnConfiguration() {
@@ -308,4 +321,4 @@ class App : Application() {
         val source = IThemeSource.fromInputStream(inputStream, fileName, null)
         return ThemeModel(source, themeName)
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/kotlin/org/cosmicide/editor/language/KotlinLanguage.kt b/app/src/main/kotlin/org/cosmicide/editor/language/KotlinLanguage.kt
index d42078ea3..88d6486c6 100644
--- a/app/src/main/kotlin/org/cosmicide/editor/language/KotlinLanguage.kt
+++ b/app/src/main/kotlin/org/cosmicide/editor/language/KotlinLanguage.kt
@@ -99,7 +99,6 @@ class KotlinLanguage(
     ) {
         super.requireAutoComplete(content, position, publisher, extraArguments)
 
-
         try {
             val text = editor.text.toString()
             val ktFile = kotlinEnvironment.updateKotlinFile(file.absolutePath, text)
diff --git a/app/src/main/kotlin/org/cosmicide/model/ProjectViewModel.kt b/app/src/main/kotlin/org/cosmicide/model/ProjectViewModel.kt
index 2f239b653..48ad03821 100644
--- a/app/src/main/kotlin/org/cosmicide/model/ProjectViewModel.kt
+++ b/app/src/main/kotlin/org/cosmicide/model/ProjectViewModel.kt
@@ -7,7 +7,6 @@
 
 package org.cosmicide.model
 
-import android.util.Log
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
@@ -40,7 +39,6 @@ class ProjectViewModel : ViewModel() {
 
             withContext(Dispatchers.Main) {
                 _projects.value = projectsList
-                Log.d(TAG, "Projects: $projectsList")
             }
         }
     }
@@ -48,4 +46,4 @@ class ProjectViewModel : ViewModel() {
     companion object {
         private const val TAG = "ProjectViewModel"
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/kotlin/org/cosmicide/util/ResourceUtil.kt b/app/src/main/kotlin/org/cosmicide/util/ResourceUtil.kt
index b3c1625fd..42a39be2d 100644
--- a/app/src/main/kotlin/org/cosmicide/util/ResourceUtil.kt
+++ b/app/src/main/kotlin/org/cosmicide/util/ResourceUtil.kt
@@ -12,7 +12,7 @@ import org.cosmicide.rewrite.util.FileUtil
 object ResourceUtil {
 
     val resources =
-        arrayOf("classpath/android.jar", "index.json", "classpath/core-lambda-stubs.jar")
+        arrayOf("index.json")
 
     fun missingResources(): List<String> {
         val missing = mutableListOf<String>()
diff --git a/common/src/main/java/org/cosmicide/rewrite/common/Prefs.kt b/common/src/main/java/org/cosmicide/rewrite/common/Prefs.kt
index cc3196cc0..7fc575220 100644
--- a/common/src/main/java/org/cosmicide/rewrite/common/Prefs.kt
+++ b/common/src/main/java/org/cosmicide/rewrite/common/Prefs.kt
@@ -33,6 +33,9 @@ object Prefs {
         prefs = PreferenceManager.getDefaultSharedPreferences(context)
     }
 
+    val isInitialized: Boolean
+        get() = ::prefs.isInitialized
+
     val appTheme: String
         get() = prefs.getString("app_theme", "auto") ?: "auto"
 
diff --git a/feature/completion/kotlin/src/main/java/com/tyron/kotlin/completion/KotlinEnvironment.kt b/feature/completion/kotlin/src/main/java/com/tyron/kotlin/completion/KotlinEnvironment.kt
index c23750179..219c3f95e 100644
--- a/feature/completion/kotlin/src/main/java/com/tyron/kotlin/completion/KotlinEnvironment.kt
+++ b/feature/completion/kotlin/src/main/java/com/tyron/kotlin/completion/KotlinEnvironment.kt
@@ -173,7 +173,6 @@ data class KotlinEnvironment(
                 message,
                 severity
             )
-            println("issue: $issue")
             issueListener(issue)
         }
     }
@@ -613,4 +612,4 @@ data class KotlinEnvironment(
             return environment
         }
     }
-}
\ No newline at end of file
+}