Fix the user agent trickery. (1.1.1)

Author: e3ndr

README.md

@@ -30,7 +30,7 @@ swetrix.startHeartbeat(); // This updates your "Live visitors" statistic in Swet
         <dependency>
             <groupId>co.casterlabs</groupId>
             <artifactId>swetrix-java</artifactId>
-            <version>1.1.0</version>
+            <version>LATEST_VERSION_HERE</version>
             <scope>compile</scope>
         </dependency>
     </dependencies>

pom.xml

@@ -4,7 +4,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>co.casterlabs</groupId>
 	<artifactId>swetrix-java</artifactId>
-	<version>1.1.0</version>
+	<version>1.1.1</version>
 
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

src/main/java/co/casterlabs/swetrix/HttpUtil.java

@@ -16,28 +16,28 @@
 class HttpUtil {
     private static final OkHttpClient client = new OkHttpClient();
     private static final MediaType applicationJson = MediaType.parse("application/json");
-    private static final String userAgent;
+    static final String userAgent;
 
     static {
         // The following device agents are just here to get Swetrix to count the device
         // type properly. They just need to *vaguely* represent the device.
         String device = "";
 
         if (System.getProperty("java.specification.vendor", "").equals("The Android Project")) {
-            device = "(Linux; U; Android 0.0.0) Mobile ";
+            device = "(Linux; Android 13) Mobile ";
         } else {
             String osName = System.getProperty("os.name").toLowerCase();
 
-            if (osName.matches("mac|darwin")) {
+            if (osName.contains("mac") || osName.contains("darwin")) {
                 device = "(Macintosh; Intel Mac OS X 10_15_7) ";
-            } else if (osName.matches("nux")) {
+            } else if (osName.contains("nux")) {
                 device = "(X11; Linux; Linux x86_64; rv:15.0) ";
-            } else if (osName.matches("win")) {
+            } else if (osName.contains("win")) {
                 device = "(Windows NT 10.0; Win64; x64) ";
             }
         }
 
-        userAgent = String.format("%sSwetrix; Casterlabs-SDK 1.0.0", device);
+        userAgent = String.format("%sCasterlabs-SDK/Swetrix", device);
     }
 
     static @Nullable JsonObject post(@NonNull String url, @NonNull JsonObject body) throws IOException {

src/main/java/co/casterlabs/swetrix/Swetrix.java

@@ -47,6 +47,7 @@ private Swetrix(Builder config) {
 
         if (this.config.debugEnabled) {
             this.logger.debug("Debug mode enabled! Using config: %s", this.config);
+            this.logger.debug("User agent: %s", HttpUtil.userAgent);
         }
     }