Просмотр исходного кода

Remove obsolete 'isTCS' parameter from notice.go and Android notice handler

Eugene Fryntov 1 год назад
Родитель
Сommit
f76e366870
3 измененных файлов с 2 добавлено и 6 удалено
  1. 1 3
      MobileLibrary/Android/PsiphonTunnel/PsiphonTunnel.java
  2. 0 1
      psiphon/controller.go
  3. 1 2
      psiphon/notice.go

+ 1 - 3
MobileLibrary/Android/PsiphonTunnel/PsiphonTunnel.java

@@ -117,7 +117,6 @@ public class PsiphonTunnel {
          * @param region The server region received.
          * @param region The server region received.
          */
          */
         default void onConnectedServerRegion(String region) {}
         default void onConnectedServerRegion(String region) {}
-        default void onIsTcs(boolean isTcs) {}
         default void onExiting() {}
         default void onExiting() {}
     }
     }
 
 
@@ -855,8 +854,7 @@ public class PsiphonTunnel {
             } else if (noticeType.equals("Exiting")) {
             } else if (noticeType.equals("Exiting")) {
                 mHostService.onExiting();
                 mHostService.onExiting();
             } else if (noticeType.equals("ActiveTunnel")) {
             } else if (noticeType.equals("ActiveTunnel")) {
-                mHostService.onIsTcs(notice.getJSONObject("data").getBoolean("isTCS"));
-                // Also report the tunnel's egress region to the host service
+                // Report the tunnel's egress region to the host service
                 mHostService.onConnectedServerRegion(
                 mHostService.onConnectedServerRegion(
                         notice.getJSONObject("data").getString("serverRegion"));
                         notice.getJSONObject("data").getString("serverRegion"));
             } else if (noticeType.equals("ApplicationParameters")) {
             } else if (noticeType.equals("ApplicationParameters")) {

+ 0 - 1
psiphon/controller.go

@@ -1001,7 +1001,6 @@ loop:
 			NoticeActiveTunnel(
 			NoticeActiveTunnel(
 				connectedTunnel.dialParams.ServerEntry.GetDiagnosticID(),
 				connectedTunnel.dialParams.ServerEntry.GetDiagnosticID(),
 				connectedTunnel.dialParams.TunnelProtocol,
 				connectedTunnel.dialParams.TunnelProtocol,
-				connectedTunnel.dialParams.ServerEntry.SupportsSSHAPIRequests(),
 				connectedTunnel.dialParams.ServerEntry.Region)
 				connectedTunnel.dialParams.ServerEntry.Region)
 
 
 			if isFirstTunnel {
 			if isFirstTunnel {

+ 1 - 2
psiphon/notice.go

@@ -678,12 +678,11 @@ func NoticeRequestedTactics(dialParams *DialParameters) {
 }
 }
 
 
 // NoticeActiveTunnel is a successful connection that is used as an active tunnel for port forwarding
 // NoticeActiveTunnel is a successful connection that is used as an active tunnel for port forwarding
-func NoticeActiveTunnel(diagnosticID, protocol string, isTCS bool, serverRegion string) {
+func NoticeActiveTunnel(diagnosticID, protocol string, serverRegion string) {
 	singletonNoticeLogger.outputNotice(
 	singletonNoticeLogger.outputNotice(
 		"ActiveTunnel", noticeIsDiagnostic,
 		"ActiveTunnel", noticeIsDiagnostic,
 		"diagnosticID", diagnosticID,
 		"diagnosticID", diagnosticID,
 		"protocol", protocol,
 		"protocol", protocol,
-		"isTCS", isTCS,
 		"serverRegion", serverRegion)
 		"serverRegion", serverRegion)
 }
 }