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

Replace String.join with TextUtils.join

- String.join requires Java 8 / API 26
Rod Hynes 3 лет назад
Родитель
Сommit
5c99afdb33
1 измененных файлов с 3 добавлено и 2 удалено
  1. 3 2
      MobileLibrary/Android/PsiphonTunnel/PsiphonTunnel.java

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

@@ -33,6 +33,7 @@ import android.net.wifi.WifiManager;
 import android.os.Build;
 import android.os.Build;
 import android.os.ParcelFileDescriptor;
 import android.os.ParcelFileDescriptor;
 import android.telephony.TelephonyManager;
 import android.telephony.TelephonyManager;
+import android.text.TextUtils;
 import android.util.Base64;
 import android.util.Base64;
 
 
 import org.json.JSONArray;
 import org.json.JSONArray;
@@ -705,7 +706,7 @@ public class PsiphonTunnel {
 
 
         try {
         try {
             // Use the workaround, comma-delimited format required for gobind.
             // Use the workaround, comma-delimited format required for gobind.
-            servers = String.join(",", getActiveNetworkDNSServers(context, mVpnMode.get()));
+            servers = TextUtils.join(",", getActiveNetworkDNSServers(context, mVpnMode.get()));
         } catch (Exception e) {
         } catch (Exception e) {
             logger.onDiagnosticMessage("failed to get active network DNS resolver: " + e.getMessage());
             logger.onDiagnosticMessage("failed to get active network DNS resolver: " + e.getMessage());
             // Alternate DNS servers will be provided by psiphon-tunnel-core
             // Alternate DNS servers will be provided by psiphon-tunnel-core
@@ -1564,7 +1565,7 @@ public class PsiphonTunnel {
                         } catch (java.lang.Exception e) {
                         } catch (java.lang.Exception e) {
                         }
                         }
                         // Use the workaround, comma-delimited format required for gobind.
                         // Use the workaround, comma-delimited format required for gobind.
-                        activeNetworkDNSServers.set(String.join(",", servers));
+                        activeNetworkDNSServers.set(TextUtils.join(",", servers));
 
 
                         String message = "NetworkMonitor: set current active network " + networkType;
                         String message = "NetworkMonitor: set current active network " + networkType;
                         if (!servers.isEmpty()) {
                         if (!servers.isEmpty()) {