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

[orbot/master] make updateStatus() more closely match the state given from TorService
by n8fr8＠torproject.org 25 Jun '15

25 Jun '15

commit 5c2d4501fa10235b69965c090552ce4f4e6566c6 Author: Hans-Christoph Steiner <hans(a)eds.org> Date: Tue Jun 9 16:20:41 2015 -0400 make updateStatus() more closely match the state given from TorService This aims to make the UI more tighly in sync with the data coming from TorService. It is not currently perfect in the UI, but it means that the UI will represent the status bugs in TorService. This is important because that status info is now broadcast to any app that wants it. So the visible part of Orbot should show want the apps are seeing to aid debugging. And status report bugs should be fixed in TorService so that everyone gets the correctinfo. --- src/org/torproject/android/OrbotMainActivity.java | 144 +++++++++------------ 1 file changed, 63 insertions(+), 81 deletions(-) diff --git a/src/org/torproject/android/OrbotMainActivity.java b/src/org/torproject/android/OrbotMainActivity.java index 8d28db0..a2e9750 100644 --- a/src/org/torproject/android/OrbotMainActivity.java +++ b/src/org/torproject/android/OrbotMainActivity.java @@ -98,7 +98,9 @@ public class OrbotMainActivity extends Activity super.onCreate(savedInstanceState); 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 */ doLayout(); /* receive the internal status broadcasts, which are separate from the public @@ -1044,89 +1046,73 @@ public class OrbotMainActivity extends Activity aDialog.setCanceledOnTouchOutside(true); } - - private void updateStatus (String torServiceMsg) - { - - //now update the layout_main UI based on the status - if (imgStatus != null) + + /** + * Update the layout_main UI based on the status of {@link TorService}. + * {@code torServiceMsg} must never be {@code null} + */ + private void updateStatus(String torServiceMsg) { + + if (torStatus == TorServiceConstants.STATUS_ON) { + imgStatus.setImageResource(R.drawable.toron); + + mBtnBrowser.setEnabled(true); + + // everything is running, clear the status message + lblStatus.setText(""); + + boolean showFirstTime = mPrefs.getBoolean("connect_first_time", true); + + if (showFirstTime) { - - if (torStatus == TorServiceConstants.STATUS_ON) - { - - imgStatus.setImageResource(R.drawable.toron); - - mBtnBrowser.setEnabled(true); - - - if (lblStatus != null && torServiceMsg != null) - if (torServiceMsg.indexOf('%')!=-1) - lblStatus.setText(torServiceMsg); - else - lblStatus.setText(""); - - boolean showFirstTime = mPrefs.getBoolean("connect_first_time",true); - - if (showFirstTime) - { - - Editor pEdit = mPrefs.edit(); - - pEdit.putBoolean("connect_first_time",false); - - pEdit.commit(); - - showAlert(getString(R.string.status_activated),getString(R.string.connect_first_time),true); - - } - - if (autoStartFromIntent) - { - autoStartFromIntent = false; - finish(); - Log.e(TAG, "autoStartFromIntent finish"); - } - } - else if (torStatus == TorServiceConstants.STATUS_STARTING) - { - - imgStatus.setImageResource(R.drawable.torstarting); - - - if (lblStatus != null && torServiceMsg != null) - if (torServiceMsg.indexOf('%')!=-1) - lblStatus.setText(torServiceMsg); - - - - } - else if (torStatus == TorServiceConstants.STATUS_OFF) - { - imgStatus.setImageResource(R.drawable.toroff); - lblStatus.setText(getString(R.string.press_to_start)); - mBtnBrowser.setEnabled(false); - + Editor pEdit = mPrefs.edit(); + pEdit.putBoolean("connect_first_time", false); + pEdit.commit(); + showAlert(getString(R.string.status_activated), + getString(R.string.connect_first_time), true); + } - } - - if (torServiceMsg != null && torServiceMsg.length() > 0) - { - mTxtOrbotLog.append(torServiceMsg + '\n'); - } + if (autoStartFromIntent) + { + autoStartFromIntent = false; + finish(); + Log.e(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); + mBtnBrowser.setEnabled(false); + + } else if (torStatus == TorServiceConstants.STATUS_STOPPING) { + + imgStatus.setImageResource(R.drawable.torstarting); + lblStatus.setText(torServiceMsg); + mBtnBrowser.setEnabled(false); + + } else if (torStatus == TorServiceConstants.STATUS_OFF) { + + imgStatus.setImageResource(R.drawable.toroff); + lblStatus.setText(getString(R.string.press_to_start)); + mBtnBrowser.setEnabled(false); + } + + if (torServiceMsg != null && torServiceMsg.length() > 0) + { + mTxtOrbotLog.append(torServiceMsg + '\n'); + } } - - - + // guess what? this start's Tor! actually no it just requests via the local ITorService to the remote TorService instance // to start Tor private void startTor () throws RemoteException { + Log.i("OrbotMainActivity", "startTor"); sendIntentToService (TorServiceConstants.CMD_START); - torStatus = TorServiceConstants.STATUS_STARTING; mTxtOrbotLog.setText(""); @@ -1198,12 +1184,8 @@ public class OrbotMainActivity extends Activity downloadText.setText(formatCount(datacount.Download) + " / " + formatTotal(totalRead)); uploadText.setText(formatCount(datacount.Upload) + " / " + formatTotal(totalWrite)); - - if (torStatus != TorServiceConstants.STATUS_ON) - { - updateStatus(""); - } - + + break; default: super.handleMessage(msg); }

1 0

[orbot/master] strictly target local broadcasts
by n8fr8＠torproject.org 25 Jun '15

25 Jun '15

commit 90b731cc8d6c7935cf3ac95144e642b0b6eedc71 Author: Hans-Christoph Steiner <hans(a)eds.org> Date: Tue Jun 9 15:10:52 2015 -0400 strictly target local broadcasts This sets an action for each kind of local broadcast, and uses the action to choose how to handle it. Before, it was a mix of the action and which extras the Intent included. --- src/org/torproject/android/OrbotMainActivity.java | 79 ++++++++++---------- src/org/torproject/android/service/TorService.java | 26 ++----- .../android/service/TorServiceConstants.java | 1 + 3 files changed, 48 insertions(+), 58 deletions(-) diff --git a/src/org/torproject/android/OrbotMainActivity.java b/src/org/torproject/android/OrbotMainActivity.java index a73e0db..c540163 100644 --- a/src/org/torproject/android/OrbotMainActivity.java +++ b/src/org/torproject/android/OrbotMainActivity.java @@ -107,11 +107,13 @@ public class OrbotMainActivity extends Activity implements OrbotConstants, OnLon /* receive the internal status broadcasts, which are separate from the public * status broadcasts to prevent other apps from sending fake/wrong status * info to this app */ - LocalBroadcastManager.getInstance(this).registerReceiver(mLocalBroadcastReceiver, - new IntentFilter(TorServiceConstants.LOCAL_ACTION_STATUS)); - - LocalBroadcastManager.getInstance(this).registerReceiver(mLocalBroadcastReceiver, - new IntentFilter(TorServiceConstants.LOCAL_ACTION_LOG)); + LocalBroadcastManager lbm = LocalBroadcastManager.getInstance(this); + lbm.registerReceiver(mLocalBroadcastReceiver, + new IntentFilter(TorServiceConstants.LOCAL_ACTION_STATUS)); + lbm.registerReceiver(mLocalBroadcastReceiver, + new IntentFilter(TorServiceConstants.LOCAL_ACTION_BANDWIDTH)); + lbm.registerReceiver(mLocalBroadcastReceiver, + new IntentFilter(TorServiceConstants.LOCAL_ACTION_LOG)); } @@ -127,43 +129,44 @@ public class OrbotMainActivity extends Activity implements OrbotConstants, OnLon stopService(torService); } - // Our handler for received Intents. This will be called whenever an Intent - // with an action named "custom-event-name" is broadcasted. + /** + * The state and log info from {@link TorService} are sent to the UI here in + * the form of a local broadcast. Regular broadcasts can be sent by any app, + * so local ones are used here so other apps cannot interfere with Orbot's + * operation. + */ private BroadcastReceiver mLocalBroadcastReceiver = new BroadcastReceiver() { - @Override - public void onReceive(Context context, Intent intent) { - // Get extra data included in the Intent - - if (intent.hasExtra(TorServiceConstants.LOCAL_EXTRA_LOG)) - { - String log = intent.getStringExtra(TorServiceConstants.LOCAL_EXTRA_LOG); - updateStatus(log); - } - else if (intent.hasExtra("up")) - { - long upload = intent.getLongExtra("up",0); - long download = intent.getLongExtra("down",0); - long written = intent.getLongExtra("written",0); - long read = intent.getLongExtra("read",0); - - Message msg = mStatusUpdateHandler.obtainMessage(TorServiceConstants.MESSAGE_TRAFFIC_COUNT); - msg.getData().putLong("download", download); - msg.getData().putLong("upload", upload); - msg.getData().putLong("readTotal", read); - msg.getData().putLong("writeTotal", written); - mStatusUpdateHandler.sendMessage(msg); - - } - else if (intent.hasExtra(TorServiceConstants.EXTRA_STATUS)) - { - torStatus = intent.getStringExtra(TorServiceConstants.EXTRA_STATUS); - updateStatus(""); + @Override + public void onReceive(Context context, Intent intent) { + String action = intent.getAction(); + if (action == null) + return; + + if (action.equals(TorServiceConstants.LOCAL_ACTION_LOG)) { + String log = intent.getStringExtra(TorServiceConstants.LOCAL_EXTRA_LOG); + updateStatus(log); + + } else if (action.equals(TorServiceConstants.LOCAL_ACTION_BANDWIDTH)) { + long upload = intent.getLongExtra("up", 0); + long download = intent.getLongExtra("down", 0); + long written = intent.getLongExtra("written", 0); + long read = intent.getLongExtra("read", 0); + + Message msg = mStatusUpdateHandler + .obtainMessage(TorServiceConstants.MESSAGE_TRAFFIC_COUNT); + msg.getData().putLong("download", download); + msg.getData().putLong("upload", upload); + msg.getData().putLong("readTotal", read); + msg.getData().putLong("writeTotal", written); + mStatusUpdateHandler.sendMessage(msg); + + } else if (action.equals(TorServiceConstants.LOCAL_ACTION_STATUS)) { + torStatus = intent.getStringExtra(TorServiceConstants.EXTRA_STATUS); + updateStatus(""); + } } - - } }; - private void doLayout () { diff --git a/src/org/torproject/android/service/TorService.java b/src/org/torproject/android/service/TorService.java index 516b56e..089e2c6 100644 --- a/src/org/torproject/android/service/TorService.java +++ b/src/org/torproject/android/service/TorService.java @@ -1441,7 +1441,7 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon lastWritten = written; lastRead = read; - sendCallbackStatusMessage(lastWritten, lastRead, mTotalTrafficWritten, mTotalTrafficRead); + sendCallbackBandwidth(lastWritten, lastRead, mTotalTrafficWritten, mTotalTrafficRead); } private String formatCount(long count) { @@ -1841,39 +1841,25 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon } catch (Exception ioe) { - logException("Unable to update Tor configuration: " + ioe.getMessage(),ioe); - } return false; - } - - - - - private void sendCallbackStatusMessage (long upload, long download, long written, long read) - { - - - Intent intent = new Intent(LOCAL_ACTION_LOG); - // You can also include some extra data. + private void sendCallbackBandwidth(long upload, long download, long written, long read) { + Intent intent = new Intent(LOCAL_ACTION_BANDWIDTH); + intent.putExtra("up",upload); intent.putExtra("down",download); intent.putExtra("written",written); intent.putExtra("read",read); - - LocalBroadcastManager.getInstance(this).sendBroadcast(intent); + LocalBroadcastManager.getInstance(this).sendBroadcast(intent); } - - // private ArrayList<String> mLogBuffer = new ArrayList<String>(); - + private void sendCallbackLogMessage (String logMessage) { - Intent intent = new Intent(LOCAL_ACTION_LOG); // You can also include some extra data. diff --git a/src/org/torproject/android/service/TorServiceConstants.java b/src/org/torproject/android/service/TorServiceConstants.java index 745d74f..a79b7d7 100644 --- a/src/org/torproject/android/service/TorServiceConstants.java +++ b/src/org/torproject/android/service/TorServiceConstants.java @@ -71,6 +71,7 @@ public interface TorServiceConstants { public final static String EXTRA_STATUS = "org.torproject.android.intent.extra.STATUS"; public final static String LOCAL_ACTION_STATUS = "status"; public final static String LOCAL_ACTION_LOG = "log"; + public final static String LOCAL_ACTION_BANDWIDTH = "bandwidth"; public final static String LOCAL_EXTRA_LOG = "log"; public final static String STATUS_OFF = "OFF";

1 0

[orbot/master] expose start action via a BroadcastReceiver that any app can send to
by n8fr8＠torproject.org 25 Jun '15

25 Jun '15

commit f433a5e6556c93386c5e018285efe038c83afa8f Author: Hans-Christoph Steiner <hans(a)eds.org> Date: Wed Jun 10 14:46:05 2015 -0400 expose start action via a BroadcastReceiver that any app can send to This allows any app to broadcast an Intent to Orbot in order to make Orbot start in the background. closes #3117 https://dev.guardianproject.info/issues/3117 --- AndroidManifest.xml | 10 +++++++++- src/org/torproject/android/OrbotMainActivity.java | 10 +++++----- .../torproject/android/service/OnBootReceiver.java | 4 ++-- .../android/service/StartTorReceiver.java | 20 ++++++++++++++++++++ src/org/torproject/android/service/TorService.java | 2 +- .../android/service/TorServiceConstants.java | 2 +- 6 files changed, 38 insertions(+), 10 deletions(-) diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 603ac70..23f5e4e 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -87,7 +87,15 @@ android:permission="org.torproject.android.MANAGE_TOR" android:stopWithTask="false" > </service> - + + <receiver + android:name=".service.StartTorReceiver" + android:exported="true"> + <intent-filter> + <action android:name="org.torproject.android.intent.action.START" /> + </intent-filter> + </receiver> + <receiver android:name="org.torproject.android.service.OnBootReceiver" android:enabled="true" android:exported="true" diff --git a/src/org/torproject/android/OrbotMainActivity.java b/src/org/torproject/android/OrbotMainActivity.java index 38d3a80..bfa777d 100644 --- a/src/org/torproject/android/OrbotMainActivity.java +++ b/src/org/torproject/android/OrbotMainActivity.java @@ -924,11 +924,11 @@ public class OrbotMainActivity extends Activity } } } - - private void requestTorRereadConfig() { - sendIntentToService (TorServiceConstants.CMD_START); + + private void requestTorRereadConfig() { + sendIntentToService(TorServiceConstants.CMD_SIGNAL_HUP); } - + public void promptStartVpnService () { LayoutInflater li = LayoutInflater.from(this); @@ -1127,7 +1127,7 @@ public class OrbotMainActivity extends Activity imgStatus.setImageResource(R.drawable.torstarting); lblStatus.setText(getString(R.string.status_starting_up)); - sendIntentToService(TorServiceConstants.CMD_START); + sendIntentToService(TorServiceConstants.ACTION_START); //we send a message here to the progressDialog i believe, but we can clarify that shortly Message msg = mStatusUpdateHandler.obtainMessage(STATUS_UPDATE); diff --git a/src/org/torproject/android/service/OnBootReceiver.java b/src/org/torproject/android/service/OnBootReceiver.java index 49c4ab8..2429c4d 100644 --- a/src/org/torproject/android/service/OnBootReceiver.java +++ b/src/org/torproject/android/service/OnBootReceiver.java @@ -16,8 +16,8 @@ public class OnBootReceiver extends BroadcastReceiver { Prefs.setContext(context); if (Prefs.startOnBoot()) { - startService(TorServiceConstants.CMD_START,context); - + startService(TorServiceConstants.ACTION_START, context); + if (Prefs.useVpn()) startVpnService(context); } diff --git a/src/org/torproject/android/service/StartTorReceiver.java b/src/org/torproject/android/service/StartTorReceiver.java new file mode 100644 index 0000000..c236484 --- /dev/null +++ b/src/org/torproject/android/service/StartTorReceiver.java @@ -0,0 +1,20 @@ + +package org.torproject.android.service; + +import android.content.BroadcastReceiver; +import android.content.Context; +import android.content.Intent; +import android.text.TextUtils; + +public class StartTorReceiver extends BroadcastReceiver { + + @Override + public void onReceive(Context context, Intent intent) { + /* sanitize the Intent before forwarding it to TorService */ + if (TextUtils.equals(intent.getAction(), TorServiceConstants.ACTION_START)) { + Intent startTorService = new Intent(context, TorService.class); + startTorService.setAction(intent.getAction()); + context.startService(startTorService); + } + } +} diff --git a/src/org/torproject/android/service/TorService.java b/src/org/torproject/android/service/TorService.java index 089e2c6..efde5c6 100644 --- a/src/org/torproject/android/service/TorService.java +++ b/src/org/torproject/android/service/TorService.java @@ -341,7 +341,7 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon String action = mIntent.getAction(); if (action != null) { - if (action.equals(CMD_START)) { + if (action.equals(ACTION_START)) { startTor(); // stopTor() is called when the Service is destroyed } else if (action.equals(CMD_SIGNAL_HUP)) { diff --git a/src/org/torproject/android/service/TorServiceConstants.java b/src/org/torproject/android/service/TorServiceConstants.java index c31a670..96715b6 100644 --- a/src/org/torproject/android/service/TorServiceConstants.java +++ b/src/org/torproject/android/service/TorServiceConstants.java @@ -67,6 +67,7 @@ public interface TorServiceConstants { //control port public final static String TOR_CONTROL_PORT_MSG_BOOTSTRAP_DONE = "Bootstrapped 100%"; + public final static String ACTION_START = "org.torproject.android.intent.action.START"; public final static String ACTION_STATUS = "org.torproject.android.intent.action.STATUS"; public final static String EXTRA_STATUS = "org.torproject.android.intent.extra.STATUS"; @@ -79,7 +80,6 @@ public interface TorServiceConstants { public final static String STATUS_STARTING = "STARTING"; public final static String STATUS_STOPPING = "STOPPING"; - public static final String CMD_START = "start"; public static final String CMD_SIGNAL_HUP = "signal_hup"; public static final String CMD_FLUSH = "flush"; public static final String CMD_NEWNYM = "newnym";

1 0

[orbot/master] let the requesting app know that the user has disabled starting via Intent
by n8fr8＠torproject.org 25 Jun '15

25 Jun '15

commit 775135d07a9b2d91818d5b45ecac5af2cb07b0e8 Author: Hans-Christoph Steiner <hans(a)eds.org> Date: Wed Jun 10 18:15:29 2015 -0400 let the requesting app know that the user has disabled starting via Intent If an app is using ACTION_START to start Orbot in the background, but the user had disabled that using the allowBackgroundStarts pref, then the app will want to know about that so it can fallback on prompting the user to bring up Orbot itself for the user to manually start it. refs #3117 https://dev.guardianproject.info/issues/3117 --- .../android/service/StartTorReceiver.java | 26 +++++++++++++------- .../android/service/TorServiceConstants.java | 8 ++++-- 2 files changed, 23 insertions(+), 11 deletions(-) diff --git a/src/org/torproject/android/service/StartTorReceiver.java b/src/org/torproject/android/service/StartTorReceiver.java index c89d880..087b01f 100644 --- a/src/org/torproject/android/service/StartTorReceiver.java +++ b/src/org/torproject/android/service/StartTorReceiver.java @@ -8,21 +8,29 @@ import android.text.TextUtils; import org.torproject.android.Prefs; -public class StartTorReceiver extends BroadcastReceiver { +public class StartTorReceiver extends BroadcastReceiver implements TorServiceConstants { @Override public void onReceive(Context context, Intent intent) { /* sanitize the Intent before forwarding it to TorService */ Prefs.setContext(context); String action = intent.getAction(); - if (Prefs.allowBackgroundStarts() - && TextUtils.equals(action, TorServiceConstants.ACTION_START)) { - Intent startTorIntent = new Intent(context, TorService.class); - startTorIntent.setAction(action); - String packageName = intent.getStringExtra(TorServiceConstants.EXTRA_PACKAGE_NAME); - if (packageName != null) - startTorIntent.putExtra(TorServiceConstants.EXTRA_PACKAGE_NAME, packageName); - context.startService(startTorIntent); + if (TextUtils.equals(action, ACTION_START)) { + String packageName = intent.getStringExtra(EXTRA_PACKAGE_NAME); + if (Prefs.allowBackgroundStarts()) { + Intent startTorIntent = new Intent(context, TorService.class); + startTorIntent.setAction(action); + if (packageName != null) + startTorIntent.putExtra(EXTRA_PACKAGE_NAME, packageName); + context.startService(startTorIntent); + } else if (!TextUtils.isEmpty(packageName)) { + // let the requesting app know that the user has disabled + // starting via Intent + Intent startsDisabledIntent = new Intent(ACTION_STATUS); + startsDisabledIntent.putExtra(EXTRA_STATUS, STATUS_STARTS_DISABLED); + startsDisabledIntent.setPackage(packageName); + context.sendBroadcast(startsDisabledIntent); + } } } } diff --git a/src/org/torproject/android/service/TorServiceConstants.java b/src/org/torproject/android/service/TorServiceConstants.java index 7921ddc..80b37f8 100644 --- a/src/org/torproject/android/service/TorServiceConstants.java +++ b/src/org/torproject/android/service/TorServiceConstants.java @@ -104,6 +104,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. + */ + public final static String STATUS_STARTS_DISABLED = "STARTS_DISABLED"; // actions for internal command Intents public static final String CMD_SIGNAL_HUP = "signal_hup"; @@ -112,8 +117,7 @@ public interface TorServiceConstants { public static final String CMD_VPN = "vpn"; public static final String CMD_VPN_CLEAR = "vpnclear"; public static final String CMD_UPDATE_TRANS_PROXY = "update"; - - + public static final String BINARY_TOR_VERSION = "0.2.6.7"; public static final String PREF_BINARY_TOR_VERSION_INSTALLED = "BINARY_TOR_VERSION_INSTALLED";

1 0

[orbot/master] create a new pref: "Allow Background Starts"
by n8fr8＠torproject.org 25 Jun '15

25 Jun '15

commit ac8329c7f279b1e3afb747cff8b15c2fa1821bf1 Author: Hans-Christoph Steiner <hans(a)eds.org> Date: Wed Jun 10 18:00:30 2015 -0400 create a new pref: "Allow Background Starts" This lets the user disable the new ACTION_START Intent, in case they have more sensitive needs. --- res/values/strings.xml | 2 ++ res/xml/preferences.xml | 5 +++++ src/org/torproject/android/Prefs.java | 5 +++++ src/org/torproject/android/service/StartTorReceiver.java | 6 +++++- 4 files changed, 17 insertions(+), 1 deletion(-) diff --git a/res/values/strings.xml b/res/values/strings.xml index 87aa35f..decd892 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -126,6 +126,8 @@ <string name="pref_entrance_node">Entrance Nodes</string> <string name="pref_entrance_node_summary">Fingerprints, nicks, countries and addresses for the first hop</string> <string name="pref_entrance_node_dialog">Enter Entrance Nodes</string> + <string name="pref_allow_background_starts_title">Allow Background Starts</string> + <string name="pref_allow_background_starts_summary">Let any app tell Orbot to start Tor and related services</string> <string name="button_proxy_all">Proxy All</string> <string name="button_proxy_none">Proxy None</string> diff --git a/res/xml/preferences.xml b/res/xml/preferences.xml index d910fee..e1e1828 100644 --- a/res/xml/preferences.xml +++ b/res/xml/preferences.xml @@ -22,6 +22,11 @@ android:summary="@string/pref_use_expanded_notifications" android:enabled="true" android:title="@string/pref_use_expanded_notifications_title"/> +<CheckBoxPreference +android:defaultValue="true" +android:key="pref_allow_background_starts" +android:summary="@string/pref_allow_background_starts_summary" +android:title="@string/pref_allow_background_starts_title"/> <ListPreference android:title="@string/set_locale_title" android:key="pref_default_locale" diff --git a/src/org/torproject/android/Prefs.java b/src/org/torproject/android/Prefs.java index b1b1793..fad04ba 100644 --- a/src/org/torproject/android/Prefs.java +++ b/src/org/torproject/android/Prefs.java @@ -16,6 +16,7 @@ public class Prefs { private final static String PREF_HAS_ROOT = "has_root"; private final static String PREF_PERSIST_NOTIFICATIONS = "pref_persistent_notifications"; private final static String PREF_START_ON_BOOT = "pref_start_boot"; + private final static String PREF_ALLOW_BACKGROUND_STARTS = "pref_allow_background_starts"; private final static String PREF_TRANSPARENT = "pref_transparent"; private final static String PREF_TRANSPARENT_ALL = "pref_transparent_all"; private final static String PREF_TRANSPARENT_TETHERING = "pref_transparent_tethering"; @@ -98,6 +99,10 @@ public class Prefs { return prefs.getBoolean(PREF_PERSIST_NOTIFICATIONS, true); } + public static boolean allowBackgroundStarts() { + return prefs.getBoolean(PREF_ALLOW_BACKGROUND_STARTS, true); + } + public static boolean useVpn() { return prefs.getBoolean(PREF_USE_VPN, false); } diff --git a/src/org/torproject/android/service/StartTorReceiver.java b/src/org/torproject/android/service/StartTorReceiver.java index 89df596..c89d880 100644 --- a/src/org/torproject/android/service/StartTorReceiver.java +++ b/src/org/torproject/android/service/StartTorReceiver.java @@ -6,13 +6,17 @@ import android.content.Context; import android.content.Intent; import android.text.TextUtils; +import org.torproject.android.Prefs; + public class StartTorReceiver extends BroadcastReceiver { @Override public void onReceive(Context context, Intent intent) { /* sanitize the Intent before forwarding it to TorService */ + Prefs.setContext(context); String action = intent.getAction(); - if (TextUtils.equals(action, TorServiceConstants.ACTION_START)) { + if (Prefs.allowBackgroundStarts() + && TextUtils.equals(action, TorServiceConstants.ACTION_START)) { Intent startTorIntent = new Intent(context, TorService.class); startTorIntent.setAction(action); String packageName = intent.getStringExtra(TorServiceConstants.EXTRA_PACKAGE_NAME);

1 0

[orbot/master] standardize network port constant variables
by n8fr8＠torproject.org 25 Jun '15

25 Jun '15

commit 623084548d2f5fc8d87a63e21c7f9b413e3633f0 Author: Hans-Christoph Steiner <hans(a)eds.org> Date: Thu Jun 11 16:31:39 2015 -0400 standardize network port constant variables use consistent naming and types for code clarity --- src/org/torproject/android/OrbotMainActivity.java | 8 ++++---- src/org/torproject/android/service/TorService.java | 3 ++- .../android/service/TorServiceConstants.java | 18 +++++------------- src/org/torproject/android/vpn/OrbotVpnService.java | 3 ++- 4 files changed, 13 insertions(+), 19 deletions(-) diff --git a/src/org/torproject/android/OrbotMainActivity.java b/src/org/torproject/android/OrbotMainActivity.java index bfa777d..978d8cc 100644 --- a/src/org/torproject/android/OrbotMainActivity.java +++ b/src/org/torproject/android/OrbotMainActivity.java @@ -559,12 +559,12 @@ public class OrbotMainActivity extends Activity startTor(); Intent resultIntent = new Intent(intent); - resultIntent.putExtra("socks_proxy", "socks://127.0.0.1:" + TorServiceConstants.PORT_SOCKS_DEFAULT); + resultIntent.putExtra("socks_proxy", "socks://127.0.0.1:" + TorServiceConstants.SOCKS_PROXY_PORT_DEFAULT); resultIntent.putExtra("socks_proxy_host", "127.0.0.1"); - resultIntent.putExtra("socks_proxy_port", TorServiceConstants.PORT_SOCKS_DEFAULT); - resultIntent.putExtra("http_proxy", "http://127.0.0.1" + TorServiceConstants.PORT_HTTP); + resultIntent.putExtra("socks_proxy_port", TorServiceConstants.SOCKS_PROXY_PORT_DEFAULT); + resultIntent.putExtra("http_proxy", "http://127.0.0.1" + TorServiceConstants.HTTP_PROXY_PORT_DEFAULT); resultIntent.putExtra("http_proxy_host", "127.0.0.1"); - resultIntent.putExtra("http_proxy_port", TorServiceConstants.PORT_HTTP); + resultIntent.putExtra("http_proxy_port", TorServiceConstants.HTTP_PROXY_PORT_DEFAULT); setResult(RESULT_OK, resultIntent); finish(); } catch (RemoteException e) { diff --git a/src/org/torproject/android/service/TorService.java b/src/org/torproject/android/service/TorService.java index ccfc4c8..018adb2 100644 --- a/src/org/torproject/android/service/TorService.java +++ b/src/org/torproject/android/service/TorService.java @@ -1168,7 +1168,8 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon SharedPreferences prefs = TorServiceUtils.getSharedPrefs(getApplicationContext()); - String socksPortPref = prefs.getString(OrbotConstants.PREF_SOCKS, TorServiceConstants.PORT_SOCKS_DEFAULT); + String socksPortPref = prefs.getString(OrbotConstants.PREF_SOCKS, + String.valueOf(TorServiceConstants.SOCKS_PROXY_PORT_DEFAULT)); if (socksPortPref.indexOf(':')!=-1) socksPortPref = socksPortPref.split(":")[1]; diff --git a/src/org/torproject/android/service/TorServiceConstants.java b/src/org/torproject/android/service/TorServiceConstants.java index 80b37f8..a0aed24 100644 --- a/src/org/torproject/android/service/TorServiceConstants.java +++ b/src/org/torproject/android/service/TorServiceConstants.java @@ -49,21 +49,16 @@ public interface TorServiceConstants { public final static String CHMOD_EXE_VALUE = "770"; public final static int FILE_WRITE_BUFFER_SIZE = 1024; - - //HTTP Proxy server port - public static int PORT_HTTP = 8118; //just like Privoxy! - - //Socks port client connects to, server is the Tor binary - public static String PORT_SOCKS_DEFAULT = "9050"; - - - //what is says! + public final static String IP_LOCALHOST = "127.0.0.1"; public final static int UPDATE_TIMEOUT = 1000; public final static int TOR_TRANSPROXY_PORT_DEFAULT = 9040; public final static int STANDARD_DNS_PORT = 53; public final static int TOR_DNS_PORT_DEFAULT = 5400; - + public final static int CONTROL_PORT_DEFAULT = 9051; + public final static int HTTP_PROXY_PORT_DEFAULT = 8118; // like Privoxy! + public final static int SOCKS_PROXY_PORT_DEFAULT = 9050; + //path to check Tor against public final static String URL_TOR_CHECK = "https://check.torproject.org"; @@ -127,8 +122,5 @@ public interface TorServiceConstants { public static final String MEEK_ASSET_KEY = "meek-client"; //name of the iptables binary public final static String IPTABLES_ASSET_KEY = "xtables"; - - public final static int DEFAULT_CONTROL_PORT = 9051; - } diff --git a/src/org/torproject/android/vpn/OrbotVpnService.java b/src/org/torproject/android/vpn/OrbotVpnService.java index 1096906..e202078 100644 --- a/src/org/torproject/android/vpn/OrbotVpnService.java +++ b/src/org/torproject/android/vpn/OrbotVpnService.java @@ -241,7 +241,8 @@ public class OrbotVpnService extends VpnService implements Handler.Callback { final String virtualGateway = "10.0.0.1"; final String virtualIP = "10.0.0.2"; final String virtualNetMask = "255.255.255.0"; - final String localSocks = "127.0.0.1:" + TorServiceConstants.PORT_SOCKS_DEFAULT; + final String localSocks = "127.0.0.1:" + + String.valueOf(TorServiceConstants.SOCKS_PROXY_PORT_DEFAULT); final String localDNS = "10.0.0.1:" + TorServiceConstants.TOR_DNS_PORT_DEFAULT; Builder builder = new Builder();

1 0

[orbot/master] on receiving ACTION_START, only send status reply if EXTRA_PACKAGE_NAME set
by n8fr8＠torproject.org 25 Jun '15

25 Jun '15

commit 77b1bdfbc5aaee6b25b4e9d9f4468a73d185d4c5 Author: Hans-Christoph Steiner <hans(a)eds.org> Date: Wed Jun 10 17:39:57 2015 -0400 on receiving ACTION_START, only send status reply if EXTRA_PACKAGE_NAME set In order to receive a targeted reply, an app has to send its packageName to Orbot as an String extra in an ACTION_START Intent. Also, when Orbot internally uses ACTION_START, it shouldn't receive replies. --- .../android/service/StartTorReceiver.java | 12 ++++++--- src/org/torproject/android/service/TorService.java | 21 ++++++++++++++++ .../android/service/TorServiceConstants.java | 26 ++++++++++++++++++++ 3 files changed, 55 insertions(+), 4 deletions(-) diff --git a/src/org/torproject/android/service/StartTorReceiver.java b/src/org/torproject/android/service/StartTorReceiver.java index c236484..89df596 100644 --- a/src/org/torproject/android/service/StartTorReceiver.java +++ b/src/org/torproject/android/service/StartTorReceiver.java @@ -11,10 +11,14 @@ public class StartTorReceiver extends BroadcastReceiver { @Override public void onReceive(Context context, Intent intent) { /* sanitize the Intent before forwarding it to TorService */ - if (TextUtils.equals(intent.getAction(), TorServiceConstants.ACTION_START)) { - Intent startTorService = new Intent(context, TorService.class); - startTorService.setAction(intent.getAction()); - context.startService(startTorService); + String action = intent.getAction(); + if (TextUtils.equals(action, TorServiceConstants.ACTION_START)) { + Intent startTorIntent = new Intent(context, TorService.class); + startTorIntent.setAction(action); + String packageName = intent.getStringExtra(TorServiceConstants.EXTRA_PACKAGE_NAME); + if (packageName != null) + startTorIntent.putExtra(TorServiceConstants.EXTRA_PACKAGE_NAME, packageName); + context.startService(startTorIntent); } } } diff --git a/src/org/torproject/android/service/TorService.java b/src/org/torproject/android/service/TorService.java index efde5c6..ccfc4c8 100644 --- a/src/org/torproject/android/service/TorService.java +++ b/src/org/torproject/android/service/TorService.java @@ -28,6 +28,7 @@ import android.os.RemoteException; import android.support.v4.app.NotificationCompat; import android.support.v4.app.NotificationCompat.Builder; import android.support.v4.content.LocalBroadcastManager; +import android.text.TextUtils; import android.util.Log; import android.widget.RemoteViews; @@ -342,6 +343,7 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon if (action != null) { if (action.equals(ACTION_START)) { + replyWithStatus(mIntent); startTor(); // stopTor() is called when the Service is destroyed } else if (action.equals(CMD_SIGNAL_HUP)) { @@ -748,6 +750,25 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon return success; } + /** + * Send Orbot's status in reply to an + * {@link TorServiceConstants#ACTION_START} {@link Intent}, targeted only to + * the app that sent the initial request. + */ + 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.setPackage(packageName); + sendBroadcast(reply); + } + + /** + * The entire process for starting tor and related services is run from this method. + */ private void startTor() { if (mCurrentStatus == STATUS_STARTING || mCurrentStatus == STATUS_STOPPING) { // these states should probably be handled better diff --git a/src/org/torproject/android/service/TorServiceConstants.java b/src/org/torproject/android/service/TorServiceConstants.java index 96715b6..7921ddc 100644 --- a/src/org/torproject/android/service/TorServiceConstants.java +++ b/src/org/torproject/android/service/TorServiceConstants.java @@ -1,7 +1,10 @@ /* Copyright (c) 2009, Nathan Freitas, Orbot / The Guardian Project - http://openideals.com/guardian */ /* See LICENSE for licensing information */ + package org.torproject.android.service; +import android.content.Intent; + public interface TorServiceConstants { public final static String TOR_APP_USERNAME = "org.torproject.android"; @@ -67,19 +70,42 @@ public interface TorServiceConstants { //control port public final static String TOR_CONTROL_PORT_MSG_BOOTSTRAP_DONE = "Bootstrapped 100%"; + /** + * A request to Orbot to transparently start Tor services + */ public final static String ACTION_START = "org.torproject.android.intent.action.START"; + /** + * {@link Intent} send by Orbot with {@code ON/OFF/STARTING/STOPPING} status + */ public final static String ACTION_STATUS = "org.torproject.android.intent.action.STATUS"; + /** + * {@code String} that contains a status constant: {@link #STATUS_ON}, + * {@link #STATUS_OFF}, {@link #STATUS_STARTING}, or + * {@link #STATUS_STOPPING} + */ public final static String EXTRA_STATUS = "org.torproject.android.intent.extra.STATUS"; + /** + * A {@link String} {@code packageName} for Orbot to direct its status reply + * to, used in {@link #ACTION_START} {@link Intent}s sent to Orbot + */ + public final static String EXTRA_PACKAGE_NAME = "org.torproject.android.intent.extra.PACKAGE_NAME"; public final static String LOCAL_ACTION_LOG = "log"; public final static String LOCAL_ACTION_BANDWIDTH = "bandwidth"; public final static String LOCAL_EXTRA_LOG = "log"; + /** + * All tor-related services and daemons are stopped + */ public final static String STATUS_OFF = "OFF"; + /** + * All tor-related services and daemons have completed starting + */ public final static String STATUS_ON = "ON"; public final static String STATUS_STARTING = "STARTING"; public final static String STATUS_STOPPING = "STOPPING"; + // actions for internal command Intents public static final String CMD_SIGNAL_HUP = "signal_hup"; public static final String CMD_FLUSH = "flush"; public static final String CMD_NEWNYM = "newnym";

1 0

[orbot/master] include dynamic proxy config info in ACTION_STATUS replies
by n8fr8＠torproject.org 25 Jun '15

25 Jun '15

commit b620f828a1a86875bf93fa3291c7a753d02070fd Author: Hans-Christoph Steiner <hans(a)eds.org> Date: Thu Jun 11 17:02:56 2015 -0400 include dynamic proxy config info in ACTION_STATUS replies This includes extras in the Intents that are sent as replies to the two different requests to start tor (ACTION_START and ACTION_START_TOR). These extras give all of the current SOCKS and HTTP proxy settings, so that the app can dynamically use the correct settings. Sometimes there are port conflicts, so apps should dynamically adjust in order to reliably find tor. closes #3612 https://dev.guardianproject.info/issues/3612 refs #4419 https://dev.guardianproject.info/issues/4419 refs #3690 https://dev.guardianproject.info/issues/3690 refs #3687 https://dev.guardianproject.info/issues/3687 refs #3859 https://dev.guardianproject.info/issues/3859 --- src/org/torproject/android/OrbotMainActivity.java | 35 ++++++++++---------- src/org/torproject/android/service/TorService.java | 6 ++++ .../android/service/TorServiceConstants.java | 12 +++++++ 3 files changed, 35 insertions(+), 18 deletions(-) diff --git a/src/org/torproject/android/OrbotMainActivity.java b/src/org/torproject/android/OrbotMainActivity.java index 978d8cc..b1635f2 100644 --- a/src/org/torproject/android/OrbotMainActivity.java +++ b/src/org/torproject/android/OrbotMainActivity.java @@ -85,7 +85,8 @@ public class OrbotMainActivity extends Activity /* Some tracking bits */ private String torStatus = TorServiceConstants.STATUS_OFF; //latest status reported from the tor service - + private Intent lastStatusIntent; // the last ACTION_STATUS Intent received + private SharedPreferences mPrefs = null; private boolean autoStartFromIntent = false; @@ -164,6 +165,7 @@ public class OrbotMainActivity extends Activity 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 = ""; @@ -554,24 +556,21 @@ public class OrbotMainActivity extends Activity else if (action.equals("org.torproject.android.START_TOR")) { autoStartFromIntent = true; - try { - Log.i(TAG, "action equals org.torproject.android.START_TOR"); - startTor(); - - Intent resultIntent = new Intent(intent); - resultIntent.putExtra("socks_proxy", "socks://127.0.0.1:" + TorServiceConstants.SOCKS_PROXY_PORT_DEFAULT); - resultIntent.putExtra("socks_proxy_host", "127.0.0.1"); - resultIntent.putExtra("socks_proxy_port", TorServiceConstants.SOCKS_PROXY_PORT_DEFAULT); - resultIntent.putExtra("http_proxy", "http://127.0.0.1" + TorServiceConstants.HTTP_PROXY_PORT_DEFAULT); - resultIntent.putExtra("http_proxy_host", "127.0.0.1"); - resultIntent.putExtra("http_proxy_port", TorServiceConstants.HTTP_PROXY_PORT_DEFAULT); - setResult(RESULT_OK, resultIntent); - finish(); - } catch (RemoteException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } + try { + 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(); + } } else if (action.equals(Intent.ACTION_VIEW)) { diff --git a/src/org/torproject/android/service/TorService.java b/src/org/torproject/android/service/TorService.java index 46b55ae..7e057a0 100644 --- a/src/org/torproject/android/service/TorService.java +++ b/src/org/torproject/android/service/TorService.java @@ -762,6 +762,12 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon } Intent reply = new Intent(ACTION_STATUS); reply.putExtra(EXTRA_STATUS, mCurrentStatus); + reply.putExtra(EXTRA_SOCKS_PROXY, "socks://127.0.0.1:" + mPortSOCKS); + reply.putExtra(EXTRA_SOCKS_PROXY_HOST, "127.0.0.1"); + reply.putExtra(EXTRA_SOCKS_PROXY_PORT, mPortSOCKS); + 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); } diff --git a/src/org/torproject/android/service/TorServiceConstants.java b/src/org/torproject/android/service/TorServiceConstants.java index a0aed24..adaa674 100644 --- a/src/org/torproject/android/service/TorServiceConstants.java +++ b/src/org/torproject/android/service/TorServiceConstants.java @@ -84,6 +84,18 @@ public interface TorServiceConstants { * to, used in {@link #ACTION_START} {@link Intent}s sent to Orbot */ public final static String EXTRA_PACKAGE_NAME = "org.torproject.android.intent.extra.PACKAGE_NAME"; + /** + * The SOCKS proxy settings in URL form. + */ + public final static String EXTRA_SOCKS_PROXY = "org.torproject.android.intent.extra.SOCKS_PROXY"; + public final static String EXTRA_SOCKS_PROXY_HOST = "org.torproject.android.intent.extra.SOCKS_PROXY_HOST"; + public final static String EXTRA_SOCKS_PROXY_PORT = "org.torproject.android.intent.extra.SOCKS_PROXY_PORT"; + /** + * The HTTP proxy settings in URL form. + */ + public final static String EXTRA_HTTP_PROXY = "org.torproject.android.intent.extra.HTTP_PROXY"; + public final static String EXTRA_HTTP_PROXY_HOST = "org.torproject.android.intent.extra.HTTP_PROXY_HOST"; + public final static String EXTRA_HTTP_PROXY_PORT = "org.torproject.android.intent.extra.HTTP_PROXY_PORT"; public final static String LOCAL_ACTION_LOG = "log"; public final static String LOCAL_ACTION_BANDWIDTH = "bandwidth";

1 0

[orbot/master] drive main screen UI updated entirely from TorService status updates
by n8fr8＠torproject.org 25 Jun '15

25 Jun '15

commit ddaae1d941d0f1a565438f5ddea73e8be1497547 Author: Hans-Christoph Steiner <hans(a)eds.org> Date: Fri Jun 12 14:54:04 2015 -0400 drive main screen UI updated entirely from TorService status updates Now that STATUS_STARTING is sent in TorService.onCreate(), the response time is snappy enough that we don't need hacks in OrbotMainActivity to show that long press happened. --- src/org/torproject/android/OrbotMainActivity.java | 24 ++++++--------------- 1 file changed, 6 insertions(+), 18 deletions(-) diff --git a/src/org/torproject/android/OrbotMainActivity.java b/src/org/torproject/android/OrbotMainActivity.java index b1635f2..5707960 100644 --- a/src/org/torproject/android/OrbotMainActivity.java +++ b/src/org/torproject/android/OrbotMainActivity.java @@ -1113,25 +1113,13 @@ public class OrbotMainActivity extends Activity } } - // guess what? this start's Tor! actually no it just requests via the local ITorService to the remote TorService instance - // to start Tor - private void startTor () throws RemoteException - { - Log.i("OrbotMainActivity", "startTor"); - - mTxtOrbotLog.setText(""); - - //here we update the UI which is a bit sloppy and mixed up code wise - //might be best to just call updateStatus() instead of directly manipulating UI in this method - yep makes sense - imgStatus.setImageResource(R.drawable.torstarting); - lblStatus.setText(getString(R.string.status_starting_up)); - + /** + * Starts tor and related daemons by sending an + * {@link TorServiceConstants#ACTION_START} {@link Intent} to + * {@link TorService} + */ + private void startTor() throws RemoteException { sendIntentToService(TorServiceConstants.ACTION_START); - - //we send a message here to the progressDialog i believe, but we can clarify that shortly - Message msg = mStatusUpdateHandler.obtainMessage(STATUS_UPDATE); - msg.obj = getString(R.string.status_starting_up); - mStatusUpdateHandler.sendMessage(msg); } public boolean onLongClick(View view) {

1 0

[orbot/master] use constants for setting default ports, and variables when running
by n8fr8＠torproject.org 25 Jun '15

25 Jun '15

commit 0937c8838fe49cdc970fb995f72c5c375b799098 Author: Hans-Christoph Steiner <hans(a)eds.org> Date: Thu Jun 11 16:32:31 2015 -0400 use constants for setting default ports, and variables when running --- 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/TorService.java index 018adb2..46b55ae 100644 --- a/src/org/torproject/android/service/TorService.java +++ b/src/org/torproject/android/service/TorService.java @@ -93,8 +93,8 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon private int mLastProcessId = -1; - private int mPortHTTP = 8118; - private int mPortSOCKS = 9050; + private int mPortHTTP = HTTP_PROXY_PORT_DEFAULT; + private int mPortSOCKS = SOCKS_PROXY_PORT_DEFAULT; private static final int NOTIFY_ID = 1; private static final int TRANSPROXY_NOTIFY_ID = 2; @@ -1077,7 +1077,7 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon logNotice(log.toString()); } - sendCallbackLogMessage(getString(R.string.privoxy_is_running_on_port_) + PORT_HTTP); + sendCallbackLogMessage(getString(R.string.privoxy_is_running_on_port_) + mPortHTTP); logNotice("Polipo process id=" + polipoProcId);

1 0