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

jenkins-build

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

make-release-build

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

orbotservice/src/main/java/org/torproject/android/service/TorService.java

@@ -733,7 +733,9 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon
     /**
      * Send Orbot's status in reply to an
      * {@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) {
         String packageName = startRequest.getStringExtra(EXTRA_PACKAGE_NAME);

orbotservice/src/main/java/org/torproject/android/service/TorServiceConstants.java

@@ -117,9 +117,11 @@ public interface TorServiceConstants {
     public final static String STATUS_ON = "ON";
     public final static String STATUS_STARTING = "STARTING";
     public final static String STATUS_STOPPING = "STOPPING";
+
     /**
      * 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";