Art: deprecate TagRequisiteRunner (#44)

Author: cliuff

api_viewing/build.gradle.kts

@@ -63,6 +63,7 @@ android {
 
 dependencies {
     coreLibraryDesugaring(libs.androidDesugaring)
+    implementation(project(":mods:art"))
     implementation(project(":mods:core"))
     implementation(project(":mods:org"))
     implementation(platform(libs.androidxComposeBom))

api_viewing/src/main/kotlin/com/madness/collision/unit/api_viewing/tag/app/BuiltInTags.kt

@@ -30,12 +30,11 @@ import com.madness.collision.unit.api_viewing.data.ApiViewingApp
 import com.madness.collision.unit.api_viewing.data.ArchiveEntryFlags
 import com.madness.collision.unit.api_viewing.data.DexPackageFlags
 import com.madness.collision.unit.api_viewing.info.AppType
-import com.madness.collision.unit.api_viewing.info.DexLibSuperFinder
 import com.madness.collision.unit.api_viewing.list.AppListService
 import com.madness.collision.unit.api_viewing.tag.inflater.AppTagInflater
 import com.madness.collision.unit.api_viewing.util.ManifestUtil
 import com.madness.collision.util.os.OsUtils
-import kotlinx.coroutines.TimeoutCancellationException
+import io.cliuff.boundo.art.apk.dex.AsyncDexLibSuperFinder
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.withTimeout
 
@@ -510,29 +509,9 @@ private fun pkgServicesRequisite(): AppTagInfo.Requisite = AppTagInfo.Requisite(
 
         // services declared in manifests are not guaranteed to be found in DEX files
         val services = app.pkgInfo?.services?.run { mapTo(HashSet(size), ServiceInfo::name) }.orEmpty()
-        // external archives are not read-only files, so use DexLibSuperFinder for them
-        if (res.app.isArchive) {
-            val finder = DexLibSuperFinder()
-            app.serviceFamilyClasses = finder.resolve(app.appPackage.apkPaths, services)
-        } else {
-            // todo move instance into res
-            val reqRunner = TagRequisiteRunner(res.context).init()
-            // todo reduce service set to only ones of interest, to save more memory
-            app.serviceFamilyClasses = try {
-                withTimeout(20_000) { reqRunner.findSuperclass(app.appPackage.apkPaths, services) }
-                    ?: DexLibSuperFinder().resolve(app.appPackage.apkPaths, services)
-            } catch (e: TimeoutCancellationException) {
-                // unrecoverable exceptions in remote also results in timeout
-                e.printStackTrace()
-                // fallback to dex lib
-                DexLibSuperFinder().resolve(app.appPackage.apkPaths, services)
-            } catch (e: Exception) {
-                // error with binding or the like
-                e.printStackTrace()
-                // fallback to dex lib
-                DexLibSuperFinder().resolve(app.appPackage.apkPaths, services)
-            }
-        }
+        val finder = AsyncDexLibSuperFinder()
+        app.serviceFamilyClasses = finder.resolve(app.appPackage.apkPaths, services)
+        // todo reduce service set to only ones of interest, to save more memory
     }
 )
 

api_viewing/src/main/kotlin/com/madness/collision/unit/api_viewing/tag/app/TagRequisiteRunner.kt

@@ -38,6 +38,7 @@ import kotlin.concurrent.thread
 import kotlin.coroutines.resume
 import kotlin.coroutines.resumeWithException
 
+@Deprecated("")
 class TagRequisiteRunner(private val context: Context) {
     private var serviceMessenger: Messenger? = null
     private val serviceConn = object : ServiceConnection {

api_viewing/src/main/kotlin/com/madness/collision/unit/api_viewing/tag/app/TagRequisiteService.kt

@@ -29,6 +29,7 @@ import android.util.Log
 import com.madness.collision.unit.api_viewing.info.LoadSuperFinder
 
 /** Service to run in a separate process to isolate native exceptions. */
+@Deprecated("")
 class TagRequisiteService : Service() {
     private val tagMessenger = kotlin.run {
         val looper = Looper.myLooper()