Commit de1e85a0 authored by Richard Pospesel's avatar Richard Pospesel
Browse files

Bug 41111: Use Lyrebird to provide WebTunnel PT Client 

Revert "Bug 40800: Add WebTunnel support"

This reverts commit 0438a9a4.
parent 0438a9a4

service/src/main/java/org/torproject/android/service/TorService.java

+1 −3
Original line number Diff line number Diff line
@@ -379,10 +379,8 @@ public final class TorService extends Service implements TorServiceConstants, Or 
            if(!pluggableTransportSnow.canExecute()) pluggableTransportSnow.setExecutable(true);

            File pluggableTransportConjure = new File(nativeDir, "libConjure.so");

            if(!pluggableTransportConjure.canExecute()) pluggableTransportConjure.setExecutable(true);

            File pluggableTransportWebtunnel = new File(nativeDir, "libWebtunnel.so");

            if(!pluggableTransportWebtunnel.canExecute()) pluggableTransportWebtunnel.setExecutable(true);



            builder.configurePluggableTransportsFromSettings(pluggableTransportObfs, pluggableTransportSnow, pluggableTransportConjure, pluggableTransportWebtunnel);

            builder.configurePluggableTransportsFromSettings(pluggableTransportObfs, pluggableTransportSnow, pluggableTransportConjure);

            mDataService.updateConfigBuilder(builder);

            onionProxyManager.getTorInstaller().updateTorConfigCustom

                    (builder.asString());