Update user agent

[signal-cli] / src / main / java / org / asamk / signal / BaseConfig.java

diff --git a/src/main/java/org/asamk/signal/BaseConfig.java b/src/main/java/org/asamk/signal/BaseConfig.java
index afafc7d72a6a756caa6c2839735b423e7c82d0d9..84d7f1049328dc94dbcc4a44f344c81b87395bc5 100644 (file)
--- a/src/main/java/org/asamk/signal/BaseConfig.java
+++ b/src/main/java/org/asamk/signal/BaseConfig.java
@@ -1,11 +1,18 @@
 package org.asamk.signal;
 
 package org.asamk.signal;
 

+import java.util.Optional;
+

 public class BaseConfig {
 
 public class BaseConfig {
 

-    public final static String PROJECT_NAME = BaseConfig.class.getPackage().getImplementationTitle();
-    public final static String PROJECT_VERSION = BaseConfig.class.getPackage().getImplementationVersion();
+    public static final String PROJECT_NAME = BaseConfig.class.getPackage().getImplementationTitle();
+    public static final String PROJECT_VERSION = BaseConfig.class.getPackage().getImplementationVersion();

 
 

-    final static String USER_AGENT = PROJECT_NAME == null ? "signal-cli" : PROJECT_NAME + " " + PROJECT_VERSION;
+    static final String USER_AGENT_SIGNAL_ANDROID = Optional.ofNullable(System.getenv("SIGNAL_CLI_USER_AGENT"))
+            .orElse("Signal-Android/7.1.3");
+    static final String USER_AGENT_SIGNAL_CLI = PROJECT_NAME == null
+            ? "signal-cli"
+            : PROJECT_NAME + "/" + PROJECT_VERSION;
+    static final String USER_AGENT = USER_AGENT_SIGNAL_ANDROID + " " + USER_AGENT_SIGNAL_CLI;

 
     private BaseConfig() {
     }
 
     private BaseConfig() {
     }