Merge pull request thaliproject#131 from sisbell/july_fixes

Config and Startup Fixes

Author: yaronyg

android/build.gradle

@@ -14,11 +14,11 @@ buildscript {
 }
 
 android {
-    compileSdkVersion 26
+    compileSdkVersion 28
 
     defaultConfig {
         minSdkVersion 16
-        targetSdkVersion 26
+        targetSdkVersion 28
         versionCode 1
         versionName "0.0.3"
         consumerProguardFiles 'proguard-rules.pro'
@@ -69,7 +69,7 @@ dependencies {
     implementation 'net.freehaven.tor.control:jtorctl:0.2'
     implementation 'org.slf4j:slf4j-api:1.7.25'
     implementation 'org.slf4j:slf4j-android:1.7.25'
-    implementation 'com.android.support:appcompat-v7:26.1.0'
+    implementation 'com.android.support:appcompat-v7:28.0.0'
     testImplementation 'junit:junit:4.12'
     androidTestImplementation project(':android_tor_installer')
     androidTestImplementation 'org.torproject:tor-android-binary:0.3.5.8-rc-v2'

android_tor_installer/build.gradle

@@ -14,11 +14,11 @@ buildscript {
 }
 
 android {
-    compileSdkVersion 26
+    compileSdkVersion 28
 
     defaultConfig {
         minSdkVersion 16
-        targetSdkVersion 26
+        targetSdkVersion 28
         versionCode 1
         versionName "0.0.3"
 

universal/src/main/java/com/msopentech/thali/toronionproxy/OnionProxyManager.java

@@ -461,7 +461,10 @@ private Process spawnTorProcess() throws IOException {
             LOG.warn(e.toString(), e);
             throw new IOException(e);
         }
-        eatStream(torProcess.getErrorStream());
+        eatStream(torProcess.getErrorStream(), true);
+        if (getContext().getSettings().hasDebugLogs()) {
+            eatStream(torProcess.getInputStream(), false);
+        }
         return torProcess;
     }
 
@@ -504,16 +507,20 @@ private void waitForCookieAuthFileCreation(File cookieAuthFile) throws IOExcepti
         LOG.info("Created cookie auth file: time = " + (System.currentTimeMillis() - cookieAuthStartTime) + "ms");
     }
 
-    private void eatStream(final InputStream inputStream) {
+    private void eatStream(final InputStream inputStream, boolean isError) {
         new Thread() {
             @Override
             public void run() {
                 Scanner scanner = new Scanner(inputStream);
                 try {
                     while (scanner.hasNextLine()) {
-                        String error = scanner.nextLine();
-                        LOG.error(error);
-                        eventBroadcaster.broadcastException(error, new Exception());
+                        String line = scanner.nextLine();
+                        if(isError) {
+                            LOG.error(line);
+                            eventBroadcaster.broadcastException(line, new Exception());
+                        } else {
+                            LOG.info(line);
+                        }
                     }
                 } finally {
                     try {

universal/src/main/java/com/msopentech/thali/toronionproxy/TorConfig.java

@@ -372,7 +372,7 @@ public Builder fileCreationTimeout(int timeout) {
         public TorConfig build() {
             if(homeDir == null) {
                 String userHome = System.getProperty("user.home");
-                homeDir = (userHome != null && !"".equals(userHome)) ? new File(userHome) : configDir;
+                homeDir = (userHome != null && !"".equals(userHome) && !"/".equals(userHome)) ? new File(userHome) : configDir;
             }
 
             if (torExecutableFile == null) {

universal/src/main/java/com/msopentech/thali/toronionproxy/TorConfigBuilder.java

@@ -395,6 +395,10 @@ public TorConfigBuilder socksPort(String socksPort, String isolationFlag) {
         if (!isNullOrEmpty(isolationFlag)) {
             buffer.append(" ").append(isolationFlag);
         }
+        buffer.append(" KeepAliveIsolateSOCKSAuth");
+        buffer.append(" IPv6Traffic");
+        buffer.append(" PreferIPv6");
+
         buffer.append('\n');
         return this;
     }