commit d4befad117f3485f0aa67b2ce44d3f1b13de2720 Author: n8fr8 nathan@guardianproject.info Date: Wed Jan 2 14:18:39 2019 -0500

cleanup and binary loading fixes --- .../src/main/java/org/torproject/android/service/TorService.java | 9 +-------- .../torproject/android/service/util/OtherResourceInstaller.java | 4 ---- 2 files changed, 1 insertion(+), 12 deletions(-)

diff --git a/orbotservice/src/main/java/org/torproject/android/service/TorService.java b/orbotservice/src/main/java/org/torproject/android/service/TorService.java index 64845b77..2ce7b706 100644 --- a/orbotservice/src/main/java/org/torproject/android/service/TorService.java +++ b/orbotservice/src/main/java/org/torproject/android/service/TorService.java @@ -25,9 +25,7 @@ import android.content.Intent; import android.content.IntentFilter; import android.content.SharedPreferences; import android.content.pm.PackageManager; -import android.content.res.Configuration; import android.database.Cursor; -import android.graphics.Color; import android.net.ConnectivityManager; import android.net.NetworkInfo; import android.net.Uri; @@ -40,8 +38,6 @@ import android.support.v4.app.NotificationCompat; import android.support.v4.content.LocalBroadcastManager; import android.text.TextUtils; import android.util.Log; -import android.widget.RemoteViews; -import android.widget.Toast;

import com.jrummyapps.android.shell.CommandResult; import com.jrummyapps.android.shell.Shell; @@ -49,9 +45,8 @@ import com.jrummyapps.android.shell.Shell; import org.torproject.android.binary.TorResourceInstaller; import org.torproject.android.control.ConfigEntry; import org.torproject.android.control.TorControlConnection; -import org.torproject.android.service.util.OtherResourceInstaller; -import org.torproject.android.service.vpn.TorifiedApp; import org.torproject.android.service.util.DummyActivity; +import org.torproject.android.service.util.OtherResourceInstaller; import org.torproject.android.service.util.Prefs; import org.torproject.android.service.util.TorServiceUtils; import org.torproject.android.service.util.Utils; @@ -77,9 +72,7 @@ import java.util.Arrays; import java.util.Collections; import java.util.Iterator; import java.util.List; -import java.util.Properties; import java.util.Random; -import java.util.Set; import java.util.StringTokenizer; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; diff --git a/orbotservice/src/main/java/org/torproject/android/service/util/OtherResourceInstaller.java b/orbotservice/src/main/java/org/torproject/android/service/util/OtherResourceInstaller.java index 7903fb41..309f7e58 100644 --- a/orbotservice/src/main/java/org/torproject/android/service/util/OtherResourceInstaller.java +++ b/orbotservice/src/main/java/org/torproject/android/service/util/OtherResourceInstaller.java @@ -70,15 +70,11 @@ public class OtherResourceInstaller implements TorServiceConstants { if (!installFolder.exists()) installFolder.mkdirs();

-// File libBinary = new File(getNativeLibraryDir(context),OBFSCLIENT_ASSET_KEY + ".so"); outFile = new File(installFolder, OBFSCLIENT_ASSET_KEY); NativeLoader.initNativeLibs(context,OBFSCLIENT_ASSET_KEY,outFile); - // setExecutable(outFile);

- // libBinary = new File(getNativeLibraryDir(context),PDNSD_ASSET_KEY + ".so"); outFile = new File(installFolder, PDNSD_ASSET_KEY); NativeLoader.initNativeLibs(context,PDNSD_ASSET_KEY,outFile); - // setExecutable(outFile);

return true; }