Skip to content

Your Android phone and your Windows PC, working as one. Local-first, end-to-end encrypted, no account.

Use each pairing link once; tidy Android status text

Bee9815c4fd4cb2
diff --git a/android/app/src/main/kotlin/app/nectarlink/android/ui/MainActivity.kt b/android/app/src/main/kotlin/app/nectarlink/android/ui/MainActivity.kt
index 7d97c4b..61e7aed 100644
--- a/android/app/src/main/kotlin/app/nectarlink/android/ui/MainActivity.kt
+++ b/android/app/src/main/kotlin/app/nectarlink/android/ui/MainActivity.kt
@@ -79,12 +79,18 @@ class MainActivity : ComponentActivity() {
handlePairingLink(intent)
}
- /** A PC's pairing QR code opened from another app (e.g. the camera). */
+ /**
+ * A PC's pairing QR code opened from another app (e.g. the camera).
+ * Each link holds a one-time secret, so a link is used once: Android
+ * re-delivers the original intent when the task is restored or reopened
+ * from Recents, and that must not start a stale pairing.
+ */
private fun handlePairingLink(intent: Intent?) {
val link = intent?.takeIf { it.action == Intent.ACTION_VIEW }?.dataString ?: return
- if (link.startsWith("nectarlink://pair?")) {
- (application as NectarlinkApplication).core.joinWhenReady(link)
- }
+ if (!link.startsWith("nectarlink://pair?")) return
+ if (intent.flags and Intent.FLAG_ACTIVITY_LAUNCHED_FROM_HISTORY != 0) return
+ if (!PairingLinks(this).consume(link)) return
+ (application as NectarlinkApplication).core.joinWhenReady(link)
}
}
diff --git a/android/app/src/main/kotlin/app/nectarlink/android/ui/PairingLinks.kt b/android/app/src/main/kotlin/app/nectarlink/android/ui/PairingLinks.kt
new file mode 100644
index 0000000..2eb11bb
--- /dev/null
+++ b/android/app/src/main/kotlin/app/nectarlink/android/ui/PairingLinks.kt
@@ -0,0 +1,26 @@
+// SPDX-License-Identifier: GPL-3.0-or-later
+package app.nectarlink.android.ui
+
+import android.content.Context
+import java.security.MessageDigest
+
+/** Remembers pairing links already used, so each is used at most once. */
+class PairingLinks(context: Context) {
+ private val prefs = context.applicationContext.getSharedPreferences("pairing_links", Context.MODE_PRIVATE)
+
+ /** True the first time a link is seen; false if it was used before. */
+ fun consume(link: String): Boolean {
+ // Store a hash: the link itself contains a (one-time) secret.
+ val digest = MessageDigest.getInstance("SHA-256").digest(link.toByteArray())
+ .joinToString("") { "%02x".format(it) }
+ val used = prefs.getString(KEY, "").orEmpty().split(',').filter { it.isNotEmpty() }
+ if (digest in used) return false
+ prefs.edit().putString(KEY, (used + digest).takeLast(MAX_REMEMBERED).joinToString(",")).apply()
+ return true
+ }
+
+ private companion object {
+ const val KEY = "used"
+ const val MAX_REMEMBERED = 20
+ }
+}
diff --git a/android/app/src/main/kotlin/app/nectarlink/android/ui/home/HomeScreen.kt b/android/app/src/main/kotlin/app/nectarlink/android/ui/home/HomeScreen.kt
index b22fba2..c1228bc 100644
--- a/android/app/src/main/kotlin/app/nectarlink/android/ui/home/HomeScreen.kt
+++ b/android/app/src/main/kotlin/app/nectarlink/android/ui/home/HomeScreen.kt
@@ -143,10 +143,18 @@ private fun linkText(link: Link): String = when (link) {
else -> stringResource(R.string.link_online)
}
Link.Connecting -> stringResource(R.string.link_connecting)
- is Link.Offline -> link.lastSeen?.let {
- stringResource(
- R.string.link_offline_seen,
- DateUtils.getRelativeTimeSpanString(it * 1000, System.currentTimeMillis(), DateUtils.MINUTE_IN_MILLIS),
- )
- } ?: stringResource(R.string.link_never)
+ is Link.Offline -> when (val seen = link.lastSeen) {
+ null -> stringResource(R.string.link_never)
+ else -> {
+ val now = System.currentTimeMillis()
+ if (now - seen * 1000 < DateUtils.MINUTE_IN_MILLIS) {
+ stringResource(R.string.link_offline_now)
+ } else {
+ stringResource(
+ R.string.link_offline_seen,
+ DateUtils.getRelativeTimeSpanString(seen * 1000, now, DateUtils.MINUTE_IN_MILLIS),
+ )
+ }
+ }
+ }
}
diff --git a/android/app/src/main/res/values/strings.xml b/android/app/src/main/res/values/strings.xml
index a78be6d..28f332a 100644
--- a/android/app/src/main/res/values/strings.xml
+++ b/android/app/src/main/res/values/strings.xml
@@ -32,6 +32,7 @@
<string name="link_away">Connected while away</string>
<string name="link_connecting">Connecting…</string>
<string name="link_offline_seen">Offline · seen %1$s</string>
+ <string name="link_offline_now">Offline · seen just now</string>
<string name="link_never">Not connected yet</string>
<string name="battery_level">%1$d%%</string>
<string name="battery_charging">%1$d%% · charging</string>
@@ -46,7 +47,7 @@
<string name="settings_theme">Theme</string>
<string name="settings_mode">Mode</string>
<string name="settings_dynamic_color">Colors from wallpaper</string>
- <string name="settings_dynamic_color_hint">Your PC follows the same colors.</string>
+ <string name="settings_dynamic_color_hint">Use your wallpaper\'s colors.</string>
<string name="settings_devices">PCs</string>
<string name="settings_about">About</string>
<string name="theme_bloom">Bloom</string>
diff --git a/core/nectarlink-cli/src/main.rs b/core/nectarlink-cli/src/main.rs
index 8cf9f90..a5b00e3 100644
--- a/core/nectarlink-cli/src/main.rs
+++ b/core/nectarlink-cli/src/main.rs
@@ -9,8 +9,8 @@ use std::{io::Write, net::SocketAddr, path::PathBuf, sync::Arc, time::Duration};
use anyhow::{Context, Result, bail};
use clap::{Parser, Subcommand, ValueEnum};
use nectarlink_core::{
- ConnectionPath, DeviceId, DeviceInfo, DeviceKind, FeatureState, LinkState, Node, NodeConfig, NodeEvent,
- PairedDevice, PairingEvent, Platform, PowerLevel,
+ Battery, ConnectionPath, DeviceId, DeviceInfo, DeviceKind, FeatureState, LinkState, Node, NodeConfig,
+ NodeEvent, PairedDevice, PairingEvent, Platform, PowerLevel,
features::{Effort, FEATURES, Role, UnsupportedReason, Upgrade, UpgradeAction},
};
use tokio::sync::broadcast::error::RecvError;
@@ -39,6 +39,12 @@ struct Cli {
/// Power level to announce with --as-phone.
#[arg(long, global = true, value_enum, default_value_t = Power::Basic, requires = "as_phone")]
power: Power,
+ /// Battery level (0–100) to report, to test a PC without a phone.
+ #[arg(long, global = true, value_parser = clap::value_parser!(u8).range(0..=100))]
+ battery: Option<u8>,
+ /// Report the battery as charging (with --battery).
+ #[arg(long, global = true, requires = "battery")]
+ charging: bool,
/// Extra capability to announce, e.g. clip.read.auto (repeatable).
#[arg(long = "offer", global = true, value_name = "CAPABILITY")]
offers: Vec<String>,
@@ -175,6 +181,10 @@ async fn start_node(cli: &Cli) -> Result<Node> {
if !cli.offers.is_empty() {
node.update_power(power, cli.offers.clone()).await;
}
+ if let Some(level) = cli.battery {
+ let plugged = cli.charging.then(|| "ac".to_owned());
+ node.update_battery(Battery { level, charging: cli.charging, plugged }).await;
+ }
Ok(node)
}