GA4 requires special format of client_id

Author: angryziber

src/net/azib/ipscan/config/Config.java

@@ -1,7 +1,7 @@
 package net.azib.ipscan.config;
 
 import java.util.Locale;
-import java.util.UUID;
+import java.util.Random;
 import java.util.prefs.Preferences;
 
 /**
@@ -13,7 +13,7 @@
 public final class Config {
 	private Preferences preferences;
 	public String language;
-	public String uuid;
+	public String gaClientId;
 	public boolean allowReports;
 
 	/** easily accessible scanner configuration */
@@ -32,10 +32,13 @@ public final class Config {
 		favoritesConfig = new FavoritesConfig(preferences);
 		openersConfig = new OpenersConfig(preferences);
 		language = preferences.get("language", "system");
-		uuid = preferences.get("uuid", null);
-		if (uuid == null) {
-			uuid = UUID.randomUUID().toString();
-			preferences.put("uuid", uuid);
+		gaClientId = preferences.get("gaClientId", null);
+		if (gaClientId == null) {
+			Random random = new Random();
+			long firstPart = 1000000000L + (long)(random.nextDouble() * 9000000000L);
+			long secondPart = 1000000000L + (long)(random.nextDouble() * 9000000000L);
+			gaClientId = firstPart + "." + secondPart;
+			preferences.put("gaClientId", gaClientId);
 		}
 		allowReports = preferences.getBoolean("allowReports", true);
 	}
@@ -50,7 +53,6 @@ public static Config getConfig() {
 
 	public void store() {
 		preferences.put("language", language);
-		preferences.put("uuid", uuid);
 		preferences.putBoolean("allowReports", allowReports);
 		scannerConfig.store();
 		guiConfig.store();
@@ -103,7 +105,7 @@ private Locale createLocale(String locale) {
 		return Locale.forLanguageTag(locale.replace('_', '-'));
 	}
 
-	public String getUUID() {
-		return uuid;
+	public String getGaClientId() {
+		return gaClientId;
 	}
 }

src/net/azib/ipscan/util/GoogleAnalytics.java

@@ -7,6 +7,7 @@
 
 import java.net.HttpURLConnection;
 import java.net.URL;
+import java.net.URLEncoder;
 import java.util.logging.Logger;
 
 import static java.nio.charset.StandardCharsets.UTF_8;
@@ -19,7 +20,7 @@
  */
 public class GoogleAnalytics {
 	public void report(String screen) {
-		report("screen_view", screen);
+		report("page_view", screen);
 	}
 
 	public void report(String type, String content) {
@@ -34,7 +35,7 @@ public void report(String type, String content) {
 
 			var payload = new StringBuilder();
 			payload.append("{");
-			payload.append("\"client_id\":\"").append(config.getUUID()).append("\",");
+			payload.append("\"client_id\":\"").append(config.getGaClientId()).append("\",");
 			payload.append("\"non_personalized_ads\":true,");
 			payload.append("\"events\":[{");
 			payload.append("\"name\":\"").append(type).append("\",");
@@ -51,8 +52,8 @@ public void report(String type, String content) {
 				payload.append(",\"description\":\"").append(content).append("\"");
 				payload.append(",\"fatal\":false");
 			} else {
-				payload.append(",\"firebase_screen\":\"").append(content).append("\"");
-				payload.append(",\"firebase_screen_class\":\"").append("MainActivity").append("\"");
+				payload.append(",\"page_title\":\"").append(content).append("\"");
+				payload.append(",\"page_location\":\"").append("https://angryip.org/app/").append(URLEncoder.encode(content, UTF_8)).append("\"");
 			}
 
 			payload.append("}}]");
@@ -64,7 +65,7 @@ public void report(String type, String content) {
 			}
 
 			try (var is = conn.getInputStream()) {
-				LoggerFactory.getLogger().info(new String(is.readAllBytes()));
+				is.readAllBytes();
 			}
 
 			conn.disconnect();