6 Commits
Author SHA1 Message Date
kalarina 05d4936c90 Add donation card and move repository links to GitHub 2026-11-17 09:41:25 +02:00
kalarina 8a40e86d73 README: point Obtainium link to GitHub 2026-11-14 19:23:24 +02:00
kalarina ef5af5c395 Release 1.0.51 2026-11-12 17:18:17 +02:00
kalarina 0d0daf8a45 Sign presence announcements with their signing time
Wi-Fi presence announcements now carry the time they were signed, and a
known friend's announcement is accepted only if it is at most 15 minutes
old (or ahead). A recorded announcement can no longer be replayed to show
someone as nearby. Each device signs its announcement anew every 5 minutes.

Older versions sign without the time: their announcements are hidden for
known friends, and they in turn hide announcements from this version.
2026-11-12 17:11:40 +02:00
kalarina 6ed42e0bf3 Smaller fixes from the review
- BLE: at most four messages are reassembled at once; presence advertises
  in the balanced mode, a hosted game still in low latency.
- LAN: the socket and its stream are volatile.
- The spectator port and the APK share server listen on the Wi-Fi address
  only; the share server serves four clients at a time.
- Version catalog, per-app language setting (localeConfig) and the Gradle
  distribution checksum.
- NetworkLog writes to the debug log instead of an unread in-memory list;
  Log.d/Log.v are stripped from release builds.
- Remove four unused strings in all languages.
2026-11-12 17:03:06 +02:00
kalarina cac575ed26 Validate what the opponent sends and keep friend images in files
- Images from another device are size-checked before they are decoded,
  shown or stored: more than 4096 px on a side is refused, decoding is
  capped and OutOfMemoryError is caught. A crafted avatar or background
  could otherwise crash the app every time the friend card was drawn.
- Profiles with an out-of-range name, user id, rating or time control are
  refused and the connection is closed; nothing is stored for them. Names
  and ratings from presence are bounded in the friends list too.
- The opponent's clock claim may not exceed what our clock gives them plus
  increment and slack, so a modified client cannot keep its time. The
  increment was also added twice on the receiving side; fixed.
- Joining a player from the nearby list checks that the profile belongs to
  the announced player and flags the opponent as unverified otherwise.
- Friend avatars and backgrounds move from one large settings value to one
  file per image; existing entries are migrated on first read.
- The in-game chat keeps the last 200 messages.
2026-11-12 17:03:05 +02:00
41 changed files with 568 additions and 131 deletions
+1
View File
@@ -0,0 +1 @@
ko_fi: skysparkle
+3 -3
View File
@@ -1,5 +1,5 @@
blank_issues_enabled: true blank_issues_enabled: true
contact_links: contact_links:
- name: Main repository on git.skysparkle.cc - name: Support the project on Ko-fi
url: https://git.skysparkle.cc/kalarina/Matewave url: https://ko-fi.com/skysparkle
about: This GitHub repository is a mirror. Issues are welcome here and on Gitea. about: Donations keep the apps and the Skysparkle server running.
+1 -1
View File
@@ -4,7 +4,7 @@ Thanks for wanting to help! This guide explains where to contribute, what fits t
## Where to contribute ## Where to contribute
Issues and pull requests go to the repository on [Gitea](https://git.skysparkle.cc/kalarina/Matewave). Issues and pull requests go to the repository on [GitHub](https://github.com/kalarina-bit/Matewave).
## Ways to help ## Ways to help
+15 -6
View File
@@ -9,8 +9,12 @@
Play against the AI, solve puzzles, learn openings, or play friends nearby over Bluetooth and Wi-Fi/LAN. Play against the AI, solve puzzles, learn openings, or play friends nearby over Bluetooth and Wi-Fi/LAN.
</p> </p>
<p align="center">
<a href="https://ko-fi.com/skysparkle"><img src="https://ko-fi.com/img/githubbutton_sm.svg" alt="Support me on Ko-fi"></a>
</p>
> [!IMPORTANT] > [!IMPORTANT]
> **Matewave is coming to Google Play!** The app is now in closed testing there ahead of the public release. Ideas, wishes and suggestions for improvement are very welcome — send them wherever is easiest for you: an issue on [Gitea](https://git.skysparkle.cc/kalarina/Matewave/issues) or [GitHub](https://github.com/kalarina-bit/Matewave/issues), or an email to [cuken107@proton.me](mailto:cuken107@proton.me). > **Matewave is coming to Google Play!** The app is now in closed testing there ahead of the public release. Ideas, wishes and suggestions for improvement are very welcome — send them wherever is easiest for you: an [issue on GitHub](https://github.com/kalarina-bit/Matewave/issues), or an email to [cuken107@proton.me](mailto:cuken107@proton.me).
> [!NOTE] > [!NOTE]
> **Looking for designers!** Matewave is looking for volunteer designers to help with icons, logos, animations, cover art (store graphics) and UI design. This is unpaid help for an open-source project. If you're interested, write to [cuken107@proton.me](mailto:cuken107@proton.me). > **Looking for designers!** Matewave is looking for volunteer designers to help with icons, logos, animations, cover art (store graphics) and UI design. This is unpaid help for an open-source project. If you're interested, write to [cuken107@proton.me](mailto:cuken107@proton.me).
@@ -21,9 +25,8 @@
<p align="center"> <p align="center">
<a href="https://f-droid.org/packages/cc.skysparkle.matewave/"><img src="assets/get-it-on%20(1).png" height="56" alt="Get it on F-Droid"></a> <a href="https://f-droid.org/packages/cc.skysparkle.matewave/"><img src="assets/get-it-on%20(1).png" height="56" alt="Get it on F-Droid"></a>
<a href="https://apps.obtainium.imranr.dev/redirect?r=obtainium://add/https://git.skysparkle.cc/kalarina/Matewave"><img src="assets/badge_obtainium.png" height="56" alt="Get it on Obtainium"></a> <a href="https://apps.obtainium.imranr.dev/redirect?r=obtainium://add/https://github.com/kalarina-bit/Matewave"><img src="assets/badge_obtainium.png" height="56" alt="Get it on Obtainium"></a>
<a href="https://github.com/kalarina-bit/Matewave/releases/latest"><img src="assets/get-it-on-github.png" height="56" alt="Get it on GitHub"></a> <a href="https://github.com/kalarina-bit/Matewave/releases/latest"><img src="assets/get-it-on-github.png" height="56" alt="Get it on GitHub"></a>
<a href="https://git.skysparkle.cc/kalarina/Matewave/releases"><img src="assets/get-it-on-gitea.png" height="56" alt="Get it on Gitea"></a>
</p> </p>
<p align="center"> <p align="center">
@@ -50,8 +53,8 @@
## <img src="assets/icon-install.png" width="32" alt=""> Installation ## <img src="assets/icon-install.png" width="32" alt=""> Installation
- **[F-Droid](https://f-droid.org/packages/cc.skysparkle.matewave/)** — install and update through the F-Droid client. - **[F-Droid](https://f-droid.org/packages/cc.skysparkle.matewave/)** — install and update through the F-Droid client.
- **[Obtainium](https://apps.obtainium.imranr.dev/redirect?r=obtainium://add/https://git.skysparkle.cc/kalarina/Matewave)** — installs the APK straight from Gitea releases and keeps it up to date. - **[Obtainium](https://apps.obtainium.imranr.dev/redirect?r=obtainium://add/https://github.com/kalarina-bit/Matewave)** — installs the APK straight from GitHub releases and keeps it up to date.
- **Manually** — download the latest APK from [GitHub](https://github.com/kalarina-bit/Matewave/releases/latest) or [Gitea](https://git.skysparkle.cc/kalarina/Matewave/releases), allow installs from unknown sources for the app you open it with (Settings → Apps → Special access → Install unknown apps), then open the `.apk` and confirm. - **Manually** — download the latest APK from [GitHub Releases](https://github.com/kalarina-bit/Matewave/releases/latest), allow installs from unknown sources for the app you open it with (Settings → Apps → Special access → Install unknown apps), then open the `.apk` and confirm.
## <img src="assets/icon-verify.png" width="32" alt=""> Verifying a download ## <img src="assets/icon-verify.png" width="32" alt=""> Verifying a download
@@ -82,7 +85,13 @@ Nearby multiplayer needs two physical devices — the emulator has no real Bluet
## 🤝 Contributing ## 🤝 Contributing
Bug reports, puzzle and opening fixes, translation fixes and pull requests are welcome in the [issue tracker](https://git.skysparkle.cc/kalarina/Matewave/issues). Please read [CONTRIBUTING.md](CONTRIBUTING.md) first — it explains what fits the project and how to send changes. To open an issue or a pull request, [create an account](https://git.skysparkle.cc/user/sign_up) on this Gitea. Bug reports, puzzle and opening fixes, translation fixes and pull requests are welcome in the [issue tracker](https://github.com/kalarina-bit/Matewave/issues). Please read [CONTRIBUTING.md](CONTRIBUTING.md) first — it explains what fits the project and how to send changes.
## ☕ Support
Matewave is free, open source and has no ads. If it is useful to you, you can support the project on [Ko-fi](https://ko-fi.com/skysparkle) — donations pay for the Skysparkle server and the time spent on the apps.
<a href="https://ko-fi.com/skysparkle"><img src="https://ko-fi.com/img/githubbutton_sm.svg" alt="Support me on Ko-fi"></a>
## 📄 License ## 📄 License
+15 -16
View File
@@ -1,7 +1,6 @@
plugins { plugins {
id("com.android.application") alias(libs.plugins.android.application)
alias(libs.plugins.kotlin.compose)
id("org.jetbrains.kotlin.plugin.compose")
} }
android { android {
@@ -13,8 +12,8 @@ android {
applicationId = "cc.skysparkle.matewave" applicationId = "cc.skysparkle.matewave"
minSdk = 26 minSdk = 26
targetSdk = 36 targetSdk = 36
versionCode = 10 versionCode = 11
versionName = "1.0.50" versionName = "1.0.51"
} }
buildTypes { buildTypes {
@@ -86,20 +85,20 @@ androidComponents {
} }
dependencies { dependencies {
implementation(platform("androidx.compose:compose-bom:2026.09.00")) implementation(platform(libs.androidx.compose.bom))
implementation("androidx.compose.material3:material3") implementation(libs.androidx.compose.material3)
implementation("androidx.compose.ui:ui") implementation(libs.androidx.compose.ui)
implementation("androidx.activity:activity-compose:1.13.0") implementation(libs.androidx.activity.compose)
implementation("androidx.core:core-ktx:1.18.0") implementation(libs.androidx.core.ktx)
implementation("androidx.navigation:navigation-compose:2.9.7") implementation(libs.androidx.navigation.compose)
implementation("androidx.lifecycle:lifecycle-viewmodel-compose:2.11.0") implementation(libs.androidx.lifecycle.viewmodel.compose)
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.11.0") implementation(libs.kotlinx.coroutines.android)
implementation("com.google.zxing:core:3.5.4") implementation(libs.zxing.core)
testImplementation("junit:junit:4.13.2") testImplementation(libs.junit)
testImplementation("org.json:json:20240303") testImplementation(libs.org.json)
} }
+6
View File
@@ -2,3 +2,9 @@
# reflection. Only keep line numbers so release crash reports stay readable. # reflection. Only keep line numbers so release crash reports stay readable.
-keepattributes SourceFile,LineNumberTable -keepattributes SourceFile,LineNumberTable
-renamesourcefileattribute SourceFile -renamesourcefileattribute SourceFile
# Debug and verbose logging (NetworkLog included) is stripped from release builds.
-assumenosideeffects class android.util.Log {
public static int d(...);
public static int v(...);
}
+1
View File
@@ -36,6 +36,7 @@
android:icon="@mipmap/ic_launcher" android:icon="@mipmap/ic_launcher"
android:roundIcon="@mipmap/ic_launcher_round" android:roundIcon="@mipmap/ic_launcher_round"
android:label="@string/app_title" android:label="@string/app_title"
android:localeConfig="@xml/locales_config"
android:networkSecurityConfig="@xml/network_security_config" android:networkSecurityConfig="@xml/network_security_config"
android:theme="@android:style/Theme.Material.NoActionBar" android:theme="@android:style/Theme.Material.NoActionBar"
android:supportsRtl="true"> android:supportsRtl="true">
@@ -333,9 +333,12 @@ private fun AppNavHost() {
viewModel.startVsPlayerNetwork(transport, PieceColor.WHITE, timeControl, isHost = true) viewModel.startVsPlayerNetwork(transport, PieceColor.WHITE, timeControl, isHost = true)
navController.navigate("game") navController.navigate("game")
}, },
onJoin = { type, timeControl, targetId -> onJoin = { type, timeControl, targetId, expectedUserId ->
val transport = if (type == TransportType.BLUETOOTH) bleTransport else lanTransport val transport = if (type == TransportType.BLUETOOTH) bleTransport else lanTransport
viewModel.startVsPlayerNetwork(transport, PieceColor.BLACK, timeControl, isHost = false, targetId = targetId) viewModel.startVsPlayerNetwork(
transport, PieceColor.BLACK, timeControl, isHost = false,
targetId = targetId, expectedUserId = expectedUserId
)
navController.navigate("game") navController.navigate("game")
}, },
onBack = { navController.popBackStack() } onBack = { navController.popBackStack() }
@@ -98,6 +98,12 @@ class GameClock(private val timeControl: TimeControl, private val scope: Corouti
publish() publish()
} }
/** Time left for [side] right now, including the part of the current second already used. */
fun remainingMillis(side: PieceColor): Long {
account()
return if (side == PieceColor.WHITE) whiteLeft else blackLeft
}
fun restore(whiteMillis: Long, blackMillis: Long) { fun restore(whiteMillis: Long, blackMillis: Long) {
if (unlimited) return if (unlimited) return
account() account()
@@ -2,8 +2,12 @@ package cc.skysparkle.matewave.data
import cc.skysparkle.matewave.ai.AiDifficulty import cc.skysparkle.matewave.ai.AiDifficulty
import android.content.Context import android.content.Context
import cc.skysparkle.matewave.network.PeerLimits
import cc.skysparkle.matewave.security.toHex
import org.json.JSONArray import org.json.JSONArray
import org.json.JSONObject import org.json.JSONObject
import java.io.File
import java.security.MessageDigest
import kotlin.math.pow import kotlin.math.pow
import kotlin.math.roundToInt import kotlin.math.roundToInt
@@ -111,6 +115,7 @@ object FriendsStore {
private const val PREFS = "chess_friends_prefs" private const val PREFS = "chess_friends_prefs"
private const val KEY_LIST = "friends_json" private const val KEY_LIST = "friends_json"
private const val MAX_FRIENDS = 30 private const val MAX_FRIENDS = 30
private const val IMAGE_DIR = "friend_images"
private var appContext: Context? = null private var appContext: Context? = null
@@ -125,6 +130,36 @@ object FriendsStore {
private fun prefs() = appContext?.getSharedPreferences(PREFS, Context.MODE_PRIVATE) private fun prefs() = appContext?.getSharedPreferences(PREFS, Context.MODE_PRIVATE)
// Avatars and backgrounds live in files, one per image: in the settings XML they made a file
// of up to tens of megabytes that was read at start and rewritten on every change.
private fun imageDir(): File? = appContext?.let { File(it.filesDir, IMAGE_DIR) }
private fun imageFile(userId: String, kind: String): File? {
val dir = imageDir() ?: return null
val digest = MessageDigest.getInstance("SHA-256").digest(userId.toByteArray(Charsets.UTF_8))
return File(dir, "${digest.toHex(16)}_$kind")
}
private fun readImage(userId: String, kind: String): String? =
imageFile(userId, kind)?.takeIf { it.isFile }?.let { runCatching { it.readText() }.getOrNull() }
private fun writeImage(userId: String, kind: String, base64: String?) {
val file = imageFile(userId, kind) ?: return
if (base64 == null) {
file.delete()
return
}
runCatching {
file.parentFile?.mkdirs()
val tmp = File(file.parentFile, file.name + ".tmp")
tmp.writeText(base64)
if (!tmp.renameTo(file)) {
file.delete()
tmp.renameTo(file)
}
}
}
fun list(): List<FriendEntry> = synchronized(lock) { readAll() } fun list(): List<FriendEntry> = synchronized(lock) { readAll() }
private fun readAll(): List<FriendEntry> { private fun readAll(): List<FriendEntry> {
@@ -136,15 +171,21 @@ object FriendsStore {
return emptyList() return emptyList()
} }
val result = ArrayList<FriendEntry>() val result = ArrayList<FriendEntry>()
var hasInlineImages = false
for (i in 0 until arr.length()) { for (i in 0 until arr.length()) {
try { try {
val o = arr.getJSONObject(i) val o = arr.getJSONObject(i)
val userId = o.optString("uid", "").ifBlank { o.getString("name") }
// Older versions kept the images inline; they move to files on the next write.
val inlineAvatar = if (o.has("avatar")) o.getString("avatar") else null
val inlineBackground = if (o.has("background")) o.getString("background") else null
if (inlineAvatar != null || inlineBackground != null) hasInlineImages = true
result.add( result.add(
FriendEntry( FriendEntry(
userId = o.optString("uid", "").ifBlank { o.getString("name") }, userId = userId,
name = o.getString("name"), name = o.getString("name"),
avatarBase64 = if (o.has("avatar")) o.getString("avatar") else null, avatarBase64 = inlineAvatar ?: if (o.optBoolean("a")) readImage(userId, "a") else null,
backgroundBase64 = if (o.has("background")) o.getString("background") else null, backgroundBase64 = inlineBackground ?: if (o.optBoolean("b")) readImage(userId, "b") else null,
elo = o.optInt("elo", 1200), elo = o.optInt("elo", 1200),
lastPlayedMs = o.optLong("t", 0), lastPlayedMs = o.optLong("t", 0),
favorite = o.optBoolean("fav", false), favorite = o.optBoolean("fav", false),
@@ -156,24 +197,35 @@ object FriendsStore {
} }
val sorted = result.sortedByDescending { it.lastPlayedMs } val sorted = result.sortedByDescending { it.lastPlayedMs }
cached = sorted cached = sorted
if (hasInlineImages) writeAll(sorted, previous = emptyList())
return sorted return sorted
} }
private fun writeAll(entries: List<FriendEntry>) { private fun writeAll(entries: List<FriendEntry>, previous: List<FriendEntry> = readAll()) {
val p = prefs() ?: return val p = prefs() ?: return
val before = previous.associateBy { it.userId }
val arr = JSONArray() val arr = JSONArray()
entries.forEach { f -> entries.forEach { f ->
val old = before[f.userId]
// Image files are touched only when the image itself changed.
if (old == null || old.avatarBase64 != f.avatarBase64) writeImage(f.userId, "a", f.avatarBase64)
if (old == null || old.backgroundBase64 != f.backgroundBase64) writeImage(f.userId, "b", f.backgroundBase64)
val o = JSONObject() val o = JSONObject()
o.put("uid", f.userId) o.put("uid", f.userId)
o.put("name", f.name) o.put("name", f.name)
if (f.avatarBase64 != null) o.put("avatar", f.avatarBase64) if (f.avatarBase64 != null) o.put("a", true)
if (f.backgroundBase64 != null) o.put("background", f.backgroundBase64) if (f.backgroundBase64 != null) o.put("b", true)
o.put("elo", f.elo) o.put("elo", f.elo)
o.put("t", f.lastPlayedMs) o.put("t", f.lastPlayedMs)
if (f.favorite) o.put("fav", true) if (f.favorite) o.put("fav", true)
if (f.lastSeenMs > 0) o.put("s", f.lastSeenMs) if (f.lastSeenMs > 0) o.put("s", f.lastSeenMs)
arr.put(o) arr.put(o)
} }
val kept = entries.mapTo(HashSet()) { it.userId }
previous.filter { it.userId !in kept }.forEach { gone ->
writeImage(gone.userId, "a", null)
writeImage(gone.userId, "b", null)
}
p.edit().putString(KEY_LIST, arr.toString()).apply() p.edit().putString(KEY_LIST, arr.toString()).apply()
cached = entries.sortedByDescending { it.lastPlayedMs } cached = entries.sortedByDescending { it.lastPlayedMs }
} }
@@ -182,6 +234,11 @@ object FriendsStore {
synchronized(lock) { readAll() } synchronized(lock) { readAll() }
} }
// Names and ratings also arrive from presence announcements, so they are bounded here too.
private fun cleanName(name: String): String = name.filterNot { it.isISOControl() }.take(PeerLimits.MAX_NAME_CHARS)
private fun cleanElo(elo: Int): Int = elo.coerceIn(PeerLimits.MIN_ELO, PeerLimits.MAX_ELO)
fun updateProfile( fun updateProfile(
userId: String, userId: String,
name: String, name: String,
@@ -192,8 +249,8 @@ object FriendsStore {
synchronized(lock) { synchronized(lock) {
val existing = readAll().firstOrNull { it.userId == userId } ?: return val existing = readAll().firstOrNull { it.userId == userId } ?: return
val updated = existing.copy( val updated = existing.copy(
name = name.ifBlank { existing.name }, name = cleanName(name).ifBlank { existing.name },
elo = if (elo > 0) elo else existing.elo, elo = if (elo > 0) cleanElo(elo) else existing.elo,
avatarBase64 = avatarBase64 ?: existing.avatarBase64, avatarBase64 = avatarBase64 ?: existing.avatarBase64,
backgroundBase64 = backgroundBase64 ?: existing.backgroundBase64 backgroundBase64 = backgroundBase64 ?: existing.backgroundBase64
) )
@@ -217,12 +274,13 @@ object FriendsStore {
backgroundBase64: String? = null backgroundBase64: String? = null
): FriendEntry = synchronized(lock) { ): FriendEntry = synchronized(lock) {
val existing = readAll().firstOrNull { it.userId == userId } val existing = readAll().firstOrNull { it.userId == userId }
val clean = cleanName(name)
val merged = FriendEntry( val merged = FriendEntry(
userId = userId, userId = userId,
name = name.ifBlank { existing?.name ?: name }, name = clean.ifBlank { existing?.name ?: clean },
avatarBase64 = avatarBase64 ?: existing?.avatarBase64, avatarBase64 = avatarBase64 ?: existing?.avatarBase64,
backgroundBase64 = backgroundBase64 ?: existing?.backgroundBase64, backgroundBase64 = backgroundBase64 ?: existing?.backgroundBase64,
elo = if (elo > 0) elo else (existing?.elo ?: 1200), elo = if (elo > 0) cleanElo(elo) else (existing?.elo ?: 1200),
lastPlayedMs = System.currentTimeMillis(), lastPlayedMs = System.currentTimeMillis(),
favorite = existing?.favorite ?: false, favorite = existing?.favorite ?: false,
lastSeenMs = existing?.lastSeenMs ?: 0 lastSeenMs = existing?.lastSeenMs ?: 0
@@ -73,6 +73,9 @@ class BleTransport(
private const val INCOMPLETE_TTL_MS = 30_000L private const val INCOMPLETE_TTL_MS = 30_000L
/** Messages being reassembled at once; each may grow to [MAX_MESSAGE_BYTES]. */
private const val MAX_PARTIAL_MESSAGES = 4
private const val CTRL_TOTAL_MARKER = 0 private const val CTRL_TOTAL_MARKER = 0
private const val CTRL_ACK = 1 private const val CTRL_ACK = 1
private const val CTRL_NACK = 2 private const val CTRL_NACK = 2
@@ -232,6 +235,8 @@ class BleTransport(
role = Role.PERIPHERAL role = Role.PERIPHERAL
hosting = true hosting = true
// Presence may already be advertising in the low-power mode; restart it for hosting.
if (advertisingActive || advertiseCallback != null) startAdvertising()
startPresence() startPresence()
_connectionState.value = ConnectionState.CONNECTING _connectionState.value = ConnectionState.CONNECTING
} }
@@ -300,10 +305,14 @@ class BleTransport(
} }
// One advertisement at a time: a second start would leak the first one. // One advertisement at a time: a second start would leak the first one.
if (advertiseCallback != null) stopAdvertising() if (advertiseCallback != null) stopAdvertising()
// A hosted game should be found at once; plain presence can save the battery.
val settings = AdvertiseSettings.Builder() val settings = AdvertiseSettings.Builder()
.setAdvertiseMode(
.setAdvertiseMode(AdvertiseSettings.ADVERTISE_MODE_LOW_LATENCY) if (hosting) AdvertiseSettings.ADVERTISE_MODE_LOW_LATENCY else AdvertiseSettings.ADVERTISE_MODE_BALANCED
.setTxPowerLevel(AdvertiseSettings.ADVERTISE_TX_POWER_HIGH) )
.setTxPowerLevel(
if (hosting) AdvertiseSettings.ADVERTISE_TX_POWER_HIGH else AdvertiseSettings.ADVERTISE_TX_POWER_MEDIUM
)
.setConnectable(true) .setConnectable(true)
.build() .build()
@@ -790,6 +799,11 @@ class BleTransport(
val now = System.currentTimeMillis() val now = System.currentTimeMillis()
incoming.entries.removeAll { now - it.value.startedAt > INCOMPLETE_TTL_MS } incoming.entries.removeAll { now - it.value.startedAt > INCOMPLETE_TTL_MS }
if (messageId !in incoming && incoming.size >= MAX_PARTIAL_MESSAGES) {
// A peer that starts many messages and never finishes them would fill the memory.
incoming.minByOrNull { it.value.startedAt }?.let { incoming.remove(it.key) }
NetworkLog.log("BLE", "Too many unfinished messages, oldest dropped")
}
val entry = incoming.getOrPut(messageId) { PartialMessage(total, now) } val entry = incoming.getOrPut(messageId) { PartialMessage(total, now) }
if (entry.total != total) { if (entry.total != total) {
incoming[messageId] = PartialMessage(total, now).also { it.parts[index] = payload } incoming[messageId] = PartialMessage(total, now).also { it.parts[index] = payload }
@@ -29,6 +29,8 @@ data class LanPeer(
val fingerprint: String = "", val fingerprint: String = "",
val signature: String = "", val signature: String = "",
/** When the announcement was signed, in epoch seconds; 0 if the peer sent none. */
val signedAtSeconds: Long = 0,
/** Raw NSD service name, used to remove the peer when the service is lost. */ /** Raw NSD service name, used to remove the peer when the service is lost. */
val serviceName: String = "", val serviceName: String = "",
/** Tag of the LAN game the peer plays, empty when not in one. */ /** Tag of the LAN game the peer plays, empty when not in one. */
@@ -59,8 +61,22 @@ class LanTransport(
const val RESOLVE_RETRY_MS = 400L const val RESOLVE_RETRY_MS = 400L
fun presencePayload(playerId: String, name: String, elo: Int): String = /**
"presence|$playerId|$name|$elo" * Signed presence announcement. The signing time is part of it, so a recorded
* announcement stops being accepted after [PRESENCE_MAX_AGE_MS]; older versions, which
* signed without it, are no longer accepted at all.
*/
fun presencePayload(playerId: String, name: String, elo: Int, signedAtSeconds: Long): String =
"presence2|$playerId|$name|$elo|$signedAtSeconds"
/** How old (or how far ahead, for a clock set wrong) a signed announcement may be. */
const val PRESENCE_MAX_AGE_MS = 15 * 60_000L
/** The announcement is signed anew this often, well within [PRESENCE_MAX_AGE_MS]. */
const val PRESENCE_RESIGN_MS = 5 * 60_000L
fun isFreshPresence(signedAtSeconds: Long, nowMs: Long): Boolean =
signedAtSeconds > 0 && kotlin.math.abs(nowMs - signedAtSeconds * 1000L) <= PRESENCE_MAX_AGE_MS
} }
override val type = TransportType.LAN override val type = TransportType.LAN
@@ -72,7 +88,8 @@ class LanTransport(
context.getSystemService(Context.NSD_SERVICE) as? NsdManager context.getSystemService(Context.NSD_SERVICE) as? NsdManager
private var serverSocket: ServerSocket? = null private var serverSocket: ServerSocket? = null
private var socket: Socket? = null // Written by the connect and accept paths, read by the writer coroutine.
@Volatile private var socket: Socket? = null
private val socketLock = Any() private val socketLock = Any()
@@ -82,7 +99,7 @@ class LanTransport(
socket = candidate socket = candidate
true true
} }
private var output: OutputStream? = null @Volatile private var output: OutputStream? = null
private val dispatcher = MessageDispatcher() private val dispatcher = MessageDispatcher()
@Volatile private var hosting = false @Volatile private var hosting = false
@@ -91,6 +108,9 @@ class LanTransport(
private var registeredServiceName: String? = null private var registeredServiceName: String? = null
// Re-signs the announcement before it gets too old to be accepted.
private var resignJob: kotlinx.coroutines.Job? = null
private val ownServiceName: String by lazy { private val ownServiceName: String by lazy {
val fingerprint = cc.skysparkle.matewave.security.DeviceKeys.publicKeyFingerprint(context) val fingerprint = cc.skysparkle.matewave.security.DeviceKeys.publicKeyFingerprint(context)
?: cc.skysparkle.matewave.data.DeviceIdentity.deviceId(context).take(12) ?: cc.skysparkle.matewave.data.DeviceIdentity.deviceId(context).take(12)
@@ -211,13 +231,15 @@ class LanTransport(
val profile = cc.skysparkle.matewave.data.ProfileStore.get() val profile = cc.skysparkle.matewave.data.ProfileStore.get()
runCatching { runCatching {
val shownName = profile.name.take(40) val shownName = profile.name.take(40)
val signedAt = System.currentTimeMillis() / 1000L
setAttribute("id", profile.userId) setAttribute("id", profile.userId)
setAttribute("name", shownName) setAttribute("name", shownName)
setAttribute("elo", profile.elo.toString()) setAttribute("elo", profile.elo.toString())
setAttribute("fp", cc.skysparkle.matewave.security.DeviceKeys.publicKeyFingerprint(context) ?: "") setAttribute("fp", cc.skysparkle.matewave.security.DeviceKeys.publicKeyFingerprint(context) ?: "")
setAttribute("ts", signedAt.toString())
cc.skysparkle.matewave.security.DeviceKeys.sign( cc.skysparkle.matewave.security.DeviceKeys.sign(
context, presencePayload(profile.userId, shownName, profile.elo) context, presencePayload(profile.userId, shownName, profile.elo, signedAt)
)?.let { setAttribute("sig", it) } )?.let { setAttribute("sig", it) }
cc.skysparkle.matewave.spectate.SpectatorAdvert.attributes().forEach { (key, value) -> setAttribute(key, value) } cc.skysparkle.matewave.spectate.SpectatorAdvert.attributes().forEach { (key, value) -> setAttribute(key, value) }
} }
@@ -240,9 +262,15 @@ class LanTransport(
nsd.registerService(info, NsdManager.PROTOCOL_DNS_SD, listener) nsd.registerService(info, NsdManager.PROTOCOL_DNS_SD, listener)
} catch (_: Exception) { } catch (_: Exception) {
} }
resignJob = scope.launch {
kotlinx.coroutines.delay(PRESENCE_RESIGN_MS)
republishProfile()
}
} }
private fun unregisterService() { private fun unregisterService() {
resignJob?.cancel()
resignJob = null
val nsd = nsdManager ?: return val nsd = nsdManager ?: return
registrationListener?.let { registrationListener?.let {
try { nsd.unregisterService(it) } catch (_: Exception) {} try { nsd.unregisterService(it) } catch (_: Exception) {}
@@ -362,6 +390,7 @@ class LanTransport(
fingerprint = attr("fp").ifEmpty { fingerprintFromServiceName(info.serviceName ?: "") ?: "" }, fingerprint = attr("fp").ifEmpty { fingerprintFromServiceName(info.serviceName ?: "") ?: "" },
signature = attr("sig"), signature = attr("sig"),
signedAtSeconds = attr("ts").toLongOrNull() ?: 0,
serviceName = info.serviceName ?: "", serviceName = info.serviceName ?: "",
gameTag = game.gameTag, gameTag = game.gameTag,
spectatePort = game.spectatePort spectatePort = game.spectatePort
@@ -1,8 +1,8 @@
package cc.skysparkle.matewave.network package cc.skysparkle.matewave.network
import android.util.Log
import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.MutableStateFlow
import kotlinx.coroutines.flow.StateFlow import kotlinx.coroutines.flow.StateFlow
import kotlinx.coroutines.flow.update
enum class DisconnectReason(val userText: String, val textRes: Int) { enum class DisconnectReason(val userText: String, val textRes: Int) {
NONE("—", cc.skysparkle.matewave.R.string.reason_unknown), NONE("—", cc.skysparkle.matewave.R.string.reason_unknown),
@@ -18,23 +18,13 @@ enum class DisconnectReason(val userText: String, val textRes: Int) {
PORT_BUSY("Could not open port", cc.skysparkle.matewave.R.string.reason_port_busy) PORT_BUSY("Could not open port", cc.skysparkle.matewave.R.string.reason_port_busy)
} }
data class NetworkEvent(
val at: Long,
val transport: String,
val text: String
)
object NetworkLog { object NetworkLog {
private const val CAPACITY = 60
private val _events = MutableStateFlow<List<NetworkEvent>>(emptyList())
private val _lastReason = MutableStateFlow(DisconnectReason.NONE) private val _lastReason = MutableStateFlow(DisconnectReason.NONE)
val lastReason: StateFlow<DisconnectReason> = _lastReason val lastReason: StateFlow<DisconnectReason> = _lastReason
/** Debug output only: release builds strip Log.d (see proguard-rules.pro). */
fun log(transport: String, text: String) { fun log(transport: String, text: String) {
val event = NetworkEvent(System.currentTimeMillis(), transport, text) Log.d("Matewave/$transport", text)
_events.update { (it + event).takeLast(CAPACITY) }
} }
fun reason(transport: String, reason: DisconnectReason, detail: String? = null) { fun reason(transport: String, reason: DisconnectReason, detail: String? = null) {
@@ -0,0 +1,39 @@
package cc.skysparkle.matewave.network
/** Bounds for what another device may send us; anything outside them is not stored or used. */
object PeerLimits {
const val MAX_NAME_CHARS = 40
const val MAX_USER_ID_CHARS = 64
const val MIN_ELO = 100
const val MAX_ELO = 3000
const val MAX_INITIAL_SECONDS = 3 * 60 * 60
const val MAX_INCREMENT_SECONDS = 180
/** "No time limit" is sent as Int.MAX_VALUE; 0 means the peer sent no time control. */
private fun isTimeControl(initialSeconds: Int, incrementSeconds: Int): Boolean =
(initialSeconds == 0 || initialSeconds == Int.MAX_VALUE || initialSeconds in 1..MAX_INITIAL_SECONDS) &&
incrementSeconds in 0..MAX_INCREMENT_SECONDS
fun isPlausibleName(name: String): Boolean =
name.isNotBlank() && name.length <= MAX_NAME_CHARS && name.none { it.isISOControl() }
fun isPlausibleUserId(userId: String): Boolean =
userId.isNotBlank() && userId.length <= MAX_USER_ID_CHARS && userId.none { it.isISOControl() }
/**
* Checked before the profile is trusted or stored. The fields are signed as they are, so an
* out-of-range profile is refused rather than trimmed.
*/
fun isPlausibleProfile(msg: GameMessage.ProfileMsg): Boolean =
isPlausibleUserId(msg.userId) &&
isPlausibleName(msg.name) &&
msg.elo in MIN_ELO..MAX_ELO &&
isTimeControl(msg.initialSeconds, msg.incrementSeconds)
/**
* The most the opponent's clock may show after their move: what our clock gives them, plus
* the increment and some slack for network delay. A higher claim would mean time not spent.
*/
fun maxOpponentClockAfterMove(localRemainingMs: Long, incrementMs: Long, toleranceMs: Long): Long =
localRemainingMs.coerceAtLeast(0) + incrementMs + toleranceMs
}
@@ -141,13 +141,19 @@ class LocalPresence(
val knownKey = knownPeers.publicKeyOf(id) val knownKey = knownPeers.publicKeyOf(id)
if (knownKey != null) { if (knownKey != null) {
val authentic = peer.signature.isNotEmpty() && DeviceKeys.verify( // A known friend must send a fresh announcement signed with their key: an old one
// recorded and replayed by someone else is not accepted.
val authentic = peer.signature.isNotEmpty() &&
cc.skysparkle.matewave.network.LanTransport.isFreshPresence(peer.signedAtSeconds, lastResultAt) &&
DeviceKeys.verify(
knownKey, knownKey,
cc.skysparkle.matewave.network.LanTransport.presencePayload(peer.playerId, peer.displayName, peer.elo), cc.skysparkle.matewave.network.LanTransport.presencePayload(
peer.playerId, peer.displayName, peer.elo, peer.signedAtSeconds
),
peer.signature peer.signature
) )
if (!authentic) { if (!authentic) {
NetworkLog.log("PRESENCE", "Announcement for $id failed signature check, hidden") NetworkLog.log("PRESENCE", "Announcement for $id is stale or failed signature check, hidden")
return@forEach return@forEach
} }
FriendsStore.updateProfile( FriendsStore.updateProfile(
@@ -6,8 +6,10 @@ import android.net.Uri
/** External links of the app, kept in one place. */ /** External links of the app, kept in one place. */
object AppLinks { object AppLinks {
const val REPOSITORY = "https://git.skysparkle.cc/kalarina/Matewave" const val REPOSITORY = "https://github.com/kalarina-bit/Matewave"
const val REPOSITORY_LABEL = "git.skysparkle.cc/kalarina/Matewave" const val REPOSITORY_LABEL = "github.com/kalarina-bit/Matewave"
const val DONATE = "https://ko-fi.com/skysparkle"
const val DONATE_LABEL = "ko-fi.com/skysparkle"
const val PRIVACY_POLICY = "https://skysparkle.cc/privacy?lang=en" const val PRIVACY_POLICY = "https://skysparkle.cc/privacy?lang=en"
/** Opens a link in the browser; does nothing if no app can open it. */ /** Opens a link in the browser; does nothing if no app can open it. */
@@ -5,10 +5,12 @@ import java.io.File
import java.io.IOException import java.io.IOException
import java.io.OutputStream import java.io.OutputStream
import java.net.Inet4Address import java.net.Inet4Address
import java.net.InetSocketAddress
import java.net.NetworkInterface import java.net.NetworkInterface
import java.net.ServerSocket import java.net.ServerSocket
import java.net.Socket import java.net.Socket
import java.util.Locale import java.util.Locale
import java.util.concurrent.atomic.AtomicInteger
import kotlin.concurrent.thread import kotlin.concurrent.thread
class ApkShareServer(private val apk: File, private val appName: String) { class ApkShareServer(private val apk: File, private val appName: String) {
@@ -17,8 +19,13 @@ class ApkShareServer(private val apk: File, private val appName: String) {
@Volatile @Volatile
private var server: ServerSocket? = null private var server: ServerSocket? = null
private val activeClients = AtomicInteger()
/** Listens on the Wi-Fi address only (all interfaces if none is found), so the APK is not served elsewhere. */
fun start(): Int { fun start(): Int {
val socket = ServerSocket(0) val socket = ServerSocket()
socket.reuseAddress = true
socket.bind(InetSocketAddress(LocalNetwork.wifiInet4(), 0))
server = socket server = socket
thread(name = "apk-share-accept", isDaemon = true) { thread(name = "apk-share-accept", isDaemon = true) {
while (!socket.isClosed) { while (!socket.isClosed) {
@@ -27,7 +34,19 @@ class ApkShareServer(private val apk: File, private val appName: String) {
} catch (e: IOException) { } catch (e: IOException) {
break break
} }
thread(name = "apk-share-client", isDaemon = true) { serve(client) } // A handful of downloads at a time is plenty; more connections are refused.
if (activeClients.incrementAndGet() > MAX_CLIENTS) {
activeClients.decrementAndGet()
runCatching { client.close() }
continue
}
thread(name = "apk-share-client", isDaemon = true) {
try {
serve(client)
} finally {
activeClients.decrementAndGet()
}
}
} }
} }
return socket.localPort return socket.localPort
@@ -78,6 +97,10 @@ class ApkShareServer(private val apk: File, private val appName: String) {
} }
} }
private companion object {
const val MAX_CLIENTS = 4
}
private fun sendText(out: OutputStream, code: Int, reason: String, text: String, withBody: Boolean) { private fun sendText(out: OutputStream, code: Int, reason: String, text: String, withBody: Boolean) {
val body = text.toByteArray(Charsets.UTF_8) val body = text.toByteArray(Charsets.UTF_8)
writeHeader(out, code, reason, "text/plain; charset=utf-8", body.size.toLong()) writeHeader(out, code, reason, "text/plain; charset=utf-8", body.size.toLong())
@@ -117,12 +140,13 @@ class ApkShareServer(private val apk: File, private val appName: String) {
object LocalNetwork { object LocalNetwork {
private val WIFI_PREFIXES = listOf("wlan", "swlan", "ap", "softap", "eth") private val WIFI_PREFIXES = listOf("wlan", "swlan", "ap", "softap", "eth")
fun wifiIpv4(): String? = runCatching { fun wifiInet4(): Inet4Address? = runCatching {
NetworkInterface.getNetworkInterfaces()?.toList().orEmpty() NetworkInterface.getNetworkInterfaces()?.toList().orEmpty()
.filter { nif -> nif.isUp && !nif.isLoopback && WIFI_PREFIXES.any { nif.name.startsWith(it) } } .filter { nif -> nif.isUp && !nif.isLoopback && WIFI_PREFIXES.any { nif.name.startsWith(it) } }
.flatMap { nif -> nif.inetAddresses.toList() } .flatMap { nif -> nif.inetAddresses.toList() }
.filterIsInstance<Inet4Address>() .filterIsInstance<Inet4Address>()
.firstOrNull { it.isSiteLocalAddress } .firstOrNull { it.isSiteLocalAddress }
?.hostAddress
}.getOrNull() }.getOrNull()
fun wifiIpv4(): String? = wifiInet4()?.hostAddress
} }
@@ -86,21 +86,46 @@ private object DecodedImageCache {
fun put(key: String, bitmap: Bitmap) { cache.put(key, bitmap) } fun put(key: String, bitmap: Bitmap) { cache.put(key, bitmap) }
} }
/** Larger images (from the opponent) are refused; ours never exceed [MAX_DIMENSION_PX]. */
const val MAX_INCOMING_IMAGE_PX = 4096
/** Upper bound for the decoded size when the caller does not ask for a smaller one. */
private const val DEFAULT_DECODE_PX = 1280
/** Width and height of an encoded image, or null if it is not a readable image. */
private fun imageBounds(bytes: ByteArray): Pair<Int, Int>? {
val bounds = BitmapFactory.Options().apply { inJustDecodeBounds = true }
BitmapFactory.decodeByteArray(bytes, 0, bytes.size, bounds)
return if (bounds.outWidth > 0 && bounds.outHeight > 0) bounds.outWidth to bounds.outHeight else null
}
/**
* Checks an image received from another device before it is shown or stored: it must be a
* readable image no larger than [MAX_INCOMING_IMAGE_PX] on either side. A small file can
* declare a huge resolution, and decoding it at full size would run out of memory.
*/
fun isAcceptableIncomingImage(base64: String): Boolean = try {
val size = imageBounds(Base64.decode(base64, Base64.NO_WRAP))
size != null && size.first <= MAX_INCOMING_IMAGE_PX && size.second <= MAX_INCOMING_IMAGE_PX
} catch (e: Exception) {
false
}
fun decodeChatImage(base64: String, maxDimension: Int = 0): Bitmap? { fun decodeChatImage(base64: String, maxDimension: Int = 0): Bitmap? {
return try { return try {
val bytes = Base64.decode(base64, Base64.NO_WRAP) val bytes = Base64.decode(base64, Base64.NO_WRAP)
if (maxDimension <= 0) { // The size is always checked first: the image may come from another device.
BitmapFactory.decodeByteArray(bytes, 0, bytes.size) val (width, height) = imageBounds(bytes) ?: return null
} else { if (width > MAX_INCOMING_IMAGE_PX || height > MAX_INCOMING_IMAGE_PX) return null
val bounds = BitmapFactory.Options().apply { inJustDecodeBounds = true } val target = if (maxDimension > 0) maxDimension else DEFAULT_DECODE_PX
BitmapFactory.decodeByteArray(bytes, 0, bytes.size, bounds)
var sample = 1 var sample = 1
while (maxOf(bounds.outWidth, bounds.outHeight) / (sample * 2) >= maxDimension) sample *= 2 while (maxOf(width, height) / (sample * 2) >= target) sample *= 2
val options = BitmapFactory.Options().apply { inSampleSize = sample } val options = BitmapFactory.Options().apply { inSampleSize = sample }
BitmapFactory.decodeByteArray(bytes, 0, bytes.size, options) BitmapFactory.decodeByteArray(bytes, 0, bytes.size, options)
}
} catch (e: Exception) { } catch (e: Exception) {
null null
} catch (e: OutOfMemoryError) {
null
} }
} }
@@ -77,14 +77,16 @@ private data class NearbyEntry(
val elo: Int?, val elo: Int?,
val type: TransportType, val type: TransportType,
val address: String, val address: String,
val avatar: String? val avatar: String?,
/** Player id from the signed Wi-Fi announcement; checked against the profile after connecting. */
val playerId: String? = null
) )
@Composable @Composable
fun ConnectionScreen( fun ConnectionScreen(
presence: LocalPresence, presence: LocalPresence,
onStartHost: (TimeControl) -> Unit, onStartHost: (TimeControl) -> Unit,
onJoin: (TransportType, TimeControl, targetId: String) -> Unit, onJoin: (TransportType, TimeControl, targetId: String, expectedUserId: String?) -> Unit,
onBack: () -> Unit onBack: () -> Unit
) { ) {
val context = LocalContext.current val context = LocalContext.current
@@ -146,7 +148,8 @@ fun ConnectionScreen(
elo = peer.elo, elo = peer.elo,
type = TransportType.LAN, type = TransportType.LAN,
address = peer.address, address = peer.address,
avatar = friends.firstOrNull { it.userId == peer.playerId }?.avatarBase64 avatar = friends.firstOrNull { it.userId == peer.playerId }?.avatarBase64,
playerId = peer.playerId
) )
} }
val lanFingerprints = peers.values.map { it.fingerprint }.filter { it.isNotEmpty() } val lanFingerprints = peers.values.map { it.fingerprint }.filter { it.isNotEmpty() }
@@ -263,7 +266,7 @@ fun ConnectionScreen(
modifier = Modifier modifier = Modifier
.clip(RoundedCornerShape(50)) .clip(RoundedCornerShape(50))
.background(Lime) .background(Lime)
.clickable { onJoin(entry.type, timeControl, entry.address) } .clickable { onJoin(entry.type, timeControl, entry.address, entry.playerId) }
.padding(horizontal = 14.dp, vertical = 6.dp) .padding(horizontal = 14.dp, vertical = 6.dp)
) )
} }
@@ -178,6 +178,23 @@ fun SettingsScreen(
onClick = { showAbout = true } onClick = { showAbout = true }
) )
} }
// Donation plaque with the app icon, last on the screen so it never gets in the way
ListGroup {
ListRow(
title = stringResource(R.string.support_title),
subtitle = stringResource(R.string.support_text),
leading = {
Image(
painter = painterResource(R.drawable.ic_launcher_card),
contentDescription = null,
modifier = Modifier.size(36.dp).clip(RoundedCornerShape(10.dp))
)
},
trailing = { cc.skysparkle.matewave.ui.components.AppIcon(R.drawable.ic_heart, size = 22.dp, tint = DonateRed) },
onClick = { cc.skysparkle.matewave.settings.AppLinks.open(context, cc.skysparkle.matewave.settings.AppLinks.DONATE) }
)
}
} }
if (showAbout) { if (showAbout) {
@@ -232,6 +249,12 @@ fun SettingsScreen(
onOpenLicenses() onOpenLicenses()
} }
) )
AboutRow(
iconRes = R.drawable.ic_heart,
title = stringResource(R.string.support_button),
subtitle = cc.skysparkle.matewave.settings.AppLinks.DONATE_LABEL,
onClick = { cc.skysparkle.matewave.settings.AppLinks.open(context, cc.skysparkle.matewave.settings.AppLinks.DONATE) }
)
AboutRow( AboutRow(
iconRes = R.drawable.ic_repo, iconRes = R.drawable.ic_repo,
title = stringResource(R.string.settings_repo_title), title = stringResource(R.string.settings_repo_title),
@@ -242,6 +265,8 @@ fun SettingsScreen(
} }
} }
private val DonateRed = Color(0xFFFF6B8A)
@Composable @Composable
private fun AboutRow(iconRes: Int, title: String, subtitle: String, onClick: () -> Unit) { private fun AboutRow(iconRes: Int, title: String, subtitle: String, onClick: () -> Unit) {
val rowShape = RoundedCornerShape(12.dp) val rowShape = RoundedCornerShape(12.dp)
@@ -26,6 +26,7 @@ import cc.skysparkle.matewave.network.ConnectionTransport
import cc.skysparkle.matewave.network.GameMessage import cc.skysparkle.matewave.network.GameMessage
import cc.skysparkle.matewave.network.NetworkLog import cc.skysparkle.matewave.network.NetworkLog
import cc.skysparkle.matewave.network.NetworkMetrics import cc.skysparkle.matewave.network.NetworkMetrics
import cc.skysparkle.matewave.network.PeerLimits
import cc.skysparkle.matewave.network.TransportType import cc.skysparkle.matewave.network.TransportType
import cc.skysparkle.matewave.puzzles.Puzzle import cc.skysparkle.matewave.puzzles.Puzzle
import cc.skysparkle.matewave.security.DeviceKeys import cc.skysparkle.matewave.security.DeviceKeys
@@ -43,6 +44,7 @@ import cc.skysparkle.matewave.spectate.SpectatorResult
import cc.skysparkle.matewave.spectate.SpectatorResults import cc.skysparkle.matewave.spectate.SpectatorResults
import cc.skysparkle.matewave.spectate.SpectatorSnapshot import cc.skysparkle.matewave.spectate.SpectatorSnapshot
import cc.skysparkle.matewave.stats.Stats import cc.skysparkle.matewave.stats.Stats
import cc.skysparkle.matewave.ui.components.isAcceptableIncomingImage
import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.Job import kotlinx.coroutines.Job
import kotlinx.coroutines.delay import kotlinx.coroutines.delay
@@ -185,8 +187,10 @@ class GameViewModel : ViewModel() {
private var sessionGeneration = 0 private var sessionGeneration = 0
private var networkGameId: String = "" private var networkGameId: String = ""
private var pendingOpponentImages: Pair<String?, String?>? = null private var pendingOpponentImages: Pair<String?, String?>? = null
// The player picked in the nearby list; whoever answers must be that player.
private var expectedOpponentUserId: String? = null
private var currentPly: Int = 0 private var currentPly: Int = 0
private var lastOpponentRemaining: Long = Long.MAX_VALUE
// Spectating: the host serves spectators, both players announce the game's tag. // Spectating: the host serves spectators, both players announce the game's tag.
private var spectators: SpectatorBroadcaster? = null private var spectators: SpectatorBroadcaster? = null
@@ -711,7 +715,8 @@ class GameViewModel : ViewModel() {
myColor: PieceColor, myColor: PieceColor,
timeControl: TimeControl, timeControl: TimeControl,
isHost: Boolean, isHost: Boolean,
targetId: String? = null targetId: String? = null,
expectedUserId: String? = null
) { ) {
pendingLeave?.let { (job, oldTransport) -> pendingLeave?.let { (job, oldTransport) ->
job.cancel() job.cancel()
@@ -730,6 +735,7 @@ class GameViewModel : ViewModel() {
this.transport = transport this.transport = transport
lastNetworkTimeControl = timeControl lastNetworkTimeControl = timeControl
isNetworkHost = isHost isNetworkHost = isHost
expectedOpponentUserId = expectedUserId?.takeIf { it.isNotBlank() }
ephemeralKeys = DeviceKeys.generateEphemeral() ephemeralKeys = DeviceKeys.generateEphemeral()
@@ -739,7 +745,6 @@ class GameViewModel : ViewModel() {
opponentFlagJob = null opponentFlagJob = null
networkGameId = if (isHost) java.util.UUID.randomUUID().toString() else "" networkGameId = if (isHost) java.util.UUID.randomUUID().toString() else ""
currentPly = 0 currentPly = 0
lastOpponentRemaining = Long.MAX_VALUE
_clockState.value = null _clockState.value = null
_uiState.value = GameUiState( _uiState.value = GameUiState(
@@ -848,6 +853,13 @@ class GameViewModel : ViewModel() {
) )
} }
/** The image if it may be shown and stored, otherwise null (and a log line). */
private fun acceptedIncomingImage(base64: String): String? {
if (base64.length <= MAX_CHAT_IMAGE_CHARS && isAcceptableIncomingImage(base64)) return base64
NetworkLog.log("GAME", "Unreadable or oversized profile image rejected")
return null
}
private fun belongsToCurrentGame(gameId: String): Boolean = private fun belongsToCurrentGame(gameId: String): Boolean =
gameId.isEmpty() || networkGameId.isEmpty() || gameId == networkGameId gameId.isEmpty() || networkGameId.isEmpty() || gameId == networkGameId
@@ -901,9 +913,14 @@ class GameViewModel : ViewModel() {
NetworkLog.log("GAME", "Oversized chat message rejected") NetworkLog.log("GAME", "Oversized chat message rejected")
return return
} }
if (msg.imageBase64 != null && !isAcceptableIncomingImage(msg.imageBase64)) {
NetworkLog.log("GAME", "Unreadable or oversized chat image rejected")
return
}
val state = _uiState.value val state = _uiState.value
_uiState.value = state.copy( _uiState.value = state.copy(
chatMessages = state.chatMessages + ChatEntry(msg.text, msg.imageBase64, fromMe = false), chatMessages = (state.chatMessages + ChatEntry(msg.text, msg.imageBase64, fromMe = false))
.takeLast(MAX_CHAT_ENTRIES),
unreadChatCount = state.unreadChatCount + 1 unreadChatCount = state.unreadChatCount + 1
) )
} }
@@ -976,8 +993,8 @@ class GameViewModel : ViewModel() {
} }
is GameMessage.ProfileImagesMsg -> { is GameMessage.ProfileImagesMsg -> {
if (!belongsToCurrentGame(msg.gameId)) return if (!belongsToCurrentGame(msg.gameId)) return
val avatar = msg.avatarBase64?.takeIf { it.length <= MAX_CHAT_IMAGE_CHARS } val avatar = msg.avatarBase64?.let(::acceptedIncomingImage)
val background = msg.backgroundBase64?.takeIf { it.length <= MAX_CHAT_IMAGE_CHARS } val background = msg.backgroundBase64?.let(::acceptedIncomingImage)
if (avatar == null && background == null) return if (avatar == null && background == null) return
val current = _uiState.value.opponentProfile val current = _uiState.value.opponentProfile
if (current == null) { if (current == null) {
@@ -1051,17 +1068,17 @@ class GameViewModel : ViewModel() {
val limit = lastNetworkTimeControl?.let { it.initialSeconds * 1000L + 60_000L } val limit = lastNetworkTimeControl?.let { it.initialSeconds * 1000L + 60_000L }
val increment = lastNetworkTimeControl?.let { it.incrementSeconds * 1000L } ?: 0L val increment = lastNetworkTimeControl?.let { it.incrementSeconds * 1000L } ?: 0L
val allowedMax = if (lastOpponentRemaining == Long.MAX_VALUE) { // Our own clock has been running the opponent's time while they thought, so their claim
limit ?: Long.MAX_VALUE // may not exceed it by more than the increment and network slack.
} else { val allowedMax = clock?.remainingMillis(opponentColor)
lastOpponentRemaining + increment + CLOCK_TOLERANCE_MS ?.let { PeerLimits.maxOpponentClockAfterMove(it, increment, CLOCK_TOLERANCE_MS) }
} ?: limit ?: Long.MAX_VALUE
if (msg.remainingMillisSelf >= 0 && if (msg.remainingMillisSelf >= 0 &&
(limit == null || msg.remainingMillisSelf <= limit) && (limit == null || msg.remainingMillisSelf <= limit) &&
msg.remainingMillisSelf <= allowedMax msg.remainingMillisSelf <= allowedMax
) { ) {
lastOpponentRemaining = msg.remainingMillisSelf // The reported time already includes the increment; makeMove below adds it again.
clock?.applyRemoteTime(opponentColor, msg.remainingMillisSelf) clock?.applyRemoteTime(opponentColor, (msg.remainingMillisSelf - increment).coerceAtLeast(0))
} else if (msg.remainingMillisSelf > 0) { } else if (msg.remainingMillisSelf > 0) {
NetworkLog.log("GAME", "Invalid clock value from opponent rejected: ${msg.remainingMillisSelf}") NetworkLog.log("GAME", "Invalid clock value from opponent rejected: ${msg.remainingMillisSelf}")
} }
@@ -1077,6 +1094,12 @@ class GameViewModel : ViewModel() {
NetworkLog.log("GAME", "Repeated profile in current session ignored") NetworkLog.log("GAME", "Repeated profile in current session ignored")
return return
} }
if (!PeerLimits.isPlausibleProfile(msg)) {
// Nothing of it is stored: no key, no friend entry. The connection is closed.
NetworkLog.log("GAME", "Profile with out-of-range fields rejected, disconnecting")
transport?.disconnect()
return
}
val peers = knownPeers val peers = knownPeers
if (peers == null) { if (peers == null) {
NetworkLog.log("GAME", "Key store not ready, profile rejected") NetworkLog.log("GAME", "Key store not ready, profile rejected")
@@ -1125,7 +1148,11 @@ class GameViewModel : ViewModel() {
} }
markReadyIfPossible() markReadyIfPossible()
_uiState.value = _uiState.value.copy(opponentUnverified = trust == TrustResult.UNSIGNED) val unexpected = expectedOpponentUserId?.let { it != msg.userId } == true
if (unexpected) {
NetworkLog.log("GAME", "Opponent is not the player picked in the nearby list")
}
_uiState.value = _uiState.value.copy(opponentUnverified = trust == TrustResult.UNSIGNED || unexpected)
val pending = pendingOpponentImages val pending = pendingOpponentImages
pendingOpponentImages = null pendingOpponentImages = null
@@ -1133,8 +1160,8 @@ class GameViewModel : ViewModel() {
userId = msg.userId, userId = msg.userId,
name = msg.name, name = msg.name,
elo = msg.elo, elo = msg.elo,
avatarBase64 = msg.avatarBase64 ?: pending?.first, avatarBase64 = msg.avatarBase64?.let(::acceptedIncomingImage) ?: pending?.first,
backgroundBase64 = msg.backgroundBase64 ?: pending?.second backgroundBase64 = msg.backgroundBase64?.let(::acceptedIncomingImage) ?: pending?.second
) )
_uiState.value = _uiState.value.copy( _uiState.value = _uiState.value.copy(
opponentProfile = Profile( opponentProfile = Profile(
@@ -1240,7 +1267,6 @@ class GameViewModel : ViewModel() {
opponentFlagJob?.cancel() opponentFlagJob?.cancel()
opponentFlagJob = null opponentFlagJob = null
currentPly = 0 currentPly = 0
lastOpponentRemaining = Long.MAX_VALUE
val start = Board.startPosition() val start = Board.startPosition()
resetHistory(start) resetHistory(start)
@@ -1349,7 +1375,8 @@ class GameViewModel : ViewModel() {
val trimmed = text.trim().take(MAX_CHAT_TEXT_CHARS) val trimmed = text.trim().take(MAX_CHAT_TEXT_CHARS)
if (!sendGameMessage(GameMessage.ChatMsg(text = trimmed, gameId = networkGameId))) return if (!sendGameMessage(GameMessage.ChatMsg(text = trimmed, gameId = networkGameId))) return
_uiState.value = _uiState.value.copy( _uiState.value = _uiState.value.copy(
chatMessages = _uiState.value.chatMessages + ChatEntry(trimmed, null, fromMe = true) chatMessages = (_uiState.value.chatMessages + ChatEntry(trimmed, null, fromMe = true))
.takeLast(MAX_CHAT_ENTRIES)
) )
} }
@@ -1362,7 +1389,8 @@ class GameViewModel : ViewModel() {
} }
if (!sendGameMessage(GameMessage.ChatMsg(imageBase64 = base64, gameId = networkGameId))) return if (!sendGameMessage(GameMessage.ChatMsg(imageBase64 = base64, gameId = networkGameId))) return
_uiState.value = _uiState.value.copy( _uiState.value = _uiState.value.copy(
chatMessages = _uiState.value.chatMessages + ChatEntry(null, base64, fromMe = true) chatMessages = (_uiState.value.chatMessages + ChatEntry(null, base64, fromMe = true))
.takeLast(MAX_CHAT_ENTRIES)
) )
} }
@@ -1400,7 +1428,10 @@ class GameViewModel : ViewModel() {
viewModelScope.launch { viewModelScope.launch {
var serving = false var serving = false
try { try {
val port = withContext(Dispatchers.IO) { runCatching { hub.start() }.getOrNull() } // Spectators come over Wi-Fi; other interfaces (mobile data) are not listened on.
val port = withContext(Dispatchers.IO) {
runCatching { hub.start(cc.skysparkle.matewave.share.LocalNetwork.wifiInet4()) }.getOrNull()
}
if (port == null) NetworkLog.log("SPECTATE", "Could not open the spectator port") if (port == null) NetworkLog.log("SPECTATE", "Could not open the spectator port")
// The game may have ended while the port was opening. // The game may have ended while the port was opening.
if (port == null || generation != sessionGeneration || !spectatingDecided || spectateTag.isEmpty()) return@launch if (port == null || generation != sessionGeneration || !spectatingDecided || spectateTag.isEmpty()) return@launch
@@ -1589,6 +1620,7 @@ class GameViewModel : ViewModel() {
const val MAX_CHAT_TEXT_CHARS = 8_000 const val MAX_CHAT_TEXT_CHARS = 8_000
const val MAX_CHAT_IMAGE_CHARS = 400_000 const val MAX_CHAT_IMAGE_CHARS = 400_000
const val CLOCK_TOLERANCE_MS = 2_000L const val CLOCK_TOLERANCE_MS = 2_000L
const val MAX_CHAT_ENTRIES = 200
const val HANDSHAKE_TIMEOUT_MS = 20_000L const val HANDSHAKE_TIMEOUT_MS = 20_000L
const val OPPONENT_FLAG_GRACE_MS = 4_000L const val OPPONENT_FLAG_GRACE_MS = 4_000L
const val LEAVE_FLUSH_MS = 700L const val LEAVE_FLUSH_MS = 700L
+10
View File
@@ -0,0 +1,10 @@
<!-- Material Icons "favorite" by Google, Apache License 2.0 -->
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:fillColor="#FFFFFFFF"
android:pathData="M12,21.35l-1.45,-1.32C5.4,15.36 2,12.28 2,8.5 2,5.42 4.42,3 7.5,3c1.74,0 3.41,0.81 4.5,2.09C13.09,3.81 14.76,3 16.5,3 19.58,3 22,5.42 22,8.5c0,3.78 -3.4,6.86 -8.55,11.54L12,21.35z" />
</vector>
+3 -4
View File
@@ -7,13 +7,11 @@
<string name="greeting_night">Gute Nacht</string> <string name="greeting_night">Gute Nacht</string>
<string name="continue_game_title">Partie fortsetzen</string> <string name="continue_game_title">Partie fortsetzen</string>
<string name="quick_game_title">Schnelles Spiel</string> <string name="quick_game_title">Schnelles Spiel</string>
<string name="quick_game_subtitle">Wie beim letzten Mal: %1$s · %2$s</string>
<string name="mode_ai_title">Gegen die KI</string> <string name="mode_ai_title">Gegen die KI</string>
<string name="mode_ai_subtitle">Schwierigkeit wählen</string> <string name="mode_ai_subtitle">Schwierigkeit wählen</string>
<string name="mode_online_title">Mit einem Freund</string> <string name="mode_online_title">Mit einem Freund</string>
<string name="mode_online_subtitle">Per Bluetooth oder WLAN in der Nähe</string> <string name="mode_online_subtitle">Per Bluetooth oder WLAN in der Nähe</string>
<string name="puzzles_title">Schachaufgaben</string> <string name="puzzles_title">Schachaufgaben</string>
<string name="puzzles_subtitle">Aufgaben passend zu deiner Wertung</string>
<string name="stats_dialog_title">Statistik</string> <string name="stats_dialog_title">Statistik</string>
<string name="stats_dialog_summary">%1$d Siege · %2$d%% · Serie: %3$d</string> <string name="stats_dialog_summary">%1$d Siege · %2$d%% · Serie: %3$d</string>
<string name="stats_min">Min.: %1$d</string> <string name="stats_min">Min.: %1$d</string>
@@ -136,7 +134,6 @@
<string name="account_forget_keys_confirm">Du kannst einen bekannten Gegner dann nicht mehr von jemandem unterscheiden, der seinen Namen benutzt, bis ihr euch erneut trefft. Nötig, wenn der Gegner die App neu installiert hat.</string> <string name="account_forget_keys_confirm">Du kannst einen bekannten Gegner dann nicht mehr von jemandem unterscheiden, der seinen Namen benutzt, bis ihr euch erneut trefft. Nötig, wenn der Gegner die App neu installiert hat.</string>
<string name="account_confirm">Vergessen</string> <string name="account_confirm">Vergessen</string>
<string name="account_cancel">Abbrechen</string> <string name="account_cancel">Abbrechen</string>
<string name="greeting_ready">Bereit für eine neue Partie?</string>
<string name="account_trusted_keys_hint">Werden beim ersten Treffen mit einem neuen Spieler automatisch gespeichert</string> <string name="account_trusted_keys_hint">Werden beim ersten Treffen mit einem neuen Spieler automatisch gespeichert</string>
<string name="account_fingerprint_explain">Eindeutiger Fingerabdruck des Schlüssels dieses Geräts. Dein Gegner kann ihn beim ersten Treffen mit deinem vergleichen.</string> <string name="account_fingerprint_explain">Eindeutiger Fingerabdruck des Schlüssels dieses Geräts. Dein Gegner kann ihn beim ersten Treffen mit deinem vergleichen.</string>
<string name="friends_online">Online</string> <string name="friends_online">Online</string>
@@ -331,7 +328,6 @@
<string name="settings_section_system">System</string> <string name="settings_section_system">System</string>
<string name="permissions_card_ok_short">Alles bereit</string> <string name="permissions_card_ok_short">Alles bereit</string>
<string name="permissions_card_blocked_short">Aktion nötig</string> <string name="permissions_card_blocked_short">Aktion nötig</string>
<string name="account_header_summary">Wertung %1$d · Partien: %2$d</string>
<string name="account_progress">Fortschritt</string> <string name="account_progress">Fortschritt</string>
<string name="account_rating_row">Wertung</string> <string name="account_rating_row">Wertung</string>
<string name="account_device_key">Geräteschlüssel</string> <string name="account_device_key">Geräteschlüssel</string>
@@ -379,4 +375,7 @@
<string name="spectate_unreachable">Das Gerät, auf dem die Partie läuft, ist nicht erreichbar. Achte darauf, dass du im selben WLAN bist.</string> <string name="spectate_unreachable">Das Gerät, auf dem die Partie läuft, ist nicht erreichbar. Achte darauf, dass du im selben WLAN bist.</string>
<string name="spectate_left_win">%1$s hat die Partie verlassen. %2$s gewinnt.</string> <string name="spectate_left_win">%1$s hat die Partie verlassen. %2$s gewinnt.</string>
<string name="spectate_interrupted">Partie unterbrochen: Die Spieler haben die Verbindung verloren.</string> <string name="spectate_interrupted">Partie unterbrochen: Die Spieler haben die Verbindung verloren.</string>
<string name="support_title">Matewave unterstützen</string>
<string name="support_text">Kostenlos, quelloffen und werbefrei. Eine kleine Spende hilft, das Projekt weiterzuführen.</string>
<string name="support_button">Auf Ko-fi spenden</string>
</resources> </resources>
+3 -4
View File
@@ -7,13 +7,11 @@
<string name="greeting_night">おやすみなさい</string> <string name="greeting_night">おやすみなさい</string>
<string name="continue_game_title">対局を続ける</string> <string name="continue_game_title">対局を続ける</string>
<string name="quick_game_title">クイックゲーム</string> <string name="quick_game_title">クイックゲーム</string>
<string name="quick_game_subtitle">前回と同じ:%1$s・%2$s</string>
<string name="mode_ai_title">AIと対戦</string> <string name="mode_ai_title">AIと対戦</string>
<string name="mode_ai_subtitle">難易度を選択</string> <string name="mode_ai_subtitle">難易度を選択</string>
<string name="mode_online_title">友達と対戦</string> <string name="mode_online_title">友達と対戦</string>
<string name="mode_online_subtitle">近くでBluetoothまたはWi-Fiで</string> <string name="mode_online_subtitle">近くでBluetoothまたはWi-Fiで</string>
<string name="puzzles_title">チェスパズル</string> <string name="puzzles_title">チェスパズル</string>
<string name="puzzles_subtitle">あなたのレーティングに合った問題</string>
<string name="stats_dialog_title">成績</string> <string name="stats_dialog_title">成績</string>
<string name="stats_dialog_summary">%1$d勝 · %2$d%% · 連勝: %3$d</string> <string name="stats_dialog_summary">%1$d勝 · %2$d%% · 連勝: %3$d</string>
<string name="stats_min">最小: %1$d</string> <string name="stats_min">最小: %1$d</string>
@@ -136,7 +134,6 @@
<string name="account_forget_keys_confirm">再び会うまで、知っている相手とその名前を名乗る人を区別できなくなります。相手がアプリを再インストールした場合に必要です。</string> <string name="account_forget_keys_confirm">再び会うまで、知っている相手とその名前を名乗る人を区別できなくなります。相手がアプリを再インストールした場合に必要です。</string>
<string name="account_confirm">忘れる</string> <string name="account_confirm">忘れる</string>
<string name="account_cancel">キャンセル</string> <string name="account_cancel">キャンセル</string>
<string name="greeting_ready">新しい対局の準備はできましたか?</string>
<string name="account_trusted_keys_hint">新しいプレイヤーと初めて会ったときに自動で保存されます</string> <string name="account_trusted_keys_hint">新しいプレイヤーと初めて会ったときに自動で保存されます</string>
<string name="account_fingerprint_explain">この端末の鍵の固有のフィンガープリントです。初めて会ったとき、相手があなたのものと照合できます。</string> <string name="account_fingerprint_explain">この端末の鍵の固有のフィンガープリントです。初めて会ったとき、相手があなたのものと照合できます。</string>
<string name="friends_online">オンライン</string> <string name="friends_online">オンライン</string>
@@ -330,7 +327,6 @@
<string name="settings_section_system">システム</string> <string name="settings_section_system">システム</string>
<string name="permissions_card_ok_short">準備完了</string> <string name="permissions_card_ok_short">準備完了</string>
<string name="permissions_card_blocked_short">要対応</string> <string name="permissions_card_blocked_short">要対応</string>
<string name="account_header_summary">レーティング %1$d · 対局: %2$d</string>
<string name="account_progress">進捗</string> <string name="account_progress">進捗</string>
<string name="account_rating_row">レーティング</string> <string name="account_rating_row">レーティング</string>
<string name="account_device_key">端末の鍵</string> <string name="account_device_key">端末の鍵</string>
@@ -378,4 +374,7 @@
<string name="spectate_unreachable">対局をホストしている端末に接続できません。同じWi-Fiネットワークに接続しているか確認してください。</string> <string name="spectate_unreachable">対局をホストしている端末に接続できません。同じWi-Fiネットワークに接続しているか確認してください。</string>
<string name="spectate_left_win">%1$sが対局から退出しました。%2$sの勝ち</string> <string name="spectate_left_win">%1$sが対局から退出しました。%2$sの勝ち</string>
<string name="spectate_interrupted">対局が中断されました。プレイヤー間の接続が切れました。</string> <string name="spectate_interrupted">対局が中断されました。プレイヤー間の接続が切れました。</string>
<string name="support_title">Matewave を応援する</string>
<string name="support_text">無料・オープンソースで広告なし。少額の寄付が開発の継続を支えます。</string>
<string name="support_button">Ko-fi で寄付する</string>
</resources> </resources>
+3 -4
View File
@@ -7,13 +7,11 @@
<string name="greeting_night">Labos nakties</string> <string name="greeting_night">Labos nakties</string>
<string name="continue_game_title">Tęsti partiją</string> <string name="continue_game_title">Tęsti partiją</string>
<string name="quick_game_title">Greitas žaidimas</string> <string name="quick_game_title">Greitas žaidimas</string>
<string name="quick_game_subtitle">Kaip praėjusį kartą: %1$s · %2$s</string>
<string name="mode_ai_title">Prieš DI</string> <string name="mode_ai_title">Prieš DI</string>
<string name="mode_ai_subtitle">Pasirinkite sudėtingumą</string> <string name="mode_ai_subtitle">Pasirinkite sudėtingumą</string>
<string name="mode_online_title">Su draugu</string> <string name="mode_online_title">Su draugu</string>
<string name="mode_online_subtitle">Per „Bluetooth“ arba „Wi-Fi“ netoliese</string> <string name="mode_online_subtitle">Per „Bluetooth“ arba „Wi-Fi“ netoliese</string>
<string name="puzzles_title">Šachmatų galvosūkiai</string> <string name="puzzles_title">Šachmatų galvosūkiai</string>
<string name="puzzles_subtitle">Užduotys pagal jūsų reitingą</string>
<string name="stats_dialog_title">Statistika</string> <string name="stats_dialog_title">Statistika</string>
<string name="stats_dialog_summary">%1$d pergalių · %2$d%% · serija: %3$d</string> <string name="stats_dialog_summary">%1$d pergalių · %2$d%% · serija: %3$d</string>
<string name="stats_min">Min.: %1$d</string> <string name="stats_min">Min.: %1$d</string>
@@ -136,7 +134,6 @@
<string name="account_forget_keys_confirm">Nebegalėsite atskirti pažįstamo varžovo nuo to, kas naudoja jo vardą, kol vėl nesusitiksite. Reikia, jei varžovas iš naujo įdiegė programą.</string> <string name="account_forget_keys_confirm">Nebegalėsite atskirti pažįstamo varžovo nuo to, kas naudoja jo vardą, kol vėl nesusitiksite. Reikia, jei varžovas iš naujo įdiegė programą.</string>
<string name="account_confirm">Pamiršti</string> <string name="account_confirm">Pamiršti</string>
<string name="account_cancel">Atšaukti</string> <string name="account_cancel">Atšaukti</string>
<string name="greeting_ready">Pasiruošę naujai partijai?</string>
<string name="account_trusted_keys_hint">Išsaugomi automatiškai pirmą kartą sutikus naują žaidėją</string> <string name="account_trusted_keys_hint">Išsaugomi automatiškai pirmą kartą sutikus naują žaidėją</string>
<string name="account_fingerprint_explain">Unikalus šio įrenginio rakto kontrolinis kodas. Pirmą kartą susitikęs varžovas gali jį palyginti su jūsų.</string> <string name="account_fingerprint_explain">Unikalus šio įrenginio rakto kontrolinis kodas. Pirmą kartą susitikęs varžovas gali jį palyginti su jūsų.</string>
<string name="friends_online">Prisijungęs</string> <string name="friends_online">Prisijungęs</string>
@@ -333,7 +330,6 @@
<string name="settings_section_system">Sistema</string> <string name="settings_section_system">Sistema</string>
<string name="permissions_card_ok_short">Viskas paruošta</string> <string name="permissions_card_ok_short">Viskas paruošta</string>
<string name="permissions_card_blocked_short">Reikia veiksmo</string> <string name="permissions_card_blocked_short">Reikia veiksmo</string>
<string name="account_header_summary">Reitingas %1$d · Partijų: %2$d</string>
<string name="account_progress">Pažanga</string> <string name="account_progress">Pažanga</string>
<string name="account_rating_row">Reitingas</string> <string name="account_rating_row">Reitingas</string>
<string name="account_device_key">Įrenginio raktas</string> <string name="account_device_key">Įrenginio raktas</string>
@@ -381,4 +377,7 @@
<string name="spectate_unreachable">Nepavyksta pasiekti įrenginio, kuriame vyksta partija. Įsitikinkite, kad esate prisijungę prie to paties „Wi-Fi“ tinklo.</string> <string name="spectate_unreachable">Nepavyksta pasiekti įrenginio, kuriame vyksta partija. Įsitikinkite, kad esate prisijungę prie to paties „Wi-Fi“ tinklo.</string>
<string name="spectate_left_win">%1$s paliko partiją. Laimėjo %2$s.</string> <string name="spectate_left_win">%1$s paliko partiją. Laimėjo %2$s.</string>
<string name="spectate_interrupted">Partija nutraukta: žaidėjų ryšys nutrūko.</string> <string name="spectate_interrupted">Partija nutraukta: žaidėjų ryšys nutrūko.</string>
<string name="support_title">Paremti Matewave</string>
<string name="support_text">Nemokama, atvirojo kodo ir be reklamų. Nedidelė auka padeda projektui gyvuoti.</string>
<string name="support_button">Paaukoti per Ko-fi</string>
</resources> </resources>
+3 -4
View File
@@ -9,14 +9,12 @@
<string name="continue_game_title">Продолжить партию</string> <string name="continue_game_title">Продолжить партию</string>
<string name="quick_game_title">Быстрая игра</string> <string name="quick_game_title">Быстрая игра</string>
<string name="quick_game_subtitle">Как в прошлый раз: %1$s · %2$s</string>
<string name="mode_ai_title">Против ИИ</string> <string name="mode_ai_title">Против ИИ</string>
<string name="mode_ai_subtitle">Выберите сложность</string> <string name="mode_ai_subtitle">Выберите сложность</string>
<string name="mode_online_title">С другом</string> <string name="mode_online_title">С другом</string>
<string name="mode_online_subtitle">По Bluetooth или Wi-Fi рядом</string> <string name="mode_online_subtitle">По Bluetooth или Wi-Fi рядом</string>
<string name="puzzles_title">Шахматные задачи</string> <string name="puzzles_title">Шахматные задачи</string>
<string name="puzzles_subtitle">Задачи под ваш рейтинг</string>
<string name="stats_dialog_title">Статистика</string> <string name="stats_dialog_title">Статистика</string>
<string name="stats_dialog_summary">%1$d побед · %2$d%% · серия: %3$d</string> <string name="stats_dialog_summary">%1$d побед · %2$d%% · серия: %3$d</string>
<string name="stats_min">Мин: %1$d</string> <string name="stats_min">Мин: %1$d</string>
@@ -141,7 +139,6 @@
<string name="account_forget_keys_confirm">Вы перестанете отличать знакомого соперника от того, кто назвался его именем, пока не встретитесь с ним заново. Нужно, если соперник переустановил приложение.</string> <string name="account_forget_keys_confirm">Вы перестанете отличать знакомого соперника от того, кто назвался его именем, пока не встретитесь с ним заново. Нужно, если соперник переустановил приложение.</string>
<string name="account_confirm">Забыть</string> <string name="account_confirm">Забыть</string>
<string name="account_cancel">Отмена</string> <string name="account_cancel">Отмена</string>
<string name="greeting_ready">Готовы к новой партии?</string>
<string name="account_trusted_keys_hint">Запоминаются автоматически при первой встрече с новым игроком</string> <string name="account_trusted_keys_hint">Запоминаются автоматически при первой встрече с новым игроком</string>
<string name="account_fingerprint_explain">Уникальный отпечаток ключа этого устройства. Соперник может сверить его с вашим при первой встрече.</string> <string name="account_fingerprint_explain">Уникальный отпечаток ключа этого устройства. Соперник может сверить его с вашим при первой встрече.</string>
<string name="friends_online">В сети</string> <string name="friends_online">В сети</string>
@@ -339,7 +336,6 @@
<string name="settings_section_system">Система</string> <string name="settings_section_system">Система</string>
<string name="permissions_card_ok_short">Всё готово</string> <string name="permissions_card_ok_short">Всё готово</string>
<string name="permissions_card_blocked_short">Нужно действие</string> <string name="permissions_card_blocked_short">Нужно действие</string>
<string name="account_header_summary">Рейтинг %1$d · Партий: %2$d</string>
<string name="account_progress">Прогресс</string> <string name="account_progress">Прогресс</string>
<string name="account_rating_row">Рейтинг</string> <string name="account_rating_row">Рейтинг</string>
<string name="account_device_key">Ключ устройства</string> <string name="account_device_key">Ключ устройства</string>
@@ -387,4 +383,7 @@
<string name="spectate_unreachable">Устройство, на котором идёт партия, недоступно. Убедитесь, что вы подключены к той же сети Wi-Fi.</string> <string name="spectate_unreachable">Устройство, на котором идёт партия, недоступно. Убедитесь, что вы подключены к той же сети Wi-Fi.</string>
<string name="spectate_left_win">%1$s покинули партию. Победили %2$s.</string> <string name="spectate_left_win">%1$s покинули партию. Победили %2$s.</string>
<string name="spectate_interrupted">Партия прервана: игроки потеряли связь.</string> <string name="spectate_interrupted">Партия прервана: игроки потеряли связь.</string>
<string name="support_title">Поддержать Matewave</string>
<string name="support_text">Бесплатно, с открытым кодом и без рекламы. Небольшое пожертвование помогает проекту развиваться.</string>
<string name="support_button">Пожертвовать через Ko-fi</string>
</resources> </resources>
+3 -4
View File
@@ -7,13 +7,11 @@
<string name="greeting_night">晚安</string> <string name="greeting_night">晚安</string>
<string name="continue_game_title">继续对局</string> <string name="continue_game_title">继续对局</string>
<string name="quick_game_title">快速对局</string> <string name="quick_game_title">快速对局</string>
<string name="quick_game_subtitle">与上次相同:%1$s · %2$s</string>
<string name="mode_ai_title">对战 AI</string> <string name="mode_ai_title">对战 AI</string>
<string name="mode_ai_subtitle">选择难度</string> <string name="mode_ai_subtitle">选择难度</string>
<string name="mode_online_title">好友对战</string> <string name="mode_online_title">好友对战</string>
<string name="mode_online_subtitle">通过蓝牙或附近的 Wi-Fi</string> <string name="mode_online_subtitle">通过蓝牙或附近的 Wi-Fi</string>
<string name="puzzles_title">国际象棋谜题</string> <string name="puzzles_title">国际象棋谜题</string>
<string name="puzzles_subtitle">按你的等级分挑选的谜题</string>
<string name="stats_dialog_title">统计</string> <string name="stats_dialog_title">统计</string>
<string name="stats_dialog_summary">%1$d 胜 · %2$d%% · 连胜:%3$d</string> <string name="stats_dialog_summary">%1$d 胜 · %2$d%% · 连胜:%3$d</string>
<string name="stats_min">最低:%1$d</string> <string name="stats_min">最低:%1$d</string>
@@ -136,7 +134,6 @@
<string name="account_forget_keys_confirm">在再次见面之前,你将无法区分熟悉的对手和冒用其名字的人。如果对手重装了应用,则需要这样做。</string> <string name="account_forget_keys_confirm">在再次见面之前,你将无法区分熟悉的对手和冒用其名字的人。如果对手重装了应用,则需要这样做。</string>
<string name="account_confirm">忘记</string> <string name="account_confirm">忘记</string>
<string name="account_cancel">取消</string> <string name="account_cancel">取消</string>
<string name="greeting_ready">准备好开始新对局了吗?</string>
<string name="account_trusted_keys_hint">首次遇到新玩家时自动保存</string> <string name="account_trusted_keys_hint">首次遇到新玩家时自动保存</string>
<string name="account_fingerprint_explain">此设备密钥的唯一指纹。首次见面时,对手可以将其与你的核对。</string> <string name="account_fingerprint_explain">此设备密钥的唯一指纹。首次见面时,对手可以将其与你的核对。</string>
<string name="friends_online">在线</string> <string name="friends_online">在线</string>
@@ -330,7 +327,6 @@
<string name="settings_section_system">系统</string> <string name="settings_section_system">系统</string>
<string name="permissions_card_ok_short">已就绪</string> <string name="permissions_card_ok_short">已就绪</string>
<string name="permissions_card_blocked_short">需要处理</string> <string name="permissions_card_blocked_short">需要处理</string>
<string name="account_header_summary">等级分 %1$d · 对局:%2$d</string>
<string name="account_progress">进度</string> <string name="account_progress">进度</string>
<string name="account_rating_row">等级分</string> <string name="account_rating_row">等级分</string>
<string name="account_device_key">设备密钥</string> <string name="account_device_key">设备密钥</string>
@@ -378,4 +374,7 @@
<string name="spectate_unreachable">无法连接到主持对局的设备。请确认你们连接的是同一个 Wi-Fi 网络。</string> <string name="spectate_unreachable">无法连接到主持对局的设备。请确认你们连接的是同一个 Wi-Fi 网络。</string>
<string name="spectate_left_win">%1$s离开了对局,%2$s获胜。</string> <string name="spectate_left_win">%1$s离开了对局,%2$s获胜。</string>
<string name="spectate_interrupted">对局中断:玩家之间的连接已断开。</string> <string name="spectate_interrupted">对局中断:玩家之间的连接已断开。</string>
<string name="support_title">支持 Matewave</string>
<string name="support_text">免费、开源、无广告。一笔小小的捐助能让项目持续下去。</string>
<string name="support_button">通过 Ko-fi 捐助</string>
</resources> </resources>
+3 -4
View File
@@ -7,13 +7,11 @@
<string name="greeting_night">Good night</string> <string name="greeting_night">Good night</string>
<string name="continue_game_title">Continue game</string> <string name="continue_game_title">Continue game</string>
<string name="quick_game_title">Quick game</string> <string name="quick_game_title">Quick game</string>
<string name="quick_game_subtitle">Same as last time: %1$s · %2$s</string>
<string name="mode_ai_title">Vs AI</string> <string name="mode_ai_title">Vs AI</string>
<string name="mode_ai_subtitle">Choose difficulty</string> <string name="mode_ai_subtitle">Choose difficulty</string>
<string name="mode_online_title">Vs a friend</string> <string name="mode_online_title">Vs a friend</string>
<string name="mode_online_subtitle">Over Bluetooth or Wi-Fi nearby</string> <string name="mode_online_subtitle">Over Bluetooth or Wi-Fi nearby</string>
<string name="puzzles_title">Chess puzzles</string> <string name="puzzles_title">Chess puzzles</string>
<string name="puzzles_subtitle">Puzzles picked for your rating</string>
<string name="stats_dialog_title">Statistics</string> <string name="stats_dialog_title">Statistics</string>
<string name="stats_dialog_summary">%1$d wins · %2$d%% · streak: %3$d</string> <string name="stats_dialog_summary">%1$d wins · %2$d%% · streak: %3$d</string>
<string name="stats_min">Min: %1$d</string> <string name="stats_min">Min: %1$d</string>
@@ -136,7 +134,6 @@
<string name="account_forget_keys_confirm">You will no longer be able to tell a familiar opponent from someone using their name until you meet again. Needed if the opponent reinstalled the app.</string> <string name="account_forget_keys_confirm">You will no longer be able to tell a familiar opponent from someone using their name until you meet again. Needed if the opponent reinstalled the app.</string>
<string name="account_confirm">Forget</string> <string name="account_confirm">Forget</string>
<string name="account_cancel">Cancel</string> <string name="account_cancel">Cancel</string>
<string name="greeting_ready">Ready for a new game?</string>
<string name="account_trusted_keys_hint">Saved automatically the first time you meet a new player</string> <string name="account_trusted_keys_hint">Saved automatically the first time you meet a new player</string>
<string name="account_fingerprint_explain">The unique fingerprint of this device\'s key. Your opponent can compare it with yours when you first meet.</string> <string name="account_fingerprint_explain">The unique fingerprint of this device\'s key. Your opponent can compare it with yours when you first meet.</string>
<string name="friends_online">Online</string> <string name="friends_online">Online</string>
@@ -331,7 +328,6 @@
<string name="settings_section_system">System</string> <string name="settings_section_system">System</string>
<string name="permissions_card_ok_short">All set</string> <string name="permissions_card_ok_short">All set</string>
<string name="permissions_card_blocked_short">Action needed</string> <string name="permissions_card_blocked_short">Action needed</string>
<string name="account_header_summary">Rating %1$d · Games: %2$d</string>
<string name="account_progress">Progress</string> <string name="account_progress">Progress</string>
<string name="account_rating_row">Rating</string> <string name="account_rating_row">Rating</string>
<string name="account_device_key">Device key</string> <string name="account_device_key">Device key</string>
@@ -379,4 +375,7 @@
<string name="spectate_unreachable">The host\'s device can\'t be reached. Make sure you\'re on the same Wi-Fi network.</string> <string name="spectate_unreachable">The host\'s device can\'t be reached. Make sure you\'re on the same Wi-Fi network.</string>
<string name="spectate_left_win">%1$s left the game. %2$s wins.</string> <string name="spectate_left_win">%1$s left the game. %2$s wins.</string>
<string name="spectate_interrupted">Game interrupted: the players lost their connection.</string> <string name="spectate_interrupted">Game interrupted: the players lost their connection.</string>
<string name="support_title">Support Matewave</string>
<string name="support_text">Free, open source and no ads. A small donation helps keep it going.</string>
<string name="support_button">Donate on Ko-fi</string>
</resources> </resources>
+9
View File
@@ -0,0 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<locale-config xmlns:android="http://schemas.android.com/apk/res/android">
<locale android:name="en" />
<locale android:name="de" />
<locale android:name="ja" />
<locale android:name="lt" />
<locale android:name="ru" />
<locale android:name="zh" />
</locale-config>
@@ -0,0 +1,55 @@
package cc.skysparkle.matewave
import cc.skysparkle.matewave.network.GameMessage
import cc.skysparkle.matewave.network.PeerLimits
import org.junit.Assert.assertEquals
import org.junit.Assert.assertFalse
import org.junit.Assert.assertTrue
import org.junit.Test
class PeerLimitsTest {
private fun profile(
userId: String = "6f1c2a9e-0b3d-4c5e-8f70-1a2b3c4d5e6f",
name: String = "Vladimir",
elo: Int = 1350,
initialSeconds: Int = 300,
incrementSeconds: Int = 3
) = GameMessage.ProfileMsg(
userId = userId, name = name, avatarBase64 = null, backgroundBase64 = null, elo = elo,
initialSeconds = initialSeconds, incrementSeconds = incrementSeconds
)
@Test fun ordinaryProfileIsAccepted() = assertTrue(PeerLimits.isPlausibleProfile(profile()))
@Test fun joiningPlayerWithoutTimeControlIsAccepted() =
assertTrue(PeerLimits.isPlausibleProfile(profile(initialSeconds = 0, incrementSeconds = 0)))
@Test fun unlimitedGameIsAccepted() =
assertTrue(PeerLimits.isPlausibleProfile(profile(initialSeconds = Int.MAX_VALUE, incrementSeconds = 0)))
@Test
fun oversizedOrEmptyFieldsAreRefused() {
assertFalse(PeerLimits.isPlausibleProfile(profile(name = "x".repeat(PeerLimits.MAX_NAME_CHARS + 1))))
assertFalse(PeerLimits.isPlausibleProfile(profile(name = " ")))
assertFalse(PeerLimits.isPlausibleProfile(profile(name = "a\u0000b")))
assertFalse(PeerLimits.isPlausibleProfile(profile(userId = "u".repeat(PeerLimits.MAX_USER_ID_CHARS + 1))))
assertFalse(PeerLimits.isPlausibleProfile(profile(userId = "")))
}
@Test
fun ratingAndTimeControlMustBeInRange() {
assertFalse(PeerLimits.isPlausibleProfile(profile(elo = 99)))
assertFalse(PeerLimits.isPlausibleProfile(profile(elo = 3001)))
assertFalse(PeerLimits.isPlausibleProfile(profile(initialSeconds = -1)))
assertFalse(PeerLimits.isPlausibleProfile(profile(initialSeconds = PeerLimits.MAX_INITIAL_SECONDS + 1)))
assertFalse(PeerLimits.isPlausibleProfile(profile(incrementSeconds = PeerLimits.MAX_INCREMENT_SECONDS + 1)))
}
@Test
fun opponentClockMayNotGrowBeyondIncrementAndSlack() {
assertEquals(47_000L, PeerLimits.maxOpponentClockAfterMove(42_000, 3_000, 2_000))
// A flagged opponent (0 ms locally) may still have had a little time on their side.
assertEquals(5_000L, PeerLimits.maxOpponentClockAfterMove(0, 3_000, 2_000))
assertEquals(2_000L, PeerLimits.maxOpponentClockAfterMove(-50, 0, 2_000))
}
}
@@ -0,0 +1,31 @@
package cc.skysparkle.matewave
import cc.skysparkle.matewave.network.LanTransport
import org.junit.Assert.assertFalse
import org.junit.Assert.assertNotEquals
import org.junit.Assert.assertTrue
import org.junit.Test
class PresenceSignatureTest {
private val now = 1_800_000_000_000L
private val nowSeconds = now / 1000
@Test fun recentAnnouncementIsFresh() =
assertTrue(LanTransport.isFreshPresence(nowSeconds - 4 * 60, now))
@Test fun slightlyFastClockIsTolerated() =
assertTrue(LanTransport.isFreshPresence(nowSeconds + 5 * 60, now))
@Test
fun oldMissingOrFarFutureAnnouncementsAreRejected() {
assertFalse(LanTransport.isFreshPresence(nowSeconds - 16 * 60, now))
assertFalse(LanTransport.isFreshPresence(nowSeconds + 16 * 60, now))
assertFalse(LanTransport.isFreshPresence(0, now))
}
@Test
fun signingTimeIsPartOfTheSignedText() = assertNotEquals(
LanTransport.presencePayload("u1", "Vladimir", 1350, nowSeconds),
LanTransport.presencePayload("u1", "Vladimir", 1350, nowSeconds - 60)
)
}
Binary file not shown.

Before

Width:  |  Height:  |  Size: 139 KiB

+2 -2
View File
@@ -1,4 +1,4 @@
plugins { plugins {
id("com.android.application") version "9.2.0" apply false alias(libs.plugins.android.application) apply false
id("org.jetbrains.kotlin.plugin.compose") version "2.4.20" apply false alias(libs.plugins.kotlin.compose) apply false
} }
@@ -0,0 +1,6 @@
• Bilder des Gegners werden geprüft: zu große Avatare, Hintergründe oder Chatbilder bringen die App nicht mehr zum Absturz
• Der Gegner kann verbrauchte Zeit nicht verbergen; sein Inkrement zählt nicht mehr doppelt
• Warnung, wenn nicht der gewählte Spieler in der Nähe antwortet
• App-Sprache in den Android-Einstellungen wählbar (Android 13+)
• Schnellerer Start mit vielen Freunden, weniger Akku für Bluetooth
• WLAN-Präsenz ist nicht mit 1.0.50 kompatibel: beide Handys aktualisieren
@@ -0,0 +1,6 @@
• Pictures from the opponent are checked first: an oversized avatar, background or chat image no longer crashes the app
• The opponent's clock can't hide time spent; their increment is no longer counted twice
• A warning if someone other than the chosen nearby player answers
• App language can be set in Android settings (Android 13+)
• Faster start with many friends, less battery for Bluetooth presence
• Wi-Fi presence is not compatible with 1.0.50: update both phones
@@ -0,0 +1,6 @@
• 相手の画像を事前に確認:巨大なアバター、背景、チャット画像でアプリが落ちなくなりました
• 相手が消費時間を隠せなくなり、相手の加算時間が二重に数えられなくなりました
• 近くで選んだ相手以外が応答したときに警告
• Android の設定でアプリの言語を選択可能に(Android 13 以降)
• 友達が多くても起動が速く、Bluetooth の電池消費も減少
• Wi-Fi の在席表示は 1.0.50 と互換性がありません:両方の端末を更新してください
@@ -0,0 +1,6 @@
• Varžovo paveikslėliai tikrinami: per didelis avataras, fonas ar pokalbio paveikslėlis nebeužlaužia programėlės
• Varžovas negali nuslėpti sunaudoto laiko; jo priedas nebeskaičiuojamas dukart
• Įspėjimas, jei atsiliepė ne tas netoliese pasirinktas žaidėjas
• Programėlės kalbą galima pasirinkti Android nustatymuose (13+)
• Greitesnis paleidimas su daug draugų, mažiau baterijos per Bluetooth
• Buvimas per Wi-Fi nesuderinamas su 1.0.50: atnaujinkite abu telefonus
@@ -0,0 +1,6 @@
• Картинки соперника проверяются: огромный аватар, фон или картинка в чате больше не роняют приложение
• Соперник не может скрыть потраченное время; его инкремент больше не учитывается дважды
• Предупреждение, если ответил не тот игрок, которого вы выбрали рядом
• Язык приложения можно выбрать в настройках Android (13+)
• Быстрее запуск со многими друзьями, меньше расход батареи по Bluetooth
• Присутствие по Wi-Fi несовместимо с 1.0.50: обновите оба телефона
@@ -0,0 +1,6 @@
• 先检查对手发来的图片:过大的头像、背景或聊天图片不再导致应用崩溃
• 对手无法隐瞒已用时间;对手的加秒不再被重复计算
• 应答者不是附近列表中所选玩家时会发出警告
• 可在 Android 设置中选择应用语言(Android 13 及以上)
• 好友多时启动更快,蓝牙在线显示更省电
• Wi-Fi 在线显示与 1.0.50 不兼容:请更新双方手机
+29
View File
@@ -0,0 +1,29 @@
[versions]
agp = "9.2.0"
kotlin = "2.4.20"
composeBom = "2026.09.00"
activityCompose = "1.13.0"
coreKtx = "1.18.0"
navigationCompose = "2.9.7"
lifecycleViewmodelCompose = "2.11.0"
kotlinxCoroutines = "1.11.0"
zxing = "3.5.4"
junit = "4.13.2"
orgJson = "20240303"
[libraries]
androidx-compose-bom = { group = "androidx.compose", name = "compose-bom", version.ref = "composeBom" }
androidx-compose-material3 = { group = "androidx.compose.material3", name = "material3" }
androidx-compose-ui = { group = "androidx.compose.ui", name = "ui" }
androidx-activity-compose = { group = "androidx.activity", name = "activity-compose", version.ref = "activityCompose" }
androidx-core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "coreKtx" }
androidx-navigation-compose = { group = "androidx.navigation", name = "navigation-compose", version.ref = "navigationCompose" }
androidx-lifecycle-viewmodel-compose = { group = "androidx.lifecycle", name = "lifecycle-viewmodel-compose", version.ref = "lifecycleViewmodelCompose" }
kotlinx-coroutines-android = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-android", version.ref = "kotlinxCoroutines" }
zxing-core = { group = "com.google.zxing", name = "core", version.ref = "zxing" }
junit = { group = "junit", name = "junit", version.ref = "junit" }
org-json = { group = "org.json", name = "json", version.ref = "orgJson" }
[plugins]
android-application = { id = "com.android.application", version.ref = "agp" }
kotlin-compose = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
+1
View File
@@ -1,5 +1,6 @@
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
distributionSha256Sum=acd53f1edaf02f1a8ff99879f8a34b302661a057d9b063ae9e35b552f804d20a
distributionUrl=https\://services.gradle.org/distributions/gradle-9.7.1-bin.zip distributionUrl=https\://services.gradle.org/distributions/gradle-9.7.1-bin.zip
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists