only show output when debugging is on

guardianproject · Oct 30, 2019 · 733fcfd · 733fcfd
1 parent 5f9788f
commit 733fcfd
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 11 deletions.
diff --git a/orbotservice/build.gradle b/orbotservice/build.gradle
@@ -43,7 +43,7 @@ dependencies {
 
     implementation 'androidx.legacy:legacy-support-v4:1.0.0'
 
-    implementation 'org.torproject:tor-android-binary:0.4.1.5-rc'
+    implementation 'org.torproject:tor-android-binary:0.4.1.6-dev'
     implementation 'info.pluggabletransports.aptds:apt-dispatch-library:1.0.7'
     implementation 'info.pluggabletransports.aptds:apt-meek-obfs4-legacy:1.0.7'
     implementation 'info.pluggabletransports.aptds:jsocksAndroid:1.0.4'

diff --git a/orbotservice/src/main/java/org/torproject/android/service/util/CustomNativeLoader.java b/orbotservice/src/main/java/org/torproject/android/service/util/CustomNativeLoader.java
@@ -26,11 +26,12 @@ private static boolean loadFromZip(Context context, String libname, File destLoc
         try {
             zipFile = new ZipFile(context.getApplicationInfo().sourceDir);
 
-            Enumeration enumEntries = zipFile.entries();
-            while (enumEntries.hasMoreElements())
-            {
-                ZipEntry ze = (ZipEntry)enumEntries.nextElement();
-                Log.d("CustomNativeLoader","zipentry: " + ze.getName());
+            if (Prefs.useDebugLogging()) {
+                Enumeration enumEntries = zipFile.entries();
+                while (enumEntries.hasMoreElements()) {
+                    ZipEntry ze = (ZipEntry) enumEntries.nextElement();
+                    Log.d("CustomNativeLoader", "zipentry: " + ze.getName());
+                }
             }
 
 

diff --git a/...service/src/main/java/org/torproject/android/service/util/CustomTorResourceInstaller.java b/...service/src/main/java/org/torproject/android/service/util/CustomTorResourceInstaller.java
@@ -49,13 +49,13 @@ public File installResources () throws IOException, TimeoutException
 
         File fileNativeDir = new File(getNativeLibraryDir(context));
 
-        File[] filesNativeDir = fileNativeDir.listFiles();
-        for (File fileNative : filesNativeDir)
-        {
-            Log.d(TAG,"file native: " + fileNative.getAbsolutePath());
+        if (Prefs.useDebugLogging()) {
+            File[] filesNativeDir = fileNativeDir.listFiles();
+            for (File fileNative : filesNativeDir) {
+                Log.d(TAG, "file native: " + fileNative.getAbsolutePath());
+            }
         }
 
-
         fileTor = new File(fileNativeDir,TOR_ASSET_KEY + ".so");
 
         if (fileTor.exists())