June 2015 - tor-commits - lists.torproject.org

[orbot/master] include all status messages with "start" in them in the starting sequence
by n8fr8＠torproject.org 25 Jun '15

25 Jun '15

commit f16394b7dba6ba6ed216c669eb75b4fd2fee9755 Author: Hans-Christoph Steiner <hans(a)eds.org> Date: Fri Jun 12 14:55:17 2015 -0400 include all status messages with "start" in them in the starting sequence Before, the startup sequence showed "Orbot is starting..." for a long time, then quickly showed the final tor percentage messages. This adds a few more messages to provide useful feedback. --- src/org/torproject/android/OrbotMainActivity.java | 5 ++++- 1 … [View More]

1 0

[orbot/master] set STATUS_STARTING in TorService.onCreate(), that's where it begins
by n8fr8＠torproject.org 25 Jun '15

25 Jun '15

commit 232098eeafef79c024a5b255e3de82cb3a8e92b4 Author: Hans-Christoph Steiner <hans(a)eds.org> Date: Fri Jun 12 14:49:19 2015 -0400 set STATUS_STARTING in TorService.onCreate(), that's where it begins The very first place that the whole tor start sequence starts is from TorService's onCreate(), so that is where STATUS_STARTING should be announced from. The open question is whether Intents besides ACTION_START ever cause TorService to start. In theory, … [View More]TorService should already be running when any Intent is sent besides ACTION_START. --- src/org/torproject/android/service/TorService.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/org/torproject/android/service/TorService.java b/src/org/torproject/android/service/TorService.java index a78769c..f5fe6e1 100644 --- a/src/org/torproject/android/service/TorService.java +++ b/src/org/torproject/android/service/TorService.java @@ -608,7 +608,10 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon @Override public void onCreate() { super.onCreate(); - Log.i("TorService", "onCreate"); + + sendCallbackStatus(STATUS_STARTING); + sendCallbackLogMessage(getString(R.string.status_starting_up)); + logNotice(getString(R.string.status_starting_up)); try { @@ -776,7 +779,8 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon * The entire process for starting tor and related services is run from this method. */ private void startTor() { - if (mCurrentStatus == STATUS_STARTING || mCurrentStatus == STATUS_STOPPING) { + // STATUS_STARTING is set in onCreate() + if (mCurrentStatus == STATUS_STOPPING) { // these states should probably be handled better sendCallbackLogMessage("Ignoring start request, currently " + mCurrentStatus); return; @@ -784,10 +788,6 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon sendCallbackLogMessage("Ignoring start request, already started."); return; } - - sendCallbackStatus(STATUS_STARTING); - sendCallbackLogMessage(getString(R.string.status_starting_up)); - logNotice(getString(R.string.status_starting_up)); if (findExistingTorDaemon()) { return; // an old tor is already running, nothing to do [View Less]

1 0

[orbot/master] announce Orbot is ON once the first circuit is complete
by n8fr8＠torproject.org 25 Jun '15

25 Jun '15

commit ff04bde300651b6f035beae562b66278693a54d4 Author: Hans-Christoph Steiner <hans(a)eds.org> Date: Fri Jun 12 14:24:57 2015 -0400 announce Orbot is ON once the first circuit is complete Before, it was announcing tor was started when it had completed starting the daemons. But that does not guarantee that Tor is actually connected and working. So instead, this waits for the first circuit to be built, then announces Tor is ON. --- src/org/torproject/android/… [View More]

1 0

[orbot/master] rename TorStarter to IncomingIntentRouter, it handles all Intents
by n8fr8＠torproject.org 25 Jun '15

25 Jun '15

commit 8f57b42e68ea96f784c92655b0039e0196f05200 Author: Hans-Christoph Steiner <hans(a)eds.org> Date: Fri Jun 12 14:46:47 2015 -0400 rename TorStarter to IncomingIntentRouter, it handles all Intents TorStarter does lots of things besides starting Tor --- src/org/torproject/android/service/TorService.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/org/torproject/android/service/TorService.java b/src/org/torproject/android/service/… [View More]

1 0

[orbot/master] "Allow Background Starts" prefs also controls the old START_TOR Intent
by n8fr8＠torproject.org 25 Jun '15

25 Jun '15

commit 943edf094bfd559abc0d7359ce7728f3e322cd15 Author: Hans-Christoph Steiner <hans(a)eds.org> Date: Wed Jun 17 11:45:07 2015 -0400 "Allow Background Starts" prefs also controls the old START_TOR Intent --- src/org/torproject/android/OrbotMainActivity.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/org/torproject/android/OrbotMainActivity.java b/src/org/torproject/android/OrbotMainActivity.java index 15af8b9..0bc0f7e 100644 --- a/src/org/… [View More]

1 0

[orbot/master] init file path variables (tor, polipo, etc) when the app starts
by n8fr8＠torproject.org 25 Jun '15

25 Jun '15

commit a81c0001d6cfb764ba6e1cd2fca6e78c6487c5f3 Author: Hans-Christoph Steiner <hans(a)eds.org> Date: Wed Jun 17 12:06:23 2015 -0400 init file path variables (tor, polipo, etc) when the app starts These file path variables can be set at the very start, OrbotApp.onCreate() and they will not change during the lifetime of the app, so represent them as globally accessible static variables. This is needed for things like OrbotMainActivity detecting whether the tor … [View More]daemon is still running, even though TorService is not. --- src/org/torproject/android/OrbotApp.java | 23 +++ src/org/torproject/android/service/TorService.java | 152 ++++++++------------ 2 files changed, 82 insertions(+), 93 deletions(-) diff --git a/src/org/torproject/android/OrbotApp.java b/src/org/torproject/android/OrbotApp.java index c6f4797..bbc2509 100644 --- a/src/org/torproject/android/OrbotApp.java +++ b/src/org/torproject/android/OrbotApp.java @@ -10,8 +10,11 @@ import android.os.Build; import android.text.TextUtils; import android.util.Log; +import org.torproject.android.service.TorServiceConstants; + import info.guardianproject.util.Languages; +import java.io.File; import java.util.Locale; public class OrbotApp extends Application implements OrbotConstants @@ -19,12 +22,32 @@ public class OrbotApp extends Application implements OrbotConstants private Locale locale; + public static File appBinHome; + public static File appCacheHome; + + public static File fileTor; + public static File filePolipo; + public static File fileObfsclient; + public static File fileMeekclient; + public static File fileXtables; + public static File fileTorRc; + @Override public void onCreate() { super.onCreate(); Prefs.setContext(this); setNewLocale(Prefs.getDefaultLocale()); + + appBinHome = getDir(TorServiceConstants.DIRECTORY_TOR_BINARY,Application.MODE_PRIVATE); + appCacheHome = getDir(TorServiceConstants.DIRECTORY_TOR_DATA,Application.MODE_PRIVATE); + + fileTor= new File(appBinHome, TorServiceConstants.TOR_ASSET_KEY); + filePolipo = new File(appBinHome, TorServiceConstants.POLIPO_ASSET_KEY); + fileObfsclient = new File(appBinHome, TorServiceConstants.OBFSCLIENT_ASSET_KEY); + fileMeekclient = new File(appBinHome, TorServiceConstants.MEEK_ASSET_KEY); + fileXtables = new File(appBinHome, TorServiceConstants.IPTABLES_ASSET_KEY); + fileTorRc = new File(appBinHome, TorServiceConstants.TORRC_ASSET_KEY); } @Override diff --git a/src/org/torproject/android/service/TorService.java b/src/org/torproject/android/service/TorService.java index 7830e5e..464382e 100644 --- a/src/org/torproject/android/service/TorService.java +++ b/src/org/torproject/android/service/TorService.java @@ -9,7 +9,6 @@ package org.torproject.android.service; import android.annotation.SuppressLint; -import android.app.Application; import android.app.Notification; import android.app.NotificationManager; import android.app.PendingIntent; @@ -41,6 +40,7 @@ import org.json.JSONArray; import org.json.JSONObject; import org.sufficientlysecure.rootcommands.Shell; import org.sufficientlysecure.rootcommands.command.SimpleCommand; +import org.torproject.android.OrbotApp; import org.torproject.android.OrbotConstants; import org.torproject.android.OrbotMainActivity; import org.torproject.android.Prefs; @@ -106,18 +106,9 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon private ArrayList<String> configBuffer = null; private ArrayList<String> resetBuffer = null; - - // private String appHome; - private File appBinHome; - private File appCacheHome; - - private File fileTor; - private File filePolipo; - private File fileObfsclient; - private File fileMeekclient; - private File fileXtables; - - private File fileTorRc; + + private boolean isTorUpgradeAndConfigComplete = false; + private File fileControlPort; private TorTransProxy mTransProxy; @@ -170,31 +161,17 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon private boolean findExistingTorDaemon() { - if (fileTor != null) - { - try - { - - mLastProcessId = initControlConnection(3,true); - - if (mLastProcessId != -1 && conn != null) - { - sendCallbackLogMessage (getString(R.string.found_existing_tor_process)); - sendCallbackStatus(STATUS_ON); - return true; - } - - - return false; - } - catch (Exception e) - { - //Log.e(TAG,"error finding proc",e); - return false; + try { + mLastProcessId = initControlConnection(3, true); + + if (mLastProcessId != -1 && conn != null) { + sendCallbackLogMessage(getString(R.string.found_existing_tor_process)); + sendCallbackStatus(STATUS_ON); + return true; } + } catch (Exception e) { } - else - return false; + return false; } /* (non-Javadoc) @@ -442,7 +419,7 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon int hsPort = Integer.parseInt(st.nextToken().split(" ")[0]);; - File fileDir = new File(appCacheHome, "hs" + hsPort); + File fileDir = new File(OrbotApp.appCacheHome, "hs" + hsPort); File file = new File(fileDir, "hostname"); @@ -507,28 +484,28 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon // try these separately in case one fails, then it can try the next File cannotKillFile = null; try { - killProcess(fileObfsclient); + killProcess(OrbotApp.fileObfsclient); } catch (IOException e) { e.printStackTrace(); - cannotKillFile = fileObfsclient; + cannotKillFile = OrbotApp.fileObfsclient; } try { - killProcess(fileMeekclient); + killProcess(OrbotApp.fileMeekclient); } catch (IOException e) { e.printStackTrace(); - cannotKillFile = fileMeekclient; + cannotKillFile = OrbotApp.fileMeekclient; } try { - killProcess(filePolipo); + killProcess(OrbotApp.filePolipo); } catch (IOException e) { e.printStackTrace(); - cannotKillFile = filePolipo; + cannotKillFile = OrbotApp.filePolipo; } try { - killProcess(fileTor); + killProcess(OrbotApp.fileTor); } catch (IOException e) { e.printStackTrace(); - cannotKillFile = fileTor; + cannotKillFile = OrbotApp.fileTor; } if (cannotKillFile != null) throw new CannotKillException(cannotKillFile); @@ -551,7 +528,7 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon } // if that fails, try again using native utils try { - killProcess(fileTor, "-1"); // this is -HUP + killProcess(OrbotApp.fileTor, "-1"); // this is -HUP } catch (CannotKillException e) { e.printStackTrace(); } catch (IOException e) { @@ -631,7 +608,7 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon } - initBinariesAndDirectories(); + torUpgradeAndConfig(); new Thread(new Runnable () { @@ -662,33 +639,21 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon logNotice("There was an error installing Orbot binaries"); } - + Log.i("TorService", "onCreate end"); } - private void initBinariesAndDirectories () throws Exception - { - - if (appBinHome == null) - appBinHome = getDir(DIRECTORY_TOR_BINARY,Application.MODE_PRIVATE); - - if (appCacheHome == null) - appCacheHome = getDir(DIRECTORY_TOR_DATA,Application.MODE_PRIVATE); - - fileTor= new File(appBinHome, TOR_ASSET_KEY); - filePolipo = new File(appBinHome, POLIPO_ASSET_KEY); - fileObfsclient = new File(appBinHome, OBFSCLIENT_ASSET_KEY); - fileMeekclient = new File(appBinHome, MEEK_ASSET_KEY); - fileTorRc = new File(appBinHome, TORRC_ASSET_KEY); - fileXtables = new File(appBinHome, IPTABLES_ASSET_KEY); + private void torUpgradeAndConfig() throws IOException, TimeoutException { + if (isTorUpgradeAndConfigComplete) + return; SharedPreferences prefs = TorServiceUtils.getSharedPrefs(getApplicationContext()); String version = prefs.getString(PREF_BINARY_TOR_VERSION_INSTALLED,null); logNotice("checking binary version: " + version); - TorResourceInstaller installer = new TorResourceInstaller(this, appBinHome); + TorResourceInstaller installer = new TorResourceInstaller(this, OrbotApp.appBinHome); - if (version == null || (!version.equals(BINARY_TOR_VERSION)) || (!fileTor.exists())) + if (version == null || (!version.equals(BINARY_TOR_VERSION)) || (!OrbotApp.fileTor.exists())) { logNotice("upgrading binaries to latest version: " + BINARY_TOR_VERSION); @@ -699,18 +664,19 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon } updateTorConfigFile (); + isTorUpgradeAndConfigComplete = true; } private boolean updateTorConfigFile () throws FileNotFoundException, IOException, TimeoutException { SharedPreferences prefs = TorServiceUtils.getSharedPrefs(getApplicationContext()); - TorResourceInstaller installer = new TorResourceInstaller(this, appBinHome); + TorResourceInstaller installer = new TorResourceInstaller(this, OrbotApp.appBinHome); StringBuffer extraLines = new StringBuffer(); String TORRC_CONTROLPORT_FILE_KEY = "ControlPortWriteToFile"; - fileControlPort = new File(appBinHome,"control.txt"); + fileControlPort = new File(OrbotApp.appBinHome, "control.txt"); extraLines.append(TORRC_CONTROLPORT_FILE_KEY).append(' ').append(fileControlPort.getCanonicalPath()).append('\n'); if (Prefs.transparentTethering()) @@ -746,7 +712,7 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon debug("torrc.custom=" + extraLines.toString()); - File fileTorRcCustom = new File(fileTorRc.getAbsolutePath() + ".custom"); + File fileTorRcCustom = new File(OrbotApp.fileTorRc.getAbsolutePath() + ".custom"); boolean success = installer.updateTorConfigCustom(fileTorRcCustom, extraLines.toString()); if (success) @@ -801,8 +767,8 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon killAllDaemons(); try { - if (fileTor == null) - initBinariesAndDirectories(); + if (!isTorUpgradeAndConfigComplete) + torUpgradeAndConfig(); ArrayList<String> customEnv = new ArrayList<String>(); @@ -810,7 +776,7 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon if (Prefs.useVpn() && !mIsLollipop) customEnv.add("TOR_PT_PROXY=socks5://127.0.0.1:" + OrbotVpnService.mSocksProxyPort); - String baseDirectory = fileTor.getParent(); + String baseDirectory = OrbotApp.fileTor.getParent(); Shell shellUser = Shell.startShell(customEnv, baseDirectory); boolean success = runTorShellCmd(shellUser); @@ -862,7 +828,7 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon if (Prefs.useRoot()) { if (mTransProxy == null) - mTransProxy = new TorTransProxy(this, fileXtables); + mTransProxy = new TorTransProxy(this, OrbotApp.fileXtables); try { mTransProxy.flushTransproxyRules(this); @@ -890,7 +856,7 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon if (mTransProxy == null) { - mTransProxy = new TorTransProxy(this, fileXtables); + mTransProxy = new TorTransProxy(this, OrbotApp.fileXtables); } @@ -963,7 +929,7 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon debug ("Transparent Proxying: disabling..."); if (mTransProxy == null) - mTransProxy = new TorTransProxy(this, fileXtables); + mTransProxy = new TorTransProxy(this, OrbotApp.fileXtables); mTransProxy.setTransparentProxyingAll(this, false, shell); ArrayList<TorifiedApp> apps = AppManager.getApps(this, TorServiceUtils.getSharedPrefs(getApplicationContext())); @@ -975,14 +941,14 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon private boolean runTorShellCmd(final Shell shell) throws Exception { - String torrcPath = new File(appBinHome, TORRC_ASSET_KEY).getCanonicalPath(); + String torrcPath = new File(OrbotApp.appBinHome, TORRC_ASSET_KEY).getCanonicalPath(); updateTorConfigFile(); sendCallbackLogMessage(getString(R.string.status_starting_up)); - String torCmdString = fileTor.getCanonicalPath() - + " DataDirectory " + appCacheHome.getCanonicalPath() + String torCmdString = OrbotApp.fileTor.getCanonicalPath() + + " DataDirectory " + OrbotApp.appCacheHome.getCanonicalPath() + " --defaults-torrc " + torrcPath + " -f " + torrcPath + ".custom"; @@ -1037,7 +1003,7 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon { - File file = new File(appBinHome, POLIPOCONFIG_ASSET_KEY); + File file = new File(OrbotApp.appBinHome, POLIPOCONFIG_ASSET_KEY); Properties props = new Properties(); @@ -1056,7 +1022,7 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon logNotice( "Starting polipo process"); - int polipoProcId = TorServiceUtils.findProcessId(filePolipo.getCanonicalPath()); + int polipoProcId = TorServiceUtils.findProcessId(OrbotApp.filePolipo.getCanonicalPath()); StringBuilder log = null; @@ -1068,15 +1034,15 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon updatePolipoConfig(); - String polipoConfigPath = new File(appBinHome, POLIPOCONFIG_ASSET_KEY).getCanonicalPath(); - SimpleCommand cmdPolipo = new SimpleCommand(filePolipo.getCanonicalPath() + " -c " + polipoConfigPath + " &"); + String polipoConfigPath = new File(OrbotApp.appBinHome, POLIPOCONFIG_ASSET_KEY).getCanonicalPath(); + SimpleCommand cmdPolipo = new SimpleCommand(OrbotApp.filePolipo.getCanonicalPath() + " -c " + polipoConfigPath + " &"); shell.add(cmdPolipo); //wait one second to make sure it has started up Thread.sleep(1000); - while ((polipoProcId = TorServiceUtils.findProcessId(filePolipo.getCanonicalPath())) == -1 && attempts < MAX_START_TRIES) + while ((polipoProcId = TorServiceUtils.findProcessId(OrbotApp.filePolipo.getCanonicalPath())) == -1 && attempts < MAX_START_TRIES) { logNotice("Couldn't find Polipo process... retrying...\n" + log); Thread.sleep(3000); @@ -1138,7 +1104,7 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon { logNotice( "SUCCESS connected to Tor control port."); - File fileCookie = new File(appCacheHome, TOR_CONTROL_COOKIE); + File fileCookie = new File(OrbotApp.appCacheHome, TOR_CONTROL_COOKIE); if (fileCookie.exists()) { @@ -2113,9 +2079,9 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon if (obfsBridges) { - extraLines.append("ClientTransportPlugin obfs3 exec " + fileObfsclient.getCanonicalPath()).append('\n'); - extraLines.append("ClientTransportPlugin obfs4 exec " + fileObfsclient.getCanonicalPath()).append('\n'); - extraLines.append("ClientTransportPlugin scramblesuit exec " + fileObfsclient.getCanonicalPath()).append('\n'); + extraLines.append("ClientTransportPlugin obfs3 exec " + OrbotApp.fileObfsclient.getCanonicalPath()).append('\n'); + extraLines.append("ClientTransportPlugin obfs4 exec " + OrbotApp.fileObfsclient.getCanonicalPath()).append('\n'); + extraLines.append("ClientTransportPlugin scramblesuit exec " + OrbotApp.fileObfsclient.getCanonicalPath()).append('\n'); } String[] bridgeListLines = bridgeList.split("\\r?\\n"); @@ -2145,7 +2111,7 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon debug ("Using meek bridges"); - String bridgeConfig = "meek exec " + fileMeekclient.getCanonicalPath(); + String bridgeConfig = "meek exec " + OrbotApp.fileMeekclient.getCanonicalPath(); extraLines.append("ClientTransportPlugin" + ' ' + bridgeConfig).append('\n'); String[] meekBridge = @@ -2181,14 +2147,14 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon if (entranceNodes.length() > 0 || exitNodes.length() > 0 || excludeNodes.length() > 0) { //only apply GeoIP if you need it - File fileGeoIP = new File(appBinHome,GEOIP_ASSET_KEY); - File fileGeoIP6 = new File(appBinHome,GEOIP6_ASSET_KEY); + File fileGeoIP = new File(OrbotApp.appBinHome, GEOIP_ASSET_KEY); + File fileGeoIP6 = new File(OrbotApp.appBinHome, GEOIP6_ASSET_KEY); try { if ((!fileGeoIP.exists())) { - TorResourceInstaller installer = new TorResourceInstaller(this, appBinHome); + TorResourceInstaller installer = new TorResourceInstaller(this, OrbotApp.appBinHome); boolean success = installer.installGeoIP(); } @@ -2284,7 +2250,7 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon hsPort = Integer.parseInt(hsPortConfig.split(" ")[0]); - String hsDirPath = new File(appCacheHome,"hs" + hsPort).getCanonicalPath(); + String hsDirPath = new File(OrbotApp.appCacheHome,"hs" + hsPort).getCanonicalPath(); debug("Adding hidden service on port: " + hsPortConfig); @@ -2324,8 +2290,8 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon //using Google DNS for now as the public DNS server private String writeDNSFile () throws IOException { - File file = new File(appBinHome,"resolv.conf"); - + File file = new File(OrbotApp.appBinHome, "resolv.conf"); + PrintWriter bw = new PrintWriter(new FileWriter(file)); bw.println("nameserver 8.8.8.8"); bw.println("nameserver 8.8.4.4"); [View Less]

1 0

[orbot/master] improve status request/callback interaction and status UI layout
by n8fr8＠torproject.org 25 Jun '15

25 Jun '15

commit e132a79a610deb730713b203299ce783533e3aaa Author: Nathan Freitas <nathan(a)freitas.net> Date: Mon Jun 22 12:25:37 2015 -0400 improve status request/callback interaction and status UI layout --- res/layout/layout_main.xml | 80 +++++++---- src/org/torproject/android/OrbotMainActivity.java | 149 +++++++++++++------- src/org/torproject/android/service/TorService.java | 53 ++++--- .../android/service/TorServiceConstants.java | 4 +- 4 … [View More]files changed, 180 insertions(+), 106 deletions(-) diff --git a/res/layout/layout_main.xml b/res/layout/layout_main.xml index 1b46e55..a0fc1a6 100644 --- a/res/layout/layout_main.xml +++ b/res/layout/layout_main.xml @@ -4,6 +4,8 @@ xmlns:android="http://schemas.android.com/apk/res/android" android:orientation="vertical" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/panel_background_main" + > <android.support.v7.widget.Toolbar @@ -123,45 +125,58 @@ </RelativeLayout> </LinearLayout> - <FrameLayout + + <ProgressBar + android:id="@+id/pbConnecting" + style="?android:attr/progressBarStyleLarge" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginTop="60dp" + android:visibility="gone" + +android:layout_gravity="center_horizontal|center_vertical"/> + + <LinearLayout android:layout_width="match_parent" - android:layout_height="0dp" - android:layout_weight="1" - - android:background="@color/panel_background_main" - > - <org.torproject.android.ui.ImageProgressView - android:id="@+id/imgStatus" - android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginTop="5dp" - android:padding="0dp" - - android:src="@drawable/toroff" - android:layout_gravity="center_horizontal|center_vertical" /> - - <TextView - android:id="@+id/lblStatus" - android:textColor="@android:color/white" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:textSize="16sp" - android:gravity="center_vertical" - android:fontFamily="sans-serif-light" - android:text="" - android:layout_gravity="center_horizontal|bottom" - android:layout_margin="10dp" - - /> + android:id="@+id/frameMain" + android:visibility="visible" + android:orientation="vertical" + android:layout_gravity="center_horizontal|center_vertical" + > + <org.torproject.android.ui.ImageProgressView + android:id="@+id/imgStatus" + android:layout_width="match_parent" + android:layout_height="0dp" + android:layout_weight=".8" + + android:padding="0dp" + android:layout_margin="0dp" + android:src="@drawable/toroff" /> + + <TextView + android:id="@+id/lblStatus" + android:textColor="@android:color/white" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:textSize="14sp" + android:gravity="center_horizontal" + android:fontFamily="sans-serif-light" + android:text="" + android:lines="2" + android:maxLines="2" + android:layout_gravity="center_horizontal" + android:layout_margin="0dp" + android:layout_marginLeft="5dp" + android:layout_marginRight="5dp" + /> - </FrameLayout> - <LinearLayout android:gravity="center_horizontal" android:orientation="horizontal" android:layout_width="match_parent" android:layout_height="wrap_content" android:padding="5dp" android:background="@color/panel_background_dark" - + android:layout_gravity="bottom" > <Button @@ -203,8 +218,11 @@ /> </LinearLayout> + </LinearLayout> + </LinearLayout> </LinearLayout> + <LinearLayout android:layout_width="320dp" android:layout_height="match_parent" diff --git a/src/org/torproject/android/OrbotMainActivity.java b/src/org/torproject/android/OrbotMainActivity.java index e13f55d..54fe5f1 100644 --- a/src/org/torproject/android/OrbotMainActivity.java +++ b/src/org/torproject/android/OrbotMainActivity.java @@ -54,6 +54,7 @@ import android.view.View; import android.view.View.OnClickListener; import android.view.View.OnLongClickListener; import android.view.View.OnTouchListener; +import android.view.Window; import android.view.animation.AccelerateInterpolator; import android.widget.Button; import android.widget.TextView; @@ -84,7 +85,7 @@ public class OrbotMainActivity extends Activity private Toolbar mToolbar; /* Some tracking bits */ - private String torStatus = TorServiceConstants.STATUS_OFF; //latest status reported from the tor service + private String torStatus = null; //latest status reported from the tor service private Intent lastStatusIntent; // the last ACTION_STATUS Intent received private SharedPreferences mPrefs = null; @@ -102,7 +103,7 @@ public class OrbotMainActivity extends Activity public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - mPrefs = TorServiceUtils.getSharedPrefs(getApplicationContext()); + mPrefs = TorServiceUtils.getSharedPrefs(getApplicationContext()); /* Create the widgets before registering for broadcasts to guarantee * that the widgets exist when the status updates try to update them */ @@ -149,6 +150,7 @@ public class OrbotMainActivity extends Activity if (action.equals(TorServiceConstants.LOCAL_ACTION_LOG)) { Message msg = mStatusUpdateHandler.obtainMessage(STATUS_UPDATE); msg.obj = intent.getStringExtra(TorServiceConstants.LOCAL_EXTRA_LOG); + msg.getData().putString("status", intent.getStringExtra(TorServiceConstants.EXTRA_STATUS)); mStatusUpdateHandler.sendMessage(msg); } else if (action.equals(TorServiceConstants.LOCAL_ACTION_BANDWIDTH)) { @@ -162,13 +164,16 @@ public class OrbotMainActivity extends Activity msg.getData().putLong("upload", upload); msg.getData().putLong("readTotal", read); msg.getData().putLong("writeTotal", written); + msg.getData().putString("status", intent.getStringExtra(TorServiceConstants.EXTRA_STATUS)); + mStatusUpdateHandler.sendMessage(msg); } else if (action.equals(TorServiceConstants.ACTION_STATUS)) { lastStatusIntent = intent; - torStatus = intent.getStringExtra(TorServiceConstants.EXTRA_STATUS); + Message msg = mStatusUpdateHandler.obtainMessage(STATUS_UPDATE); - msg.obj = ""; + msg.getData().putString("status", intent.getStringExtra(TorServiceConstants.EXTRA_STATUS)); + mStatusUpdateHandler.sendMessage(msg); } } @@ -506,9 +511,9 @@ public class OrbotMainActivity extends Activity // Get intent, action and MIME type Intent intent = getIntent(); String action = intent.getAction(); - Log.e(TAG, "handleIntents " + action); + Log.d(TAG, "handleIntents " + action); - String type = intent.getType(); + //String type = intent.getType(); if (action == null) return; @@ -556,21 +561,19 @@ public class OrbotMainActivity extends Activity else if (action.equals("org.torproject.android.START_TOR")) { autoStartFromIntent = true; - try { - startTor(); + + startTor(); - Intent resultIntent; - if (lastStatusIntent == null) { - resultIntent = new Intent(intent); - } else { - resultIntent = lastStatusIntent; - } - resultIntent.putExtra(TorServiceConstants.EXTRA_STATUS, torStatus); - setResult(RESULT_OK, resultIntent); - finish(); - } catch (RemoteException e) { - e.printStackTrace(); + Intent resultIntent; + if (lastStatusIntent == null) { + resultIntent = new Intent(intent); + } else { + resultIntent = lastStatusIntent; } + resultIntent.putExtra(TorServiceConstants.EXTRA_STATUS, torStatus); + setResult(RESULT_OK, resultIntent); + finish(); + } else if (action.equals(Intent.ACTION_VIEW)) { @@ -590,7 +593,7 @@ public class OrbotMainActivity extends Activity } } - updateStatus(""); + updateStatus(null); setIntent(null); @@ -1003,18 +1006,10 @@ public class OrbotMainActivity extends Activity mBtnBridges.setChecked(Prefs.bridgesEnabled()); } - mStatusUpdateHandler.postDelayed(new Runnable () - { - public void run () - { - - handleIntents(); + requestTorStatus(); - } - } - , 500); - - + updateStatus(null); + } AlertDialog aDialog = null; @@ -1059,13 +1054,23 @@ public class OrbotMainActivity extends Activity */ private void updateStatus(String torServiceMsg) { + if (torStatus == null) + return; //UI not init'd yet + if (torStatus == TorServiceConstants.STATUS_ON) { + imgStatus.setImageResource(R.drawable.toron); mBtnBrowser.setEnabled(true); - // everything is running, clear the status message - lblStatus.setText(""); + if (torServiceMsg != null) + { + if (torServiceMsg.contains(TorServiceConstants.LOG_NOTICE_HEADER)) + lblStatus.setText(torServiceMsg); + } + else + lblStatus.setText(getString(R.string.status_activated)); + boolean showFirstTime = mPrefs.getBoolean("connect_first_time", true); @@ -1082,23 +1087,30 @@ public class OrbotMainActivity extends Activity { autoStartFromIntent = false; finish(); - Log.e(TAG, "autoStartFromIntent finish"); + Log.d(TAG, "autoStartFromIntent finish"); } + + } else if (torStatus == TorServiceConstants.STATUS_STARTING) { imgStatus.setImageResource(R.drawable.torstarting); - // only show Tor daemon's percentage complete messages - if (torServiceMsg.indexOf('%') != -1) { - lblStatus.setText(torServiceMsg); - } else if (torServiceMsg.contains("tart")) { // Start and start - lblStatus.setText(torServiceMsg); + if (torServiceMsg != null) + { + if (torServiceMsg.contains(TorServiceConstants.LOG_NOTICE_BOOTSTRAPPED)) + lblStatus.setText(torServiceMsg); } + else + lblStatus.setText(getString(R.string.status_starting_up)); + mBtnBrowser.setEnabled(false); } else if (torStatus == TorServiceConstants.STATUS_STOPPING) { + if (torServiceMsg != null && torServiceMsg.contains(TorServiceConstants.LOG_NOTICE_HEADER)) + lblStatus.setText(torServiceMsg); + imgStatus.setImageResource(R.drawable.torstarting); lblStatus.setText(torServiceMsg); mBtnBrowser.setEnabled(false); @@ -1121,22 +1133,32 @@ public class OrbotMainActivity extends Activity * {@link TorServiceConstants#ACTION_START} {@link Intent} to * {@link TorService} */ - private void startTor() throws RemoteException { + private void startTor() { sendIntentToService(TorServiceConstants.ACTION_START); } + + /** + * Request tor status without starting it + * {@link TorServiceConstants#ACTION_START} {@link Intent} to + * {@link TorService} + */ + private void requestTorStatus() { + sendIntentToService(TorServiceConstants.ACTION_STATUS); + } public boolean onLongClick(View view) { - try { - if (torStatus == TorServiceConstants.STATUS_OFF) { - startTor(); - } else { - stopTor(); - } - return true; - } catch (RemoteException e) { - Log.d(TAG, "error onclick", e); + + if (torStatus == TorServiceConstants.STATUS_OFF) { + lblStatus.setText(getString(R.string.status_starting_up)); + startTor(); + } else { + lblStatus.setText(getString(R.string.status_shutting_down)); + + stopTor(); } - return false; + + return true; + } // this is what takes messages or values from the callback threads or other non-mainUI threads @@ -1145,11 +1167,30 @@ public class OrbotMainActivity extends Activity @Override public void handleMessage(final Message msg) { + + String newTorStatus = msg.getData().getString("status"); + String log = (String)msg.obj; + + if (torStatus == null && newTorStatus != null) //first time status + { + torStatus = newTorStatus; + findViewById(R.id.pbConnecting).setVisibility(View.GONE); + findViewById(R.id.frameMain).setVisibility(View.VISIBLE); + updateStatus(log); + + //now you can handle the intents properly + handleIntents(); + + } + else if (newTorStatus != null && !torStatus.equals(newTorStatus)) //status changed + { + torStatus = newTorStatus; + updateStatus(log); + } + else if (log != null) //it is just a log + updateStatus(log); + switch (msg.what) { - case STATUS_UPDATE: - updateStatus((String) msg.obj); - break; - case MESSAGE_TRAFFIC_COUNT: Bundle data = msg.getData(); diff --git a/src/org/torproject/android/service/TorService.java b/src/org/torproject/android/service/TorService.java index f5fe6e1..bf065c3 100644 --- a/src/org/torproject/android/service/TorService.java +++ b/src/org/torproject/android/service/TorService.java @@ -346,7 +346,11 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon replyWithStatus(mIntent); startTor(); // stopTor() is called when the Service is destroyed - } else if (action.equals(CMD_SIGNAL_HUP)) { + } + else if (action.equals(ACTION_STATUS)) { + replyWithStatus(mIntent); + } + else if (action.equals(CMD_SIGNAL_HUP)) { requestTorRereadConfig(); } else if (action.equals(CMD_NEWNYM)) { newIdentity(); @@ -609,10 +613,6 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon public void onCreate() { super.onCreate(); - sendCallbackStatus(STATUS_STARTING); - sendCallbackLogMessage(getString(R.string.status_starting_up)); - logNotice(getString(R.string.status_starting_up)); - try { mNumberFormat = NumberFormat.getInstance(Locale.getDefault()); //localized numbers! @@ -760,9 +760,7 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon */ private void replyWithStatus(Intent startRequest) { String packageName = startRequest.getStringExtra(EXTRA_PACKAGE_NAME); - if (TextUtils.isEmpty(packageName)) { - return; - } + Intent reply = new Intent(ACTION_STATUS); reply.putExtra(EXTRA_STATUS, mCurrentStatus); reply.putExtra(EXTRA_SOCKS_PROXY, "socks://127.0.0.1:" + mPortSOCKS); @@ -771,8 +769,18 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon reply.putExtra(EXTRA_HTTP_PROXY, "http://127.0.0.1" + mPortHTTP); reply.putExtra(EXTRA_HTTP_PROXY_HOST, "127.0.0.1"); reply.putExtra(EXTRA_HTTP_PROXY_PORT, mPortHTTP); - reply.setPackage(packageName); - sendBroadcast(reply); + + if (packageName != null) + { + reply.setPackage(packageName); + sendBroadcast(reply); + } + else + { + LocalBroadcastManager.getInstance(this).sendBroadcast(reply); + + } + } /** @@ -784,18 +792,20 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon // these states should probably be handled better sendCallbackLogMessage("Ignoring start request, currently " + mCurrentStatus); return; - } else if (mCurrentStatus == STATUS_ON) { + } else if (mCurrentStatus == STATUS_ON && findExistingTorDaemon()) { + sendCallbackLogMessage("Ignoring start request, already started."); + return; - } - - if (findExistingTorDaemon()) { - return; // an old tor is already running, nothing to do - } - + } + // make sure there are no stray daemons running killAllDaemons(); + sendCallbackStatus(STATUS_STARTING); + sendCallbackLogMessage(getString(R.string.status_starting_up)); + logNotice(getString(R.string.status_starting_up)); + try { if (fileTor == null) initBinariesAndDirectories(); @@ -1882,9 +1892,10 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon Intent intent = new Intent(LOCAL_ACTION_BANDWIDTH); intent.putExtra("up",upload); - intent.putExtra("down",download); - intent.putExtra("written",written); - intent.putExtra("read",read); + intent.putExtra("down",download); + intent.putExtra("written",written); + intent.putExtra("read",read); + intent.putExtra(EXTRA_STATUS, mCurrentStatus); LocalBroadcastManager.getInstance(this).sendBroadcast(intent); } @@ -1895,6 +1906,8 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon Intent intent = new Intent(LOCAL_ACTION_LOG); // You can also include some extra data. intent.putExtra(LOCAL_EXTRA_LOG, logMessage); + intent.putExtra(EXTRA_STATUS, mCurrentStatus); + LocalBroadcastManager.getInstance(this).sendBroadcast(intent); } diff --git a/src/org/torproject/android/service/TorServiceConstants.java b/src/org/torproject/android/service/TorServiceConstants.java index adaa674..3d34deb 100644 --- a/src/org/torproject/android/service/TorServiceConstants.java +++ b/src/org/torproject/android/service/TorServiceConstants.java @@ -64,7 +64,9 @@ public interface TorServiceConstants { //control port public final static String TOR_CONTROL_PORT_MSG_BOOTSTRAP_DONE = "Bootstrapped 100%"; - + public final static String LOG_NOTICE_HEADER = "NOTICE"; + public final static String LOG_NOTICE_BOOTSTRAPPED = "Bootstrapped"; + /** * A request to Orbot to transparently start Tor services */ [View Less]

1 0

[orbot/master] Merge branch 'eighthave-the-big-start-stop-makeover'
by n8fr8＠torproject.org 25 Jun '15

25 Jun '15

commit a8384bde7400abb9282a509e5b897ca5e987923e Merge: 9a786d4 225ad9d Author: Nathan Freitas <nathan(a)freitas.net> Date: Mon Jun 22 12:39:17 2015 -0400 Merge branch 'eighthave-the-big-start-stop-makeover' .tx/config | 13 + AndroidManifest.xml | 37 +- description/source.xlf | 86 +++ external/.tx/config | 15 - external/tor … [View More]

1 0

[orbot/master] fix handling of foreground intent starts, and set bg start off by default
by n8fr8＠torproject.org 25 Jun '15

25 Jun '15

commit 225ad9d1ac1a73bbf061fbbc4d2d5e41feb60dfe Author: Nathan Freitas <nathan(a)freitas.net> Date: Mon Jun 22 12:37:51 2015 -0400 fix handling of foreground intent starts, and set bg start off by default --- res/xml/preferences.xml | 2 +- src/org/torproject/android/OrbotMainActivity.java | 33 +++++++++++++-------- 2 files changed, 22 insertions(+), 13 deletions(-) diff --git a/res/xml/preferences.xml b/res/xml/preferences.xml index e1e1828..… [View More]08eddfa 100644 --- a/res/xml/preferences.xml +++ b/res/xml/preferences.xml @@ -23,7 +23,7 @@ android:enabled="true" android:title="@string/pref_use_expanded_notifications_title"/> <CheckBoxPreference -android:defaultValue="true" +android:defaultValue="false" android:key="pref_allow_background_starts" android:summary="@string/pref_allow_background_starts_summary" android:title="@string/pref_allow_background_starts_title"/> diff --git a/src/org/torproject/android/OrbotMainActivity.java b/src/org/torproject/android/OrbotMainActivity.java index 54fe5f1..2fd68d3 100644 --- a/src/org/torproject/android/OrbotMainActivity.java +++ b/src/org/torproject/android/OrbotMainActivity.java @@ -99,6 +99,10 @@ public class OrbotMainActivity extends Activity private final static int STATUS_UPDATE = 1; private static final int MESSAGE_TRAFFIC_COUNT = 2; + public final static String INTENT_ACTION_REQUEST_HIDDEN_SERVICE = "org.torproject.android.REQUEST_HS_PORT"; + public final static String INTENT_ACTION_REQUEST_START_TOR = "org.torproject.android.START_TOR"; + + /** Called when the activity is first created. */ public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); @@ -501,8 +505,7 @@ public class OrbotMainActivity extends Activity } } - - + private synchronized void handleIntents () { if (getIntent() == null) @@ -518,7 +521,7 @@ public class OrbotMainActivity extends Activity if (action == null) return; - if (action.equals("org.torproject.android.REQUEST_HS_PORT")) + if (action.equals(INTENT_ACTION_REQUEST_HIDDEN_SERVICE)) { final int hiddenServicePortRequest = getIntent().getIntExtra("hs_port", -1); @@ -558,21 +561,24 @@ public class OrbotMainActivity extends Activity return; //don't null the setIntent() as we need it later } - else if (action.equals("org.torproject.android.START_TOR")) + else if (action.equals(INTENT_ACTION_REQUEST_START_TOR)) { autoStartFromIntent = true; startTor(); - Intent resultIntent; - if (lastStatusIntent == null) { - resultIntent = new Intent(intent); - } else { - resultIntent = lastStatusIntent; + if (Prefs.allowBackgroundStarts()) + { + Intent resultIntent; + if (lastStatusIntent == null) { + resultIntent = new Intent(intent); + } else { + resultIntent = lastStatusIntent; + } + resultIntent.putExtra(TorServiceConstants.EXTRA_STATUS, torStatus); + setResult(RESULT_OK, resultIntent); + finish(); } - resultIntent.putExtra(TorServiceConstants.EXTRA_STATUS, torStatus); - setResult(RESULT_OK, resultIntent); - finish(); } else if (action.equals(Intent.ACTION_VIEW)) @@ -1086,6 +1092,9 @@ public class OrbotMainActivity extends Activity if (autoStartFromIntent) { autoStartFromIntent = false; + Intent resultIntent = lastStatusIntent; + resultIntent.putExtra(TorServiceConstants.EXTRA_STATUS, torStatus); + setResult(RESULT_OK, resultIntent); finish(); Log.d(TAG, "autoStartFromIntent finish"); } [View Less]

1 0

[orbot/master] update to sdk 22
by n8fr8＠torproject.org 25 Jun '15

25 Jun '15

commit bf8113cd1986d5cae754a40d5bb26211ae8c1f4c Author: Nathan Freitas <nathan(a)freitas.net> Date: Thu Jun 25 10:37:59 2015 -0400 update to sdk 22 --- project.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project.properties b/project.properties index 856d757..c5e6dd1 100644 --- a/project.properties +++ b/project.properties @@ -9,7 +9,7 @@ #proguard.config=${sdk.dir}/tools/proguard/proguard-android-optimize.txt:proguard-project.txt # Project … [View More]

1 0