dan
/
tor-android
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'update-ant-build' of https://github.com/eighthave/orbot into eighthave-update-ant-build

This commit is contained in:
Nathan Freitas 2017-01-13 22:16:59 -05:00
parent a5744d7958 1e93ef4606
commit d937b9b958
4 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
jenkins-build
View File

@ -1,11 +1,13 @@
#!/bin/bash #!/bin/bash
# bash is required because we need bash's printf to guarantee a cross-platform
# timestamp format.
set -e set -e
set -x set -x
if [ -z $ANDROID_HOME ]; then if [ -z $ANDROID_HOME ]; then
if [ -e ~/.android/bashrc ]; then if [ -e ~/.android/bashrc-ant-build ]; then
. ~/.android/bashrc . ~/.android/bashrc-ant-build
else else
echo "ANDROID_HOME must be set!" echo "ANDROID_HOME must be set!"
exit exit

4
make-release-build
View File

@ -27,8 +27,8 @@ fi
if [ -z $ANDROID_HOME ]; then if [ -z $ANDROID_HOME ]; then
if [ -e ~/.android/bashrc ]; then if [ -e ~/.android/bashrc-ant-build ]; then
. ~/.android/bashrc . ~/.android/bashrc-ant-build
else else
echo "ANDROID_HOME must be set!" echo "ANDROID_HOME must be set!"
exit exit

4
orbotservice/src/main/java/org/torproject/android/service/TorService.java
View File

@ -733,7 +733,9 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon
/** /**
* Send Orbot's status in reply to an * Send Orbot's status in reply to an
* {@link TorServiceConstants#ACTION_START} {@link Intent}, targeted only to * {@link TorServiceConstants#ACTION_START} {@link Intent}, targeted only to
* the app that sent the initial request. * the app that sent the initial request. If the user has disabled auto-
* starts, the reply {@code ACTION_START Intent} will include the extra
* {@link TorServiceConstants#STATUS_STARTS_DISABLED}
*/ */
private void replyWithStatus(Intent startRequest) { private void replyWithStatus(Intent startRequest) {
String packageName = startRequest.getStringExtra(EXTRA_PACKAGE_NAME); String packageName = startRequest.getStringExtra(EXTRA_PACKAGE_NAME);

4
orbotservice/src/main/java/org/torproject/android/service/TorServiceConstants.java
View File

@ -117,9 +117,11 @@ public interface TorServiceConstants {
public final static String STATUS_ON = "ON"; public final static String STATUS_ON = "ON";
public final static String STATUS_STARTING = "STARTING"; public final static String STATUS_STARTING = "STARTING";
public final static String STATUS_STOPPING = "STOPPING"; public final static String STATUS_STOPPING = "STOPPING";
/** /**
* The user has disabled the ability for background starts triggered by * The user has disabled the ability for background starts triggered by
* apps. Fallback to the old Intent that brings up Orbot. * apps. Fallback to the old {@link Intent} action that brings up Orbot:
* {@link org.torproject.android.OrbotMainActivity#INTENT_ACTION_REQUEST_START_TOR}
*/ */
public final static String STATUS_STARTS_DISABLED = "STARTS_DISABLED"; public final static String STATUS_STARTS_DISABLED = "STARTS_DISABLED";