[tbb-commits] [tor-browser-build/maint-8.5] Bug 30284: Fix broken start-up on KitKat devices

[gk at torproject.org]

commit 3d15fd5126abc6cc5166f38e2f936ab87b8a5a76
Author: Georg Koppen <gk at torproject.org>
Date:   Thu May 16 21:45:37 2019 +0000

    Bug 30284: Fix broken start-up on KitKat devices
    
    Fix by sisbell
---
 projects/tor-onion-proxy-library/30284.patch | 22 ++++++++++++++++++++++
 projects/tor-onion-proxy-library/build       |  1 +
 projects/tor-onion-proxy-library/config      |  1 +
 3 files changed, 24 insertions(+)

diff --git a/projects/tor-onion-proxy-library/30284.patch b/projects/tor-onion-proxy-library/30284.patch
new file mode 100644
index 0000000..a3594b9
--- /dev/null
+++ b/projects/tor-onion-proxy-library/30284.patch
@@ -0,0 +1,22 @@
+From 4402f247643c7b3b730f0facaf1c45dc02d5721f Mon Sep 17 00:00:00 2001
+From: sisbell <shane.isbell at gmail.com>
+Date: Thu, 16 May 2019 21:33:06 +0000
+Subject: [PATCH] Fixes thaliproject#120: Tor Startup Broken on KitKat Devices
+
+
+diff --git a/universal/src/main/java/com/msopentech/thali/toronionproxy/TorConfig.java b/universal/src/main/java/com/msopentech/thali/toronionproxy/TorConfig.java
+index 3df0f12..1ab7c2d 100644
+--- a/universal/src/main/java/com/msopentech/thali/toronionproxy/TorConfig.java
++++ b/universal/src/main/java/com/msopentech/thali/toronionproxy/TorConfig.java
+@@ -372,7 +372,7 @@ public final class TorConfig {
+         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) {
+-- 
+2.20.1
+
diff --git a/projects/tor-onion-proxy-library/build b/projects/tor-onion-proxy-library/build
index defedde..e674061 100644
--- a/projects/tor-onion-proxy-library/build
+++ b/projects/tor-onion-proxy-library/build
@@ -20,6 +20,7 @@ tar -C /var/tmp/build -xf [% project %]-[% c('version') %].tar.gz
 cd /var/tmp/build/[% project %]-[% c('version') %]
 patch -p1 < $rootdir/maven-repo.patch
 patch -p1 < $rootdir/add_socks_port_flags.patch
+patch -p1 < $rootdir/30284.patch
 
 # Build Android Libraries and Apps
 $GRADLE_HOME/gradle-4.1/bin/gradle --offline -P androidplugin=3.0.1 assembleRelease -x lint
diff --git a/projects/tor-onion-proxy-library/config b/projects/tor-onion-proxy-library/config
index 889b30d..9db33bd 100644
--- a/projects/tor-onion-proxy-library/config
+++ b/projects/tor-onion-proxy-library/config
@@ -30,3 +30,4 @@ input_files:
     exec: '[% INCLUDE "fetch-gradle-dependencies" %]'
   - filename: maven-repo.patch
   - filename: add_socks_port_flags.patch
+  - filename: 30284.patch