From 083129a03b563fcf45b914047924b2bde18a8a2a Mon Sep 17 00:00:00 2001
From: Daniel Heid <mail@daniel-heid.de>
Date: Tue, 14 Nov 2023 19:05:51 +0100
Subject: [PATCH] Update Matomo Java Tracker 3.0.6

---
 dev.skidfuscator.obfuscator/build.gradle      |  2 +-
 .../skidfuscator/obfuscator/Skidfuscator.java | 52 +++++++------------
 .../obfuscator/analytics/SkidTracker.java     | 33 ------------
 3 files changed, 21 insertions(+), 66 deletions(-)
 delete mode 100644 dev.skidfuscator.obfuscator/src/main/java/dev/skidfuscator/obfuscator/analytics/SkidTracker.java

diff --git a/dev.skidfuscator.obfuscator/build.gradle b/dev.skidfuscator.obfuscator/build.gradle
index c41365f8..dbb1d140 100644
--- a/dev.skidfuscator.obfuscator/build.gradle
+++ b/dev.skidfuscator.obfuscator/build.gradle
@@ -18,7 +18,7 @@ dependencies {
 
     api project(':commons')
     implementation 'com.github.lukfor:magic-progress:0.3.2'
-    implementation 'com.github.matomo-org:matomo-java-tracker:v1.7'
+    implementation 'com.github.matomo-org:matomo-java-tracker:3.0.6'
     api 'com.github.Col-E:jphantom:1.4.3'
     implementation 'dev.dirs:directories:26'
 
diff --git a/dev.skidfuscator.obfuscator/src/main/java/dev/skidfuscator/obfuscator/Skidfuscator.java b/dev.skidfuscator.obfuscator/src/main/java/dev/skidfuscator/obfuscator/Skidfuscator.java
index 2e4105fe..a2d9e4e3 100644
--- a/dev.skidfuscator.obfuscator/src/main/java/dev/skidfuscator/obfuscator/Skidfuscator.java
+++ b/dev.skidfuscator.obfuscator/src/main/java/dev/skidfuscator/obfuscator/Skidfuscator.java
@@ -4,7 +4,6 @@
 import com.typesafe.config.ConfigFactory;
 import dev.skidfuscator.jghost.GhostHelper;
 import dev.skidfuscator.jghost.tree.GhostLibrary;
-import dev.skidfuscator.obfuscator.analytics.SkidTracker;
 import dev.skidfuscator.config.DefaultSkidConfig;
 import dev.skidfuscator.obfuscator.creator.SkidApplicationClassSource;
 import dev.skidfuscator.obfuscator.creator.SkidCache;
@@ -70,12 +69,15 @@
 import org.mapleir.deob.PassGroup;
 import org.mapleir.deob.dataflow.LiveDataFlowAnalysisImpl;
 import org.mapleir.ir.cfg.ControlFlowGraph;
+import org.matomo.java.tracking.MatomoTracker;
+import org.matomo.java.tracking.TrackerConfiguration;
 import org.objectweb.asm.Opcodes;
-import org.piwik.java.tracking.PiwikRequest;
+import org.matomo.java.tracking.MatomoRequest;
 import org.topdank.byteengineer.commons.data.JarClassData;
 import org.topdank.byteengineer.commons.data.JarContents;
 
 import java.io.File;
+import java.net.URI;
 import java.net.URL;
 import java.nio.file.*;
 import java.util.*;
@@ -354,36 +356,22 @@ public void run() {
     }
 
     private void _runAnalytics() {
-        try {
-            final SkidTracker tracker = new SkidTracker(
-                    "https://analytics.skidfuscator.dev/matomo.php"
-            );
-
-            final PiwikRequest request = new PiwikRequest(
-                    1,
-                    null
-            );
-
-            final URL url = new URL("https://app.skidfuscator.dev");
-            request.setActionUrl(url);
-            request.setActionName("skidfuscator/launch");
-
-            request.setCampaignName("community");
-            request.setCampaignKeyword("launch");
-
-            request.setPluginJava(true);
-
-            request.setEventAction("launch");
-            request.setEventCategory("skidfuscator/community");
-            request.setEventName("Java");
-            request.setEventValue(MiscUtil.getJavaVersion());
-
-            tracker.sendRequestAsync(request);
-            tracker.getHttpClient().getConnectionManager().shutdown();
-            tracker.getHttpAsyncClient().close();
-        } catch (Exception e){
-            //e.printStackTrace();
-        }
+        final MatomoTracker tracker = new MatomoTracker(
+                TrackerConfiguration.builder().apiEndpoint(URI.create("https://analytics.skidfuscator.dev/matomo.php")).build()
+        );
+        final MatomoRequest request = MatomoRequest.request()
+                .siteId(1)
+                .actionUrl("https://app.skidfuscator.dev")
+                .actionName("skidfuscator/launch")
+                .campaignName("community")
+                .campaignKeyword("launch")
+                .pluginJava(true)
+                .eventAction("launch")
+                .eventCategory("skidfuscator/community")
+                .eventName("Java")
+                .eventValue((double) MiscUtil.getJavaVersion())
+                .build();
+        tracker.sendRequestAsync(request);
     }
 
     protected void _importConfig() {
diff --git a/dev.skidfuscator.obfuscator/src/main/java/dev/skidfuscator/obfuscator/analytics/SkidTracker.java b/dev.skidfuscator.obfuscator/src/main/java/dev/skidfuscator/obfuscator/analytics/SkidTracker.java
deleted file mode 100644
index db54c31d..00000000
--- a/dev.skidfuscator.obfuscator/src/main/java/dev/skidfuscator/obfuscator/analytics/SkidTracker.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package dev.skidfuscator.obfuscator.analytics;
-
-import org.apache.http.client.HttpClient;
-import org.apache.http.impl.nio.client.CloseableHttpAsyncClient;
-import org.piwik.java.tracking.PiwikTracker;
-
-public class SkidTracker extends PiwikTracker {
-    public SkidTracker(String hostUrl) {
-        super(hostUrl);
-    }
-
-    public SkidTracker(String hostUrl, int timeout) {
-        super(hostUrl, timeout);
-    }
-
-    public SkidTracker(String hostUrl, String proxyHost, int proxyPort) {
-        super(hostUrl, proxyHost, proxyPort);
-    }
-
-    public SkidTracker(String hostUrl, String proxyHost, int proxyPort, int timeout) {
-        super(hostUrl, proxyHost, proxyPort, timeout);
-    }
-
-    @Override
-    public HttpClient getHttpClient() {
-        return super.getHttpClient();
-    }
-
-    @Override
-    public CloseableHttpAsyncClient getHttpAsyncClient() {
-        return super.getHttpAsyncClient();
-    }
-}