Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 33f183bb authored by Guillaume Jacquart's avatar Guillaume Jacquart
Browse files

Fix rebase errors.

parent 573e144d

src/main/java/org/torproject/android/service/vpn/OrbotVpnManager.java

+2 −2
Original line number Diff line number Diff line
@@ -49,6 +49,7 @@ import java.io.FileInputStream; 
import java.io.FileOutputStream;

import java.io.IOException;

import java.net.InetAddress;

import java.util.ArrayList;

import java.util.Arrays;

import java.util.concurrent.ExecutorService;

import java.util.concurrent.Executors;
@@ -232,7 +233,7 @@ public class OrbotVpnManager implements Handler.Callback, OrbotConstants { 
            //   builder.addAddress(virtualGateway, 32);

            builder.addAddress(virtualGateway, 24)

                //.addRoute(defaultRoute, 0)

                .setSession(mService.getString(R.string.orbot_vpn))

                .setSession(mService.getString(R.string.orbot_vpn));



            for (String route : mService.getApplicationContext().getResources()

                    .getStringArray(R.array.all_routes_except_excluded)) {
@@ -354,7 +355,6 @@ public class OrbotVpnManager implements Handler.Callback, OrbotConstants { 
    @TargetApi(Build.VERSION_CODES.LOLLIPOP)

    private void doLollipopAppRouting(VpnService.Builder builder) throws NameNotFoundException {

        var apps = TorifiedApp.getApps(mService, prefs);

        ArrayList<TorifiedApp> apps = TorifiedApp.getApps(mService, prefs);



        for (TorifiedApp app : apps) {

            if (app.isBypassTor()) {

src/main/res/values-he/strings.xml

deleted100644 → 0
+0 −0

Empty file deleted.