Release 1.2.3 (#67)

* Fix Android XR metadata placement

* Update README

* Fix broken max aspect metadata

* fix: wrong placement of uses-library

* refactor: bitmap caching and coroutine scopes

* chore: update ARSCLib to 1.4.0

* chore: bump version to 1.2.3

README.md

@@ -40,7 +40,7 @@ If you have any issues regarding game compatibility, please, enable verbose logg
 
 # About legality
 
-Think of this app like an emulator: you need to legally own the game files to use it.
+Think of this app like an emulator: you need to legally obtain the game files to use it.
 
 Obviously, to get a Quest game running on a different headset, the app has to strip away some entitlement checks.
 However, the game still won't launch on a Quest unless you’ve actually bought it.

composeApp/src/androidMain/kotlin/moe/crx/overport/app/BitmapIconResizer.kt

@@ -9,9 +9,10 @@ object BitmapIconResizer : IconResizer {
 
     override fun resize(bytes: ByteArray, width: Int, height: Int): ByteArray {
         val baos = ByteArrayOutputStream()
-        BitmapFactory.decodeByteArray(bytes, 0, bytes.size).apply {
-            reconfigure(width, height, Bitmap.Config.ARGB_8888)
-        }.compress(Bitmap.CompressFormat.PNG, 100, baos)
+        BitmapFactory.decodeByteArray(bytes, 0, bytes.size)
+            .copy(Bitmap.Config.ARGB_8888, true).apply {
+                reconfigure(width, height, Bitmap.Config.ARGB_8888)
+            }.compress(Bitmap.CompressFormat.PNG, 100, baos)
         return baos.toByteArray()
     }
 }

composeApp/src/commonMain/composeResources/values/strings.xml

@@ -9,9 +9,7 @@
     <string name="progress_cleaning">Cleaning up…</string>
     <string name="patcher_nav_item">Patcher</string>
     <string name="select_version_title">Select version</string>
-    <string name="you_have_no_versions">You have no versions installed and overport release index is not available.
-        Check your internet connection.
-    </string>
+    <string name="you_have_no_versions">You have no versions installed and overport release index is not available. Check your internet connection.</string>
     <string name="tag_experimental">experimental</string>
     <string name="tag_latest">latest</string>
     <string name="tag_custom">custom</string>
@@ -28,7 +26,9 @@
     <string name="cant_read_apk">Selected APK file cannot be parsed.</string>
     <string name="apk_file_exported">APK file has been successfully exported.</string>
     <string name="cant_update_overport">overport libraries cannot be downloaded.</string>
-    <string name="unknown_error">Unknown error has been occurred.</string>
+    <string name="unknown_error">Unknown error has been occurred</string>
+    <string name="cant_checkout_title">Can't checkout version</string>
+    <string name="cant_checkout_message">Selected overport version is unavailable for download. Please, check your internet connection or choose another version.</string>
     <string name="update_available">Update available!</string>
     <string name="status_unknown">Unknown</string>
     <string name="status_playable">Playable</string>
@@ -36,18 +36,18 @@
     <string name="status_not_working">Not working</string>
     <string name="status_loading">Loading…</string>
     <string name="use_at_your_risk">Not recommended, use at your own risk</string>
-    <string name="patch_copy_libraries">Copy ovrport libraries</string>
+    <string name="patch_copy_libraries">Copy overport libraries</string>
     <string name="patch_copy_ovrplugin_vrapi">Copy OVRPlugin if VrApi is present</string>
     <string name="patch_fix_min_android_sdk">Fix minimal Android SDK</string>
-    <string name="patch_generate_config">Generate ovrport config</string>
+    <string name="patch_generate_config">Generate overport config</string>
     <string name="patch_remove_localized_names">Remove localized app names</string>
-    <string name="patch_clean_up_frida">Clean up Frida leftovers</string>
+    <string name="patch_clean_up_frida">Clean up Frida leftovers in smali</string>
     <string name="patch_oculus_unity">Patch Oculus detection for Unity</string>
     <string name="patch_oculus_unreal">Patch Oculus detection for Unreal</string>
     <string name="patch_vr_metadata">Pico/YVR/Quest metadata</string>
     <string name="patch_launcher_entry">Fix launcher icon entry</string>
     <string name="patch_remove_uses_library">Remove uses-library</string>
-    <string name="patch_fix_unreal_crash">Fix Unreal Engine 4 crash</string>
+    <string name="patch_fix_unreal_crash">Fix UE4 crash with Unity stub</string>
     <string name="patch_meta_xr_audio">Patch Meta XR Audio</string>
     <string name="patch_mark_as_debuggable">Mark application as debuggable</string>
     <string name="patch_mark_allow_backup">Mark application to allow backup</string>
@@ -56,4 +56,5 @@
     <string name="patch_force_passthrough">Force enable passthrough</string>
     <string name="patch_disable_space_warp">Disable application space warp if used</string>
     <string name="patch_disable_controller_offset">Disable controller tracking offset</string>
+    <string name="patch_remove_vrapi">Remove VrApi library</string>
 </resources>

composeApp/src/commonMain/kotlin/moe/crx/overport/app/composables/AppContent.kt

@@ -46,7 +46,6 @@ fun AppContent(
             }
 
         var versionToUpdate by remember { mutableStateOf<GithubRelease?>(null) }
-        var showAboutDialog by remember { mutableStateOf(false) }
         val urlHandler = LocalUriHandler.current
 
         LaunchedEffect(Unit) {
@@ -95,18 +94,5 @@ fun AppContent(
             navigationItems = listOf(patcherNavItem),
             itemsEnabled = !viewModel.working && !viewModel.isApkLoaded()
         )
-
-        if (showAboutDialog) {
-            AlertDialog(
-                onDismissRequest = { showAboutDialog = false },
-                title = { Text("overport") },
-                text = { Text("about overport") }, // TODO
-                confirmButton = {
-                    TextButton(onClick = { showAboutDialog = false }) {
-                        Text("Close")
-                    }
-                },
-            )
-        }
     }
 }

composeApp/src/commonMain/kotlin/moe/crx/overport/app/composables/ApplicationInfo.kt

@@ -15,7 +15,6 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.ImageBitmap
 import androidx.compose.ui.unit.dp
 import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import moe.crx.overport.app.decodeBitmap
 import moe.crx.overport.app.util.ModifierUtil.rounded
@@ -25,34 +24,53 @@ import overportapp.composeapp.generated.resources.Res
 import overportapp.composeapp.generated.resources.unknown_package
 import java.util.*
 
+val iconCache = mutableMapOf<String, ImageBitmap?>()
+val coverCache = mutableMapOf<String, ImageBitmap?>()
+
 @Composable
 fun ApplicationInfo(
-    applicationName: String? = "Application",
-    applicationPackage: String? = "com.company.application",
-    applicationVersion: String? = "1.0.0",
+    applicationName: String,
+    applicationPackage: String,
+    applicationVersion: String,
     applicationIcon: ImageBitmap? = null,
+    forceLocalInfo: Boolean = false,
+    useCover: Boolean = false,
 ) {
-    var iconIsLoading by rememberSaveable(applicationPackage) { mutableStateOf(true) }
-    var onlineIcon by rememberSaveable(applicationPackage) { mutableStateOf<ImageBitmap?>(null) }
+    var iconIsLoading by remember(applicationPackage) { mutableStateOf(true) }
+    var onlineIcon by remember(applicationPackage) { mutableStateOf(iconCache[applicationPackage]) }
+    var onlineCover by remember(applicationPackage) { mutableStateOf(coverCache[applicationPackage]) }
+
     var onlineLabel by rememberSaveable(applicationPackage) { mutableStateOf<String?>(null) }
-    val scope = rememberCoroutineScope()
 
     LaunchedEffect(applicationPackage) {
-        scope.launch {
-            withContext(Dispatchers.IO) {
-                runCatching {
-                    val info = applicationPackage?.let { getApplicationInfo(it) }
-                    onlineLabel = info?.displayName
-
-                    val image = info?.run {
-                        val associated = images.associateBy { it.imageType }
-                        associated["APP_IMG_ICON"] ?: associated["APP_IMG_COVER_SQUARE"]
-                    }
-
-                    onlineIcon = image?.uri?.let { Base64.getDecoder().decode(it) }?.decodeBitmap()
-                }
-                iconIsLoading = false
+        withContext(Dispatchers.IO) {
+            if (iconCache.containsKey(applicationPackage)) {
+                return@withContext
             }
+
+            val info = getApplicationInfo(applicationPackage)
+            onlineLabel = info?.displayName
+
+            val icon = info?.run {
+                val associated = images.associateBy { it.imageType }
+                associated["APP_IMG_ICON"] ?: associated["APP_IMG_COVER_SQUARE"]
+            }
+
+            val cover = info?.run {
+                val associated = images.associateBy { it.imageType }
+                associated["APP_IMG_COVER_SQUARE"] ?: associated["APP_IMG_ICON"]
+            }
+
+            val iconBitmap = icon?.uri?.let { Base64.getDecoder().decode(it) }?.decodeBitmap()
+            val coverBitmap = cover?.uri?.let { Base64.getDecoder().decode(it) }?.decodeBitmap()
+
+            iconCache[applicationPackage] = iconBitmap
+            coverCache[applicationPackage] = coverBitmap
+
+            onlineIcon = iconBitmap
+            onlineCover = coverBitmap
+
+            iconIsLoading = false
         }
     }
 
@@ -61,14 +79,9 @@ fun ApplicationInfo(
     ) {
         Box {
             FadeVisibility(!iconIsLoading) {
-                onlineIcon?.let {
-                    Image(
-                        it,
-                        contentDescription = null,
-                        modifier = Modifier.size(48.dp).rounded(8.dp)
-                    )
-                } ?: run {
-                    if (applicationIcon == null) {
+                AnimatedContent((onlineCover.takeIf { useCover } ?: onlineIcon)
+                    .takeIf { !forceLocalInfo } ?: applicationIcon) {
+                    if (it == null) {
                         Icon(
                             Icons.Default.Widgets,
                             contentDescription = null,
@@ -76,7 +89,7 @@ fun ApplicationInfo(
                         )
                     } else {
                         Image(
-                            applicationIcon,
+                            it,
                             contentDescription = null,
                             modifier = Modifier.size(48.dp).rounded(8.dp)
                         )
@@ -91,7 +104,7 @@ fun ApplicationInfo(
             modifier = Modifier.height(48.dp),
             verticalArrangement = Arrangement.Center
         ) {
-            AnimatedContent(onlineLabel ?: applicationName) {
+            AnimatedContent(onlineLabel.takeIf { !forceLocalInfo } ?: applicationName) {
                 Text("$it ($applicationVersion)")
             }
             Text(

composeApp/src/commonMain/kotlin/moe/crx/overport/app/composables/ApplicationInfoContent.kt

@@ -20,14 +20,34 @@ import overportapp.composeapp.generated.resources.*
 @OptIn(ExperimentalLayoutApi::class)
 @Composable
 @Preview
-fun ApplicationInfoCard(
-    applicationName: String? = "Application",
-    applicationPackage: String? = "",
-    applicationVersion: String? = "1.0.0",
+fun ApplicationInfoContent(
+    applicationName: String,
+    applicationPackage: String,
+    applicationVersion: String,
     applicationIcon: ImageBitmap? = null,
     onCancel: () -> Unit = {},
     onConfirm: (Map<String, List<String>>) -> Unit = {}
 ) {
+    val enabledPatches = remember(applicationPackage) {
+        mutableStateMapOf(
+            *PatchStore.recommended().map { it.name to listOf<String>() }.toTypedArray()
+        )
+    }
+
+    var patchIconArgument by remember(applicationPackage) {
+        mutableStateOf("icon")
+    }
+
+    fun togglePatch(patch: Patch) {
+        val checked = enabledPatches.containsKey(patch.name)
+
+        if (checked) {
+            enabledPatches.remove(patch.name)
+        } else {
+            enabledPatches[patch.name] = listOf()
+        }
+    }
+
     Column(
         verticalArrangement = Arrangement.spacedBy(8.dp),
     ) {
@@ -36,27 +56,15 @@ fun ApplicationInfoCard(
             horizontalArrangement = Arrangement.SpaceBetween,
             verticalArrangement = Arrangement.spacedBy(8.dp),
         ) {
-            ApplicationInfo(applicationName, applicationPackage, applicationVersion, applicationIcon)
-        }
-
-        val enabledPatches = remember {
-            mutableStateMapOf(
-                *PatchStore.recommended().map { it.name to listOf<String>() }.toTypedArray()
+            ApplicationInfo(
+                applicationName,
+                applicationPackage,
+                applicationVersion,
+                applicationIcon,
+                !enabledPatches.containsKey(PATCH_REPLACE_ICON_LABEL.name),
+                patchIconArgument != "icon",
             )
         }
-        var patchIconArgument by remember {
-            mutableStateOf("icon")
-        }
-
-        fun togglePatch(patch: Patch) {
-            val checked = enabledPatches.containsKey(patch.name)
-
-            if (checked) {
-                enabledPatches.remove(patch.name)
-            } else {
-                enabledPatches[patch.name] = listOf()
-            }
-        }
 
         Box(modifier = Modifier.weight(1f)) {
             LazyColumn {
@@ -129,7 +137,9 @@ fun ApplicationInfoCard(
             Button(
                 modifier = Modifier.weight(1f),
                 onClick = {
-                    enabledPatches[PATCH_REPLACE_ICON_LABEL.name] = listOf(patchIconArgument)
+                    if (enabledPatches.containsKey(PATCH_REPLACE_ICON_LABEL.name)) {
+                        enabledPatches[PATCH_REPLACE_ICON_LABEL.name] = listOf(patchIconArgument)
+                    }
                     onConfirm(enabledPatches)
                 }
             ) {

composeApp/src/commonMain/kotlin/moe/crx/overport/app/composables/PatcherScreen.kt

@@ -11,10 +11,9 @@ import androidx.compose.ui.Modifier
 import kotlinx.coroutines.flow.MutableSharedFlow
 import kotlinx.coroutines.launch
 import moe.crx.overport.app.model.MainViewModel
+import moe.crx.overport.utils.CantCheckoutException
 import org.jetbrains.compose.resources.getString
-import overportapp.composeapp.generated.resources.Res
-import overportapp.composeapp.generated.resources.apk_file_exported
-import overportapp.composeapp.generated.resources.unknown_error
+import overportapp.composeapp.generated.resources.*
 import java.io.InputStream
 import java.io.OutputStream
 
@@ -36,30 +35,26 @@ fun PatcherScreen(
     val isPatcherVisible = !viewModel.working && viewModel.isApkLoaded()
 
     LaunchedEffect(openFlow) {
-        scope.launch {
-            openFlow.collect {
-                inputFile = it
-            }
+        openFlow.collect {
+            inputFile = it
         }
     }
 
     LaunchedEffect(saveFlow) {
-        scope.launch {
-            saveFlow.collect { stream ->
-                val outputStream = stream ?: return@collect
-                try {
-                    viewModel.process(patches)
-                    viewModel.export(outputStream)
-                    scope.launch {
-                        snackbarHostState.showSnackbar(getString(Res.string.apk_file_exported))
-                    }
-                } catch (ex: Throwable) {
-                    ex.printStackTrace()
-                    errorMessage = getString(Res.string.unknown_error) to ex.stackTraceToString()
-                } finally {
-                    viewModel.cancel()
-                    outputStream.close()
+        saveFlow.collect { stream ->
+            val outputStream = stream ?: return@collect
+            try {
+                viewModel.process(patches)
+                viewModel.export(outputStream)
+                scope.launch {
+                    snackbarHostState.showSnackbar(getString(Res.string.apk_file_exported))
                 }
+            } catch (ex: Throwable) {
+                ex.printStackTrace()
+                errorMessage = getString(Res.string.unknown_error) to ex.stackTraceToString()
+            } finally {
+                viewModel.cancel()
+                //outputStream.close()
             }
         }
     }
@@ -71,10 +66,10 @@ fun PatcherScreen(
     }
 
     FadeVisibility(isPatcherVisible) {
-        ApplicationInfoCard(
-            viewModel.currentAppName(),
-            viewModel.currentAppPackage(),
-            viewModel.currentAppVersion(),
+        ApplicationInfoContent(
+            viewModel.currentAppName() ?: "",
+            viewModel.currentAppPackage() ?: "",
+            viewModel.currentAppVersion() ?: "",
             viewModel.currentAppIcon(),
             onCancel = {
                 scope.launch {
@@ -101,6 +96,10 @@ fun PatcherScreen(
                     try {
                         viewModel.checkout(it, name)
                         viewModel.prepare(stream)
+                    } catch (_: CantCheckoutException) {
+                        viewModel.cancel()
+                        errorMessage =
+                            getString(Res.string.cant_checkout_title) to getString(Res.string.cant_checkout_message)
                     } catch (ex: Throwable) {
                         viewModel.cancel()
                         errorMessage = getString(Res.string.unknown_error) to ex.stackTraceToString()

composeApp/src/commonMain/kotlin/moe/crx/overport/app/composables/VersionManagerSheet.kt

@@ -27,20 +27,17 @@ fun VersionManagerSheet(viewModel: MainViewModel, onSelected: (String) -> Unit,
     var available by remember { mutableStateOf<List<OverportRelease>?>(null) }
 
     LaunchedEffect(Unit) {
-        scope.launch {
-            withContext(Dispatchers.IO) {
-                available = viewModel.versionManager.available()
-            }
+        withContext(Dispatchers.IO) {
+            available = viewModel.versionManager.available()
         }
     }
 
     ModalBottomSheet(
-        modifier = Modifier.fillMaxHeight(),
         onDismissRequest = { onCancel() },
     ) {
         if (available == null) {
             Row(
-                modifier = Modifier.fillMaxSize(),
+                modifier = Modifier.fillMaxWidth().height(240.dp),
                 verticalAlignment = Alignment.CenterVertically,
                 horizontalArrangement = Arrangement.Center
             ) {

composeApp/src/commonMain/kotlin/moe/crx/overport/app/util/PatchLocalizer.kt

@@ -24,6 +24,7 @@ object PatchLocalizer {
         PATCH_META_XR_AUDIO to Res.string.patch_meta_xr_audio,
         PATCH_MARK_AS_DEBUGGABLE to Res.string.patch_mark_as_debuggable,
         PATCH_MARK_ALLOW_BACKUP to Res.string.patch_mark_allow_backup,
+        PATCH_REMOVE_VRAPI to Res.string.patch_remove_vrapi,
         PATCH_REMOVE_UNREAL_FORCE_QUIT to Res.string.patch_remove_unreal_force_quit,
         PATCH_FORCE_PASSTHROUGH to Res.string.patch_force_passthrough,
         PATCH_DISABLE_SPACE_WARP to Res.string.patch_disable_space_warp,

gradle.properties

@@ -1,13 +1,10 @@
 #Kotlin
 kotlin.code.style=official
 kotlin.daemon.jvmargs=-Xmx2048M
-
 #Gradle
 org.gradle.jvmargs=-Xmx2048M -Dfile.encoding=UTF-8
-
 #Android
 android.nonTransitiveRClass=true
 android.useAndroidX=true
-
 #Application
-appVersion=1.2.0
+appVersion=1.2.3

overportcli/build.gradle.kts

@@ -8,7 +8,7 @@ plugins {
 }
 
 group = "moe.crx"
-version = "1.2.0"
+version = "1.2.3"
 
 dependencies {
     implementation(libs.android.tools.build)

overportcli/src/main/java/moe/crx/overport/patches/CleanUpFridaPatch.kt

@@ -6,16 +6,6 @@ import moe.crx.overport.utils.named
 import moe.crx.overport.utils.takeNodesEach
 
 val PATCH_CLEAN_UP_FRIDA = Patch("patch_clean_up_frida") {
-    selectLibrary("libfrda.so") {
-        file.delete()
-    }
-    selectLibrary("libfrda.config.so") {
-        file.delete()
-    }
-    selectLibrary("libscript.so") {
-        file.delete()
-    }
-
     selectManifestJson {
         takeNodesEach({ named("manifest") }) {
             takeNodesEach({ named("application") }) {

overportcli/src/main/java/moe/crx/overport/patches/CopyOVRPluginVrApiPatch.kt

@@ -9,8 +9,8 @@ val PATCH_COPY_OVRPLUGIN_VRAPI = Patch("patch_copy_ovrplugin_vrapi") {
             val arch = getLibraries().resolve("lib/${archDirectory.name}")
 
             if (arch.exists()) {
-                val hasVrApi = arch.listFiles().find { it.name.lowercase() == "libvrapi.so" } != null
-                if (hasVrApi) {
+                val vrApi = archDirectory.listFiles().find { it.name.lowercase() == "libvrapi.so" }
+                if (vrApi != null) {
                     arch.listFiles().filter { it.name == "libOVRPlugin.so" }.forEach { library ->
                         library.copyTo(File(archDirectory, library.name), true)
                     }

overportcli/src/main/java/moe/crx/overport/patches/FixUnrealCrashPatch.kt

@@ -3,18 +3,18 @@ package moe.crx.overport.patches
 import moe.crx.overport.patching.Patch
 
 val PATCH_FIX_UNREAL_CRASH = Patch("patch_fix_unreal_crash") {
-    createSmali("com/unity3d/player/UnityPlayer") {
-        if (readText().isBlank()) {
-            append(".class public Lcom/unity3d/player/UnityPlayer;")
-            append(".super Ljava/lang/Object;")
-            append(".field public static currentActivity:Landroid/app/Activity;")
-        }
-    }
-
     selectSmali("com/epicgames/ue4/GameActivity") {
         replace(
             "sput-object (\\w+), Lcom\\/epicgames\\/ue4\\/GameActivity;->\\w+:Lcom\\/epicgames\\/ue4\\/GameActivity;",
             "$0\nsput-object $1, Lcom/unity3d/player/UnityPlayer;->currentActivity:Landroid/app/Activity;"
         )
+
+        createSmali("com/unity3d/player/UnityPlayer") {
+            if (readText().isBlank()) {
+                appendLine(".class public Lcom/unity3d/player/UnityPlayer;")
+                appendLine(".super Ljava/lang/Object;")
+                appendLine(".field public static currentActivity:Landroid/app/Activity;")
+            }
+        }
     }
 }

overportcli/src/main/java/moe/crx/overport/patches/LauncherEntryPatch.kt

@@ -45,6 +45,7 @@ val PATCH_LAUNCHER_ENTRY = Patch("patch_launcher_entry") {
                                     .put(createCategory("android.intent.category.LAUNCHER"))
                                     .put(createCategory("com.oculus.intent.category.VR"))
                                     .put(createCategory("com.yvr.intent.category.VR"))
+                                    .put(createCategory("org.khronos.openxr.intent.category.IMMERSIVE_HMD"))
                             }
                         }
                     }

overportcli/src/main/java/moe/crx/overport/patches/OculusUnityPatch.kt

@@ -8,4 +8,15 @@ val PATCH_OCULUS_UNITY = Patch("patch_oculus_unity") {
             "(getIsOnOculusHardware\\(\\)Z.*?)return (\\w+)", "$1\nconst/4 $2, 0x1\nreturn $2"
         )
     }
+
+    selectLibrary("libOculusXRPlugin.so") {
+        replaceHex(
+            "1F 1C 00 72 ?? ?? ?? ?? E9 07 9F 1A C0 00 80 52 20 00 A0 72 ?? ?? ?? ??",
+            "1F 1C 00 72 ?? ?? ?? ?? 29 00 80 52 C0 00 80 52 20 00 A0 72 ?? ?? ?? ??"
+        )
+        replaceHex(
+            "00 28 18 BF 01 20 ?? ?? 08 70 06 20 C0 F2 01 00",
+            "01 20 00 BF 00 BF ?? ?? 08 70 06 20 C0 F2 01 00"
+        )
+    }
 }

overportcli/src/main/java/moe/crx/overport/patches/RemoveUsesLibraryPatch.kt

@@ -1,6 +1,7 @@
 package moe.crx.overport.patches
 
 import moe.crx.overport.patching.Patch
+import moe.crx.overport.utils.nameAttribute
 import moe.crx.overport.utils.named
 import moe.crx.overport.utils.takeNodesEach
 
@@ -8,8 +9,12 @@ val PATCH_REMOVE_USES_LIBRARY = Patch("patch_remove_uses_library") {
     selectManifestJson {
         takeNodesEach({ named("manifest") }) {
             takeNodesEach({ named("application") }) {
-                takeNodesEach({ named("uses-library") }) { null }
-                takeNodesEach({ named("uses-native-library") }) { null }
+                takeNodesEach({ named("uses-library") }) {
+                    if (nameAttribute() != "libopenxr.google.so") null else this
+                }
+                takeNodesEach({ named("uses-native-library") }) {
+                    if (nameAttribute() != "libopenxr.google.so") null else this
+                }
             }
         }
     }

overportcli/src/main/java/moe/crx/overport/patches/RemoveVrApiPatch.kt

@@ -0,0 +1,16 @@
+package moe.crx.overport.patches
+
+import moe.crx.overport.patching.Patch
+
+val PATCH_REMOVE_VRAPI = Patch("patch_remove_vrapi", false) {
+    selectWorkspace {
+        file.resolve("root/lib").listFiles()?.forEach { archDirectory ->
+            val arch = getLibraries().resolve("lib/${archDirectory.name}")
+
+            if (arch.exists()) {
+                val vrApi = archDirectory.listFiles().find { it.name.lowercase() == "libvrapi.so" }
+                vrApi?.delete()
+            }
+        }
+    }
+}

overportcli/src/main/java/moe/crx/overport/patches/ReplaceIconLabelPatch.kt

@@ -55,6 +55,12 @@ val PATCH_REPLACE_ICON_LABEL = Patch("patch_replace_icon_label") { arguments ->
         }
     }
 
+    if (!iconDownloaded) {
+        selectFile("root/res/drawable/custom_icon_ovrp.png") {
+            delete()
+        }
+    }
+
     if (iconDownloaded) {
         selectPackageBlock {
             getOrCreate("", "drawable", "custom_icon_ovrp").apply {

overportcli/src/main/java/moe/crx/overport/patches/VRMetadataPatch.kt

@@ -22,10 +22,99 @@ fun createMetadata(name: String, value: String): JSONObject {
     )
 }
 
+fun createMetadataFloat(name: String, value: Float): JSONObject {
+    return JSONObject().put("node_type", "element").put("name", "meta-data").put(
+        "attributes", JSONArray().put(
+            JSONObject().put("name", "name").put("id", 16842755)
+                .put("uri", "http://schemas.android.com/apk/res/android").put("prefix", "android")
+                .put("value_type", "STRING").put("data", name)
+        ).put(
+            JSONObject().put("name", "value").put("id", 16842788)
+                .put("uri", "http://schemas.android.com/apk/res/android").put("prefix", "android")
+                .put("value_type", "FLOAT").put("data", value.toRawBits())
+        )
+    )
+}
+
+fun createUsesFeature(name: String, required: Boolean): JSONObject {
+    return JSONObject().put("node_type", "element").put("name", "uses-feature").put(
+        "attributes", JSONArray().put(
+            JSONObject().put("name", "name").put("id", 16842755)
+                .put("uri", "http://schemas.android.com/apk/res/android").put("prefix", "android")
+                .put("value_type", "STRING").put("data", name)
+        ).put(
+            JSONObject().put("name", "required").put("id", 16843406)
+                .put("uri", "http://schemas.android.com/apk/res/android").put("prefix", "android")
+                .put("value_type", "BOOLEAN").put("data", required)
+        )
+    )
+}
+
+fun createUsesLibrary(name: String, required: Boolean): JSONObject {
+    return JSONObject().put("node_type", "element").put("name", "uses-library").put(
+        "attributes", JSONArray().put(
+            JSONObject().put("name", "name").put("id", 16842755)
+                .put("uri", "http://schemas.android.com/apk/res/android").put("prefix", "android")
+                .put("value_type", "STRING").put("data", name)
+        ).put(
+            JSONObject().put("name", "required").put("id", 16843406)
+                .put("uri", "http://schemas.android.com/apk/res/android").put("prefix", "android")
+                .put("value_type", "BOOLEAN").put("data", required)
+        )
+    )
+}
+
+fun createUsesPermission(name: String): JSONObject {
+    return JSONObject().put("node_type", "element").put("name", "uses-permission").put(
+        "attributes", JSONArray().put(
+            JSONObject().put("name", "name").put("id", 16842755)
+                .put("uri", "http://schemas.android.com/apk/res/android").put("prefix", "android")
+                .put("value_type", "STRING").put("data", name)
+        )
+    )
+}
+
+fun createProperty(key: String, value: String): JSONObject {
+    return JSONObject().put("node_type", "element").put("name", "property").put(
+        "attributes", JSONArray().put(
+            JSONObject().put("name", "name").put("id", 16842755)
+                .put("uri", "http://schemas.android.com/apk/res/android").put("prefix", "android")
+                .put("value_type", "STRING").put("data", key)
+        ).put(
+            JSONObject().put("name", "value").put("id", 16842788)
+                .put("uri", "http://schemas.android.com/apk/res/android").put("prefix", "android")
+                .put("value_type", "STRING").put("data", value)
+        )
+    )
+}
+
 val PATCH_VR_METADATA = Patch("patch_vr_metadata") {
     selectManifestJson {
         takeNodesEach({ named("manifest") }) {
+            takeNodes {
+                this?.put(createUsesFeature("android.software.xr.api.openxr", true))
+                    ?.put(createUsesFeature("android.software.xr.api.spatial", true))
+                    ?.put(createUsesFeature("android.software.xr.input.controller", false))
+                    ?.put(createUsesPermission("org.khronos.openxr.permission.OPENXR"))
+                    ?.put(createUsesPermission("org.khronos.openxr.permission.OPENXR_SYSTEM"))
+                    ?.put(createUsesPermission("com.huawei.android.permission.VR"))
+            }
             takeNodesEach({ named("application") }) {
+                takeNodesEach({ named("activity") }) {
+                    takeNodes {
+                        this?.put(
+                            createProperty(
+                                "android.window.PROPERTY_XR_ACTIVITY_START_MODE",
+                                "XR_ACTIVITY_START_MODE_FULL_SPACE_UNMANAGED"
+                            )
+                        )?.put(
+                            createProperty(
+                                "android.window.PROPERTY_XR_BOUNDARY_TYPE_RECOMMENDED",
+                                "XR_BOUNDARY_TYPE_LARGE"
+                            )
+                        )
+                    }
+                }
                 takeNodesEach({ named("meta-data") }) {
                     if (nameAttribute() == "com.oculus.supportedDevices") null else this
                 }
@@ -33,6 +122,15 @@ val PATCH_VR_METADATA = Patch("patch_vr_metadata") {
                     this?.put(createMetadata("pvr.app.type", "vr"))
                         ?.put(createMetadata("com.yvr.intent.category.VR", "vr_only"))
                         ?.put(createMetadata("com.oculus.supportedDevices", "all"))
+                        ?.put(createMetadata("com.huawei.android.vr.application.mode", "vr_only"))
+                        ?.put(createMetadata("com.huawei.android.vr.application.type", "game"))
+                        ?.put(createMetadata("com.huawei.vr.application.freeDegree", "3dof|6dof"))
+                        ?.put(createMetadataFloat("android.max_aspect", 2.1f))
+                        ?.put(createMetadata("minWaveSDKVersion", "1"))
+                        ?.put(createMetadata("com.htc.vr.content.NumController", "1,2"))
+                        ?.put(createMetadata("com.htc.vr.content.NumDoFController", "3,6DoF"))
+                        ?.put(createMetadata("com.htc.vr.content.NumDoFHmd", "3,6DoF"))
+                        ?.put(createUsesLibrary("libopenxr.google.so", false))
                 }
             }
         }

overportcli/src/main/java/moe/crx/overport/patching/FileTransformer.kt

@@ -8,6 +8,10 @@ class FileTransformer(val file: File) {
         file.writeText(Regex(input, RegexOption.DOT_MATCHES_ALL).replace(file.readText(), output))
     }
 
+    fun delete(): Boolean {
+        return file.deleteRecursively()
+    }
+
     fun readText(): String {
         return file.readText()
     }
@@ -16,6 +20,11 @@ class FileTransformer(val file: File) {
         file.appendText(line)
     }
 
+    fun appendLine(line: String) {
+        append(line)
+        append("\n")
+    }
+
     fun readJson(): JSONObject? {
         return runCatching { JSONObject(file.readText()) }.getOrNull()
     }
@@ -35,6 +44,10 @@ class FileTransformer(val file: File) {
     fun replaceHex(input: String, output: String) {
         val bytes = file.readBytes()
         val inputBytes = input.split(' ')
+        val outputBytes = output.split(' ')
+        var startIndex = -1
+
+        check(inputBytes.size == outputBytes.size)
 
         for (i in 0..<bytes.size - inputBytes.size + 1) {
             var matches = true
@@ -52,12 +65,22 @@ class FileTransformer(val file: File) {
             }
 
             if (matches) {
-                val replaced = bytes.slice(0..<i) +
-                        output.split(' ').map { it.toUByte(16).toByte() } +
-                        bytes.slice(i + inputBytes.size..<bytes.size)
-                file.writeBytes(replaced.toByteArray())
-                return
+                startIndex = i
             }
         }
+
+        if (startIndex == -1) {
+            return
+        }
+
+        for (i in 0..<inputBytes.size) {
+            if (outputBytes[i] != "??") {
+                bytes[i + startIndex] = outputBytes[i].toUByte(16).toByte()
+            } else if (inputBytes[i] != "??") {
+                bytes[i + startIndex] = inputBytes[i].toUByte(16).toByte()
+            }
+        }
+
+        file.writeBytes(bytes)
     }
 }

overportcli/src/main/java/moe/crx/overport/patching/PatchStore.kt

@@ -42,6 +42,7 @@ object PatchStore {
         register(PATCH_META_XR_AUDIO)
         register(PATCH_MARK_AS_DEBUGGABLE)
         register(PATCH_MARK_ALLOW_BACKUP)
+        register(PATCH_REMOVE_VRAPI)
         register(PATCH_REMOVE_UNREAL_FORCE_QUIT)
         register(PATCH_FORCE_PASSTHROUGH)
         register(PATCH_DISABLE_SPACE_WARP)

overportcli/src/main/java/moe/crx/overport/patching/PatcherContext.kt

@@ -6,6 +6,7 @@ import com.reandroid.archive.ArchiveFile
 import com.reandroid.archive.FileInputSource
 import com.reandroid.archive.io.ZipFileInput
 import moe.crx.overport.config.OverportPatchedInfo
+import moe.crx.overport.utils.CantCheckoutException
 import moe.crx.overport.utils.NameFormatter
 import moe.crx.overport.versions.VersionManager
 import org.jf.baksmali.Baksmali
@@ -51,14 +52,8 @@ class PatcherContext(
     }
 
     fun checkout() {
-        var successful = VersionManager(patcherDirectory).checkout(overportVersion)
-
-        if (successful == null) {
-            successful = VersionManager(patcherDirectory).checkout("latest")
-        }
-
-        checkNotNull(successful)
-        overportVersion = successful
+        overportVersion = VersionManager(patcherDirectory).checkout(overportVersion)
+            ?: throw CantCheckoutException("Can't checkout an overport release. Please, check your internet connection or choose another version.")
     }
 
     fun prepare(stream: InputStream) {

overportcli/src/main/java/moe/crx/overport/utils/Exceptions.kt

@@ -0,0 +1,3 @@
+package moe.crx.overport.utils
+
+class CantCheckoutException(message: String) : IllegalStateException(message)

overportcli/src/main/java/moe/crx/overport/versions/VersionManager.kt

@@ -10,7 +10,7 @@ class VersionManager(val workingDirectory: File) {
 
     companion object {
         val json = Json { ignoreUnknownKeys = true }
-        const val VERSION = "1.2.0"
+        const val VERSION = "1.2.3"
 
         private fun isVersionLower(left: String, right: String): Boolean {
             val (lY, lM, lD) = left.substringBeforeLast('-').split('.').map { it.toInt() }
@@ -80,6 +80,7 @@ class VersionManager(val workingDirectory: File) {
         if (installedEntry != null) {
             val librariesDir = workingDirectory.resolve("libraries/${installedEntry.version}")
             if (librariesDir.isDirectory) {
+                appendInstalled(installedEntry)
                 return installedEntry.version
             }
         }
@@ -132,7 +133,7 @@ class VersionManager(val workingDirectory: File) {
                         o2.version
                     )
                 ) 1 else -1
-            })
+            }).filter { workingDirectory.resolve("libraries/${it.version}").isDirectory }
         }
 
         return listOf()