ui: align Xray wording casing

whalechoi · whalechoi · commit d13619699872 · 2026-06-02T12:19:45.000+08:00
diff --git a/app/src/main/assets/aboutlibraries.json b/app/src/main/assets/aboutlibraries.json
@@ -263,7 +263,7 @@
         {
             "uniqueId": "github:XTLS/Xray-core",
             "artifactVersion": "v26.6.1",
-            "name": "xray-core",
+            "name": "Xray-core",
             "description": "An open platform for proxy and anti-censorship networking.",
             "website": "https://github.com/XTLS/Xray-core",
             "scm": {
diff --git a/app/src/main/kotlin/app/AppStateModels.kt b/app/src/main/kotlin/app/AppStateModels.kt
@@ -60,7 +60,7 @@ enum class ResourceFileKind(
             GeoIp,
             GeoSite,
             GeoIpOnlyCnPrivate -> fileName
-            XrayCore -> "xray-core $XrayCoreVersion"
+            XrayCore -> "Xray-core $XrayCoreVersion"
         }
 }
 
diff --git a/app/src/main/kotlin/engine/root/RootBootScript.kt b/app/src/main/kotlin/engine/root/RootBootScript.kt
@@ -59,7 +59,7 @@ private fun <Config : RootModeStartConfig> Config.buildRootStartupScript(
         )
         appendScript("section \"Prepare core logs\"")
         append(root.coreLogPaths.buildPrepareCoreLogFilesCommand())
-        appendScript("section \"Start xray-core\"")
+        appendScript("section \"Start Xray-core\"")
         append(root.buildBootStartDaemonCommand())
         val postCoreStartCommand = buildPostCoreStartCommand(this@buildRootStartupScript)
         if (postCoreStartCommand.isNotBlank()) {
@@ -146,7 +146,7 @@ private fun <Config : RootModeStartConfig> StringBuilder.appendRootStartupPreamb
         dump_failure_diagnostics() {
             diagnostics_dumped=1
             echo
-            echo "Recent xray error log:"
+            echo "Recent Xray error log:"
             tail -n 80 $${config.root.coreLogPaths.errorLogPath.shellQuote()} || true
         """,
     )
diff --git a/app/src/main/kotlin/engine/root/RootModeRunner.kt b/app/src/main/kotlin/engine/root/RootModeRunner.kt
@@ -28,7 +28,7 @@ internal abstract class RootModeRunner<Config : RootModeStartConfig>(
         writeRootConfigFile(config.root)
         prepareModeRuntimeFiles(config)
         runRootCommand(config.root.buildPrepareRuntimeCommand(), "Failed to prepare $modeName environment")
-        runRootCommand(config.root.buildStartDaemonCommand(), "Failed to start xray-core daemon")
+        runRootCommand(config.root.buildStartDaemonCommand(), "Failed to start Xray-core daemon")
         runRootCommandIfNotBlank(
             command = buildPostCoreStartCommand(config),
             failureMessage = "Failed to start $modeName helper runtime",
@@ -39,7 +39,7 @@ internal abstract class RootModeRunner<Config : RootModeStartConfig>(
             failStartup(config, readinessCheck.failureMessage)
         }
         if (!isRunning(config.root.runtimeLayout)) {
-            failStartup(config, "xray-core process exited or did not match the expected $modeName runtime state")
+            failStartup(config, "Xray-core process exited or did not match the expected $modeName runtime state")
         }
         if (!isModeRuntimeRunning(config)) {
             failStartup(config, "$modeName helper runtime exited or did not match the expected runtime state")
@@ -84,7 +84,7 @@ internal abstract class RootModeRunner<Config : RootModeStartConfig>(
         if (command.isBlank()) {
             return@withContext
         }
-        runRootCommand(command, "Failed to prepare xray log files")
+        runRootCommand(command, "Failed to prepare Xray log files")
     }
 
     suspend fun ownsRuntime(runtimeLayout: RootRuntimeLayout): Boolean = withContext(Dispatchers.IO) {
@@ -164,7 +164,7 @@ internal abstract class RootModeRunner<Config : RootModeStartConfig>(
         val errorLog = config.root.collectRootErrorLogTail(rootAccess)
         val processDiagnostics = config.root.collectRootProcessDiagnostics(rootAccess)
         val modeDiagnostics = collectReadinessDiagnostics(config)
-        runRootCommand(buildStopCommand(config.root.runtimeLayout), "Failed to clean up after xray-core startup failure")
+        runRootCommand(buildStopCommand(config.root.runtimeLayout), "Failed to clean up after Xray-core startup failure")
         error(
             buildRootDiagnosticMessage(
                 message,
diff --git a/app/src/main/kotlin/engine/root/RootRunnerScript.kt b/app/src/main/kotlin/engine/root/RootRunnerScript.kt
@@ -110,11 +110,11 @@ internal fun RootStartConfig.buildBootStartDaemonCommand(): String {
             export XRAY_LOCATION_ASSET=$${runtimeLayout.dataDir.shellQuote()}
             ulimit -SHn 1000000 || true
             chmod 755 $${setuidgidPath.shellQuote()}
-            echo "+ start xray-core as uid=$${RootXrayUid} gid=$${RootXrayGid}"
-            echo "+ xray stdout/stderr: $${coreLogPaths.errorLogPath.shellQuote()}"
+            echo "+ start Xray-core as uid=$${RootXrayUid} gid=$${RootXrayGid}"
+            echo "+ Xray stdout/stderr: $${coreLogPaths.errorLogPath.shellQuote()}"
             $${setuidgidPath.shellQuote()} $${RootXrayUid.toString().shellQuote()} $${RootXrayGid.toString().shellQuote()} $${runtimeLayout.xrayCorePath.shellQuote()} run -config $${configPath.shellQuote()} >> $${coreLogPaths.errorLogPath.shellQuote()} 2>&1 < /dev/null &
             echo $! > $${runtimeLayout.pidPath.shellQuote()}
-            echo "xray-core pid: $(cat $${runtimeLayout.pidPath.shellQuote()})"
+            echo "Xray-core pid: $(cat $${runtimeLayout.pidPath.shellQuote()})"
             """,
         )
     }
diff --git a/app/src/main/kotlin/engine/tproxy/TproxyRootRunner.kt b/app/src/main/kotlin/engine/tproxy/TproxyRootRunner.kt
@@ -36,7 +36,7 @@ internal class TproxyRootRunner(
         return RootReadinessCheck(
             description = "tproxy-in port ${config.tproxyPort}",
             command = buildRootPortReadyCommand(config.tproxyPort),
-            failureMessage = "xray-core started but tproxy-in port ${config.tproxyPort} is not ready",
+            failureMessage = "Xray-core started but tproxy-in port ${config.tproxyPort} is not ready",
         )
     }
 
diff --git a/app/src/main/kotlin/engine/tun2socks/Tun2SocksRootRunner.kt b/app/src/main/kotlin/engine/tun2socks/Tun2SocksRootRunner.kt
@@ -61,7 +61,7 @@ internal class Tun2SocksRootRunner(
             description = "SOCKS5 port $socksPort and TUN device asterisk0",
             command = buildRootPortReadyCommand(socksPort) +
                 " && ip link show dev 'asterisk0' >/dev/null 2>&1",
-            failureMessage = "xray-core started but SOCKS5 port $socksPort or TUN device asterisk0 is not ready",
+            failureMessage = "Xray-core started but SOCKS5 port $socksPort or TUN device asterisk0 is not ready",
         )
     }
 
diff --git a/app/src/main/kotlin/engine/xray/XrayConfig.kt b/app/src/main/kotlin/engine/xray/XrayConfig.kt
@@ -106,7 +106,7 @@ private fun logGeneratedXrayConfig(config: JsonObject) {
     val chunks = json.chunked(LogChunkSize)
     chunks.forEachIndexed { index, chunk ->
         val progress = if (chunks.size == 1) "" else " (${index + 1}/${chunks.size})"
-        AndroidAppLogger.info(LogTag, "Generated xray config JSON$progress:\n$chunk")
+        AndroidAppLogger.info(LogTag, "Generated Xray config JSON$progress:\n$chunk")
     }
 }
 
diff --git a/app/src/main/kotlin/engine/xray/XrayConfigSupport.kt b/app/src/main/kotlin/engine/xray/XrayConfigSupport.kt
@@ -92,7 +92,7 @@ internal fun Context.prepareXrayCoreLogPaths(): XrayCoreLogPaths {
 internal fun XrayCoreLogPaths.logDirectoryPath(): String {
     return File(errorLogPath).parentFile?.absolutePath
         ?: File(accessLogPath).parentFile?.absolutePath
-        ?: error("xray log directory is unavailable")
+        ?: error("Xray log directory is unavailable")
 }
 
 internal fun Iterable<String>.toJsonStringArray(): JsonArray {
diff --git a/app/src/main/kotlin/engine/xray/XrayCoreLogRuntime.kt b/app/src/main/kotlin/engine/xray/XrayCoreLogRuntime.kt
@@ -52,7 +52,7 @@ internal fun clearCoreLogFilesAsApp(logPaths: List<String>, logTag: String) {
                     writeText("")
                 }
             }.onFailure { error ->
-                AndroidAppLogger.warn(logTag, "Failed to clear xray log file: $logPath", error)
+                AndroidAppLogger.warn(logTag, "Failed to clear Xray log file: $logPath", error)
             }
         }
 }
diff --git a/app/src/main/kotlin/features/about/AboutComponents.kt b/app/src/main/kotlin/features/about/AboutComponents.kt
@@ -101,7 +101,7 @@ internal fun AboutRuntimeCard(
             summary = ProjectInfo.ANDROID_LIB_XRAY_LITE_VERSION,
         )
         BasicComponent(
-            title = "xray-core",
+            title = "Xray-core",
             summary = ProjectInfo.XRAY_CORE_VERSION,
         )
         BasicComponent(
diff --git a/app/src/main/kotlin/features/logs/CoreLogFileTailer.kt b/app/src/main/kotlin/features/logs/CoreLogFileTailer.kt
@@ -68,7 +68,7 @@ internal class CoreLogFileTailer(
                 failureLogged = false
             }.onFailure { error ->
                 if (!failureLogged) {
-                    AndroidAppLogger.warn(LogTag, "Failed to tail xray log file: ${file.absolutePath}", error)
+                    AndroidAppLogger.warn(LogTag, "Failed to tail Xray log file: ${file.absolutePath}", error)
                     failureLogged = true
                 }
             }
diff --git a/app/src/main/kotlin/features/proxy/server/model/ProxyServer.kt b/app/src/main/kotlin/features/proxy/server/model/ProxyServer.kt
@@ -224,7 +224,7 @@ data class V2RayParameters(
                 this.extra = url.parameters["extra"]
             }
 
-            "http", "h2", "h3" -> throw ParseException("Unsupported xray transport type: ${this.type}")
+            "http", "h2", "h3" -> throw ParseException("Unsupported Xray transport type: ${this.type}")
             else -> throw ParseException("Unknown v2ray transport type: ${this.type}")
         }
         when (this.security) {
diff --git a/app/src/main/kotlin/features/resources/runtime/AndroidResourceFileStore.kt b/app/src/main/kotlin/features/resources/runtime/AndroidResourceFileStore.kt
@@ -198,7 +198,7 @@ private fun ResourceFileKind.bundledAssetPath(): String {
         ResourceFileKind.GeoIp -> fileName
         ResourceFileKind.GeoSite -> fileName
         ResourceFileKind.GeoIpOnlyCnPrivate -> fileName
-        ResourceFileKind.XrayCore -> error("xray-core is restored from native libraries")
+        ResourceFileKind.XrayCore -> error("Xray-core is restored from native libraries")
     }
 }
 
diff --git a/buildSrc/src/main/kotlin/BuildConfig.kt b/buildSrc/src/main/kotlin/BuildConfig.kt
@@ -11,7 +11,7 @@ import org.gradle.api.tasks.TaskAction
 object ProjectConfig {
     const val JVM_VERSION = 25
     const val PROJECT_NAME = "AsteriskNG"
-    const val VERSION_NAME = "1.2.1"
+    const val VERSION_NAME = "1.2.2-dev"
     const val PACKAGE_NAME = "org.asterisk.zcc.ang"
     const val XRAY_CORE_VERSION = "v26.6.1"
     const val ANDROID_LIB_XRAY_LITE_VERSION = "v26.6.1"
diff --git a/buildSrc/src/main/kotlin/GenerateAboutLibrariesJsonTask.kt b/buildSrc/src/main/kotlin/GenerateAboutLibrariesJsonTask.kt
@@ -78,7 +78,7 @@ abstract class GenerateAboutLibrariesJsonTask : DefaultTask() {
             library(
                 "github:XTLS/Xray-core",
                 ProjectConfig.XRAY_CORE_VERSION,
-                "xray-core",
+                "Xray-core",
                 "An open platform for proxy and anti-censorship networking.",
                 "https://github.com/XTLS/Xray-core",
                 "https://github.com/XTLS/Xray-core",

Original file line number	Diff line number	Diff line change
`@@ -263,7 +263,7 @@`
`263`	`263`	`{`
`264`	`264`	`"uniqueId": "github:XTLS/Xray-core",`
`265`	`265`	`"artifactVersion": "v26.6.1",`
`266`		`- "name": "xray-core",`
	`266`	`+ "name": "Xray-core",`
`267`	`267`	`"description": "An open platform for proxy and anti-censorship networking.",`
`268`	`268`	`"website": "https://github.com/XTLS/Xray-core",`
`269`	`269`	`"scm": {`
Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,7 @@ enum class ResourceFileKind(`
`60`	`60`	`GeoIp,`
`61`	`61`	`GeoSite,`
`62`	`62`	`GeoIpOnlyCnPrivate -> fileName`
`63`		`- XrayCore -> "xray-core $XrayCoreVersion"`
	`63`	`+ XrayCore -> "Xray-core $XrayCoreVersion"`
`64`	`64`	`}`
`65`	`65`	`}`
`66`	`66`
Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ internal class TproxyRootRunner(`
`36`	`36`	`return RootReadinessCheck(`
`37`	`37`	`description = "tproxy-in port ${config.tproxyPort}",`
`38`	`38`	`command = buildRootPortReadyCommand(config.tproxyPort),`
`39`		`- failureMessage = "xray-core started but tproxy-in port ${config.tproxyPort} is not ready",`
	`39`	`+ failureMessage = "Xray-core started but tproxy-in port ${config.tproxyPort} is not ready",`
`40`	`40`	`)`
`41`	`41`	`}`
`42`	`42`
Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,7 @@ internal class Tun2SocksRootRunner(`
`61`	`61`	`description = "SOCKS5 port $socksPort and TUN device asterisk0",`
`62`	`62`	`command = buildRootPortReadyCommand(socksPort) +`
`63`	`63`	`" && ip link show dev 'asterisk0' >/dev/null 2>&1",`
`64`		`- failureMessage = "xray-core started but SOCKS5 port $socksPort or TUN device asterisk0 is not ready",`
	`64`	`+ failureMessage = "Xray-core started but SOCKS5 port $socksPort or TUN device asterisk0 is not ready",`
`65`	`65`	`)`
`66`	`66`	`}`
`67`	`67`
Original file line number	Diff line number	Diff line change
`@@ -106,7 +106,7 @@ private fun logGeneratedXrayConfig(config: JsonObject) {`
`106`	`106`	`val chunks = json.chunked(LogChunkSize)`
`107`	`107`	`chunks.forEachIndexed { index, chunk ->`
`108`	`108`	`val progress = if (chunks.size == 1) "" else " (${index + 1}/${chunks.size})"`
`109`		`- AndroidAppLogger.info(LogTag, "Generated xray config JSON$progress:\n$chunk")`
	`109`	`+ AndroidAppLogger.info(LogTag, "Generated Xray config JSON$progress:\n$chunk")`
`110`	`110`	`}`
`111`	`111`	`}`
`112`	`112`
Original file line number	Diff line number	Diff line change
`@@ -92,7 +92,7 @@ internal fun Context.prepareXrayCoreLogPaths(): XrayCoreLogPaths {`
`92`	`92`	`internal fun XrayCoreLogPaths.logDirectoryPath(): String {`
`93`	`93`	`return File(errorLogPath).parentFile?.absolutePath`
`94`	`94`	`?: File(accessLogPath).parentFile?.absolutePath`
`95`		`- ?: error("xray log directory is unavailable")`
	`95`	`+ ?: error("Xray log directory is unavailable")`
`96`	`96`	`}`
`97`	`97`
`98`	`98`	`internal fun Iterable<String>.toJsonStringArray(): JsonArray {`
Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@ internal fun clearCoreLogFilesAsApp(logPaths: List<String>, logTag: String) {`
`52`	`52`	`writeText("")`
`53`	`53`	`}`
`54`	`54`	`}.onFailure { error ->`
`55`		`- AndroidAppLogger.warn(logTag, "Failed to clear xray log file: $logPath", error)`
	`55`	`+ AndroidAppLogger.warn(logTag, "Failed to clear Xray log file: $logPath", error)`
`56`	`56`	`}`
`57`	`57`	`}`
`58`	`58`	`}`