Rename fingerprint to safety number

Fixes #92

diff --git a/man/signal-cli.1.adoc b/man/signal-cli.1.adoc
index 98a547568a1a56a52eb99b2fe07ef0b70badf8ca..3cd260b3335a6c753d737631f70aa411031a0cae 100644 (file)
--- a/man/signal-cli.1.adoc
+++ b/man/signal-cli.1.adoc
@@ -226,9 +226,9 @@ number::
 *-a*, *--trust-all-known-keys*::
        Trust all known keys of this user, only use this for testing.
 
 *-a*, *--trust-all-known-keys*::
        Trust all known keys of this user, only use this for testing.
 

-*-v* VERIFIED_FINGERPRINT, *--verified-fingerprint* VERIFIED_FINGERPRINT::
-       Specify the safety number or fingerprint of the key, only use this option if you have verified
-       the fingerprint.
+*-v* VERIFIED_SAFETY_NUMBER, *--verified-safety-number* VERIFIED_SAFETY_NUMBER::
+       Specify the safety number of the key, only use this option if you have verified
+       the safety number.

 
 updateProfile
 ~~~~~~~~~~~~~
 
 updateProfile
 ~~~~~~~~~~~~~


@@ -355,7 +355,7 @@ Send a message to a group::
        signal-cli -u USERNAME send -m "This is a message" -g GROUP_ID
 
 Trust new key, after having verified it::
        signal-cli -u USERNAME send -m "This is a message" -g GROUP_ID
 
 Trust new key, after having verified it::

-    signal-cli -u USERNAME trust -v FINGER_PRINT NUMBER
+    signal-cli -u USERNAME trust -v SAFETY_NUMBER NUMBER

 
 Trust new key, without having verified it. Only use this if you don't care about security::
     signal-cli -u USERNAME trust -a NUMBER
 
 Trust new key, without having verified it. Only use this if you don't care about security::
     signal-cli -u USERNAME trust -a NUMBER

diff --git a/src/main/java/org/asamk/signal/commands/TrustCommand.java b/src/main/java/org/asamk/signal/commands/TrustCommand.java
index a507e2657290d946234683ad4e219ea4943bd384..2780dc46b7a5c0bc67156d1163548475f8d3d700 100644 (file)
--- a/src/main/java/org/asamk/signal/commands/TrustCommand.java
+++ b/src/main/java/org/asamk/signal/commands/TrustCommand.java
@@ -23,8 +23,8 @@ public class TrustCommand implements LocalCommand {
         mutTrust.addArgument("-a", "--trust-all-known-keys")
                 .help("Trust all known keys of this user, only use this for testing.")
                 .action(Arguments.storeTrue());
         mutTrust.addArgument("-a", "--trust-all-known-keys")
                 .help("Trust all known keys of this user, only use this for testing.")
                 .action(Arguments.storeTrue());

-        mutTrust.addArgument("-v", "--verified-fingerprint")
-                .help("Specify the fingerprint of the key, only use this option if you have verified the fingerprint.");
+        mutTrust.addArgument("-v", "--verified-safety-number", "--verified-fingerprint")
+                .help("Specify the safety number of the key, only use this option if you have verified the safety number.");

     }
 
     @Override
     }
 
     @Override


@@ -41,13 +41,13 @@ public class TrustCommand implements LocalCommand {
                 return 1;
             }
         } else {
                 return 1;
             }
         } else {

-            String fingerprint = ns.getString("verified_fingerprint");
-            if (fingerprint != null) {
-                fingerprint = fingerprint.replaceAll(" ", "");
-                if (fingerprint.length() == 66) {
+            String safetyNumber = ns.getString("verified_safety_number");
+            if (safetyNumber != null) {
+                safetyNumber = safetyNumber.replaceAll(" ", "");
+                if (safetyNumber.length() == 66) {

                     byte[] fingerprintBytes;
                     try {
                     byte[] fingerprintBytes;
                     try {

-                        fingerprintBytes = Hex.toByteArray(fingerprint.toLowerCase(Locale.ROOT));
+                        fingerprintBytes = Hex.toByteArray(safetyNumber.toLowerCase(Locale.ROOT));

                     } catch (Exception e) {
                         System.err.println("Failed to parse the fingerprint, make sure the fingerprint is a correctly encoded hex string without additional characters.");
                         return 1;
                     } catch (Exception e) {
                         System.err.println("Failed to parse the fingerprint, make sure the fingerprint is a correctly encoded hex string without additional characters.");
                         return 1;


@@ -63,10 +63,10 @@ public class TrustCommand implements LocalCommand {
                         System.err.println("Failed to set the trust for the fingerprint of this number, make sure the number and the fingerprint are correct.");
                         return 1;
                     }
                         System.err.println("Failed to set the trust for the fingerprint of this number, make sure the number and the fingerprint are correct.");
                         return 1;
                     }

-                } else if (fingerprint.length() == 60) {
+                } else if (safetyNumber.length() == 60) {

                     boolean res;
                     try {
                     boolean res;
                     try {

-                        res = m.trustIdentityVerifiedSafetyNumber(number, fingerprint);
+                        res = m.trustIdentityVerifiedSafetyNumber(number, safetyNumber);

                     } catch (InvalidNumberException e) {
                         ErrorUtils.handleInvalidNumberException(e);
                         return 1;
                     } catch (InvalidNumberException e) {
                         ErrorUtils.handleInvalidNumberException(e);
                         return 1;


@@ -76,11 +76,11 @@ public class TrustCommand implements LocalCommand {
                         return 1;
                     }
                 } else {
                         return 1;
                     }
                 } else {

-                    System.err.println("Fingerprint has invalid format, either specify the old hex fingerprint or the new safety number");
+                    System.err.println("Safety number has invalid format, either specify the old hex fingerprint or the new safety number");

                     return 1;
                 }
             } else {
                     return 1;
                 }
             } else {

-                System.err.println("You need to specify the fingerprint you have verified with -v FINGERPRINT");
+                System.err.println("You need to specify the fingerprint/safety number you have verified with -v SAFETY_NUMBER");

                 return 1;
             }
         }
                 return 1;
             }
         }