Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Matthew Finkel
tor-browser-build
Commits
7caff7a3
Commit
7caff7a3
authored
May 16, 2019
by
Georg Koppen
Browse files
Bug 30284: Fix broken start-up on KitKat devices
Fix by sisbell
parent
619cf8e9
Changes
3
Hide whitespace changes
Inline
Side-by-side
projects/tor-onion-proxy-library/30284.patch
0 → 100644
View file @
7caff7a3
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
projects/tor-onion-proxy-library/build
View file @
7caff7a3
...
...
@@ -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
...
...
projects/tor-onion-proxy-library/config
View file @
7caff7a3
...
...
@@ -30,3 +30,4 @@ input_files:
exec
:
'
[%
INCLUDE
"fetch-gradle-dependencies"
%]'
-
filename
:
maven-repo.patch
-
filename
:
add_socks_port_flags.patch
-
filename
:
30284.patch
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment