Commit 7caff7a3 authored by Georg Koppen's avatar Georg Koppen
Browse files

Bug 30284: Fix broken start-up on KitKat devices

Fix by sisbell
parent 619cf8e9
From 4402f247643c7b3b730f0facaf1c45dc02d5721f Mon Sep 17 00:00:00 2001
From: sisbell <shane.isbell@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
......@@ -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
......
......@@ -30,3 +30,4 @@ input_files:
exec: '[% INCLUDE "fetch-gradle-dependencies" %]'
- filename: maven-repo.patch
- filename: add_socks_port_flags.patch
- filename: 30284.patch
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment