Clarify name and generalize reported event

DBOI7453 · Aug 1, 2019 · 8249fe1 · 8249fe1
1 parent 89bc335
commit 8249fe1
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 8 deletions.
diff --git a/Android/app/src/main/java/app/intra/net/socks/OverrideSocksHandler.java b/Android/app/src/main/java/app/intra/net/socks/OverrideSocksHandler.java
@@ -76,9 +76,9 @@ private static int httpsTimeoutMs(int tcpHandshakeMs) {
   }
 
   // If true, apply splitting on HTTPS automatically, without waiting for an error condition.
-  private boolean alwaysSplitHttps = false;
-  void setAlwaysSplitHttps(boolean v) {
-    alwaysSplitHttps = v;
+  private boolean alwaysSplitClientHello = false;
+  void setAlwaysSplitClientHello(boolean v) {
+    alwaysSplitClientHello = v;
   }
 
   @Override
@@ -143,7 +143,7 @@ public void doConnect(Session session, CommandMessage commandMessage) throws IOE
 
     StatsListener listener = null;
     try {
-      if (alwaysSplitHttps && remoteServerPort == HTTPS_PORT) {
+      if (alwaysSplitClientHello && remoteServerPort == HTTPS_PORT) {
         listener = runWithImmediateSplit(upload, download, sessionUpload, socketUpload);
       } else {
         listener = runPipes(upload, download, remoteServerPort, httpsTimeoutMs(tcpHandshakeMs));

diff --git a/Android/app/src/main/java/app/intra/net/socks/SocksServer.java b/Android/app/src/main/java/app/intra/net/socks/SocksServer.java
@@ -69,7 +69,7 @@ public void initializeSocksHandler(SocksHandler socksHandler) {
       OverrideSocksHandler override = (OverrideSocksHandler)socksHandler;
       override.setDns(fakeDns, trueDns);
       override.setContext(context);
-      override.setAlwaysSplitHttps(useTlsWorkaround);
+      override.setAlwaysSplitClientHello(useTlsWorkaround);
 
     } else {
       LogWrapper.log(Log.WARN, LOG_TAG, "Foreign handler");

diff --git a/Android/app/src/main/java/app/intra/net/socks/TLSProbe.java b/Android/app/src/main/java/app/intra/net/socks/TLSProbe.java
@@ -41,8 +41,10 @@ private static Result probe(String spec) {
 
   static Result run(Context context, String url) {
     Result r = probe(url);
-    if (r == Result.TLS_FAILED && context != null) {
-      FirebaseAnalytics.getInstance(context).logEvent(Names.TLS_FAILED.name(), new Bundle());
+    if (context != null) {
+      Bundle b = new Bundle();
+      b.putString(Names.RESULT.name(), r.name());
+      FirebaseAnalytics.getInstance(context).logEvent(Names.TLS_PROBE.name(), b);
     }
     return r;
   }

diff --git a/Android/app/src/main/java/app/intra/sys/Names.java b/Android/app/src/main/java/app/intra/sys/Names.java
@@ -38,7 +38,7 @@ public enum Names {
   SPLIT,
   TCP_HANDSHAKE_MS,
   TIMEOUT,
-  TLS_FAILED,
+  TLS_PROBE,
   TRANSACTION,
   TRY_ALL_ACCEPTED,
   TRY_ALL_CANCELLED,