Merge f75c54908729887e5353b872f346f0bbb35d7298 into 60649041c8e3b37dbf559bbf1a2d832119cdb2ba

lib/build.gradle.kts

@@ -15,14 +15,25 @@ java {
 }
 
 val libsignalClientPath = project.findProperty("libsignal_client_path")?.toString()
+val libsignalClientVersion = "0.101.0"
+val androidClassifier = project.findProperty("androidClassifier")?.toString()
 
 dependencies {
+    implementation(libs.signalnetwork) {
+        exclude(group = "org.signal", module = "libsignal-client")
+    }
+
     if (libsignalClientPath == null) {
-        implementation(libs.signalnetwork)
-    } else {
-        implementation(libs.signalnetwork) {
-            exclude(group = "org.signal", module = "libsignal-client")
+        implementation("org.signal:libsignal-client:$libsignalClientVersion")
+        if (androidClassifier != null) {
+            implementation(
+                group = "org.signal",
+                name = "libsignal-client",
+                version = libsignalClientVersion,
+                classifier = androidClassifier,
+            )
         }
+    } else {
         implementation(files(libsignalClientPath))
     }
     implementation(libs.jackson.databind)
@@ -60,4 +71,4 @@ tasks.jar {
     manifest {
         attributes("Automatic-Module-Name" to "org.asamk.signal.manager")
     }
-}
+}

lib/src/main/java/org/asamk/signal/manager/storage/sessions/SessionStore.java

@@ -414,4 +414,4 @@ public class SessionStore implements SignalServiceSessionStore {
     }
 
     record Key(String address, int deviceId) {}
-}
+}

man/signal-cli.1.adoc

@@ -247,7 +247,8 @@ Remove the registration lock pin.
 Link to an existing device, instead of registering a new number.
 This shows a "sgnl://linkdevice?uuid=..." URI.
 If you want to connect to another signal-cli instance, you can just use this URI.
-If you want to link to an Android/iOS device, create a QR code with the URI (e.g. with qrencode) and scan that in the Signal app.
+If you want to link to an Android/iOS device, scan the QR code that signal-cli prints in the terminal with the Signal app.
+If signal-cli is not running in a terminal, only the URI is printed and you can create a QR code from it yourself (e.g. with qrencode).
 
 *-n* NAME, *--name* NAME::
 Optionally specify a name to describe this new device.