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

[orbot/master] broadcast Tor state to any app that might want to know
by n8fr8＠torproject.org 25 Jun '15

25 Jun '15

commit 4d8a9dab27c0ba676239ac030b083e1151aa2eae Author: Hans-Christoph Steiner <hans(a)eds.org> Date: Tue Jun 9 13:34:14 2015 -0400 broadcast Tor state to any app that might want to know In order for apps to follow the current state of Tor, this broadcasts the state both locally, since global broadcasts are insecure, and globally, for any app to receive. The internal workings of Orbot need to use a local broadcast, otherwise any app could trigger stop, start, etc or DoS in other ways. --- src/org/torproject/android/service/TorService.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/org/torproject/android/service/TorService.java b/src/org/torproject/android/service/TorService.java index a345e54..58aa9ce 100644 --- a/src/org/torproject/android/service/TorService.java +++ b/src/org/torproject/android/service/TorService.java @@ -1882,7 +1882,10 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon Intent intent = new Intent(ACTION_STATUS); intent.putExtra(EXTRA_STATUS, currentStatus); + // send for Orbot internals, using secure local broadcast LocalBroadcastManager.getInstance(this).sendBroadcast(intent); + // send for any apps that are interested + sendBroadcast(intent); } /*

1 0

[orbot/master] use "SIGNAL HUP" to request Tor re-read its config
by n8fr8＠torproject.org 25 Jun '15

25 Jun '15

commit 21c3bfb3c55a26f80914c52537360a9de390f99e Author: Hans-Christoph Steiner <hans(a)eds.org> Date: Tue Jun 9 14:27:39 2015 -0400 use "SIGNAL HUP" to request Tor re-read its config The tor daemon supports both "SIGNAL HUP" via its control port or the UNIX signal `kill -HUP` via the terminal as a way to trigger the tor daemon to reload its config. This is needed for new bridges and hidden services. It is not necessary to restart everything to add those. https://stem.torproject.org/faq.html#how-do-i-reload-my-torrc --- src/org/torproject/android/OrbotMainActivity.java | 42 ++++---------------- src/org/torproject/android/service/TorService.java | 31 +++++++++++++-- .../android/service/TorServiceConstants.java | 1 + 3 files changed, 36 insertions(+), 38 deletions(-) diff --git a/src/org/torproject/android/OrbotMainActivity.java b/src/org/torproject/android/OrbotMainActivity.java index 7b0bb31..e588e9c 100644 --- a/src/org/torproject/android/OrbotMainActivity.java +++ b/src/org/torproject/android/OrbotMainActivity.java @@ -447,7 +447,7 @@ public class OrbotMainActivity extends Activity implements OrbotConstants, OnLon //can happen on exit/shutdown } } - + private void doTorCheck () { @@ -479,13 +479,11 @@ public class OrbotMainActivity extends Activity implements OrbotConstants, OnLon if (onionHostname == null || onionHostname.length() == 0) { - stopTor(); - startTor(); - + requestTorRereadConfig(); + new Thread () { - - - public void run () + + public void run () { String onionHostname = mPrefs.getString("pref_hs_hostname",""); @@ -945,37 +943,13 @@ public class OrbotMainActivity extends Activity implements OrbotConstants, OnLon String bridgeList = Prefs.getBridgesList(); if (bridgeList != null && bridgeList.length() > 0) { - restartTor (); + requestTorRereadConfig (); } - } } - private void restartTor () - { - try - { - //do auto restart - stopTor (); - - mStatusUpdateHandler.postDelayed(new Runnable () { - public void run () - { - try - { - startTor(); - } - catch (Exception e) - { - Log.e(TAG,"can't start orbot",e); - } - } - }, 2000); - } - catch (Exception e) - { - Log.e(TAG,"can't stop orbot",e); - } + private void requestTorRereadConfig() { + sendIntentToService (TorServiceConstants.CMD_START); } public void promptStartVpnService () diff --git a/src/org/torproject/android/service/TorService.java b/src/org/torproject/android/service/TorService.java index 5884f62..516b56e 100644 --- a/src/org/torproject/android/service/TorService.java +++ b/src/org/torproject/android/service/TorService.java @@ -344,6 +344,8 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon if (action.equals(CMD_START)) { startTor(); // stopTor() is called when the Service is destroyed + } else if (action.equals(CMD_SIGNAL_HUP)) { + requestTorRereadConfig(); } else if (action.equals(CMD_NEWNYM)) { newIdentity(); } else if (action.equals(CMD_FLUSH)) { @@ -534,7 +536,28 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon } } + private void requestTorRereadConfig() { + try { + conn.signal("HUP"); + return; + } catch (IOException e) { + e.printStackTrace(); + } + // if that fails, try again using native utils + try { + killProcess(fileTor, "-1"); // this is -HUP + } catch (CannotKillException e) { + e.printStackTrace(); + } catch (IOException e) { + e.printStackTrace(); + } + } + private void killProcess(File fileProcBin) throws IOException, CannotKillException { + killProcess(fileProcBin, "-9"); // this is -KILL + } + + private void killProcess(File fileProcBin, String signal) throws IOException, CannotKillException { int procId = -1; int killAttempts = 0; @@ -554,10 +577,10 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon } else { shell = Shell.startShell(); } - shell.add(new SimpleCommand("busybox killall " + fileProcBin.getName())); - shell.add(new SimpleCommand("toolbox kill -9 " + pidString)); - shell.add(new SimpleCommand("busybox kill -9 " + pidString)); - shell.add(new SimpleCommand("kill -9 " + pidString)); + shell.add(new SimpleCommand("busybox killall " + signal + " " + fileProcBin.getName())); + shell.add(new SimpleCommand("toolbox kill " + signal + " " + pidString)); + shell.add(new SimpleCommand("busybox kill " + signal + " " + pidString)); + shell.add(new SimpleCommand("kill " + signal + " " + pidString)); try { Thread.sleep(1000); } catch (InterruptedException e) { diff --git a/src/org/torproject/android/service/TorServiceConstants.java b/src/org/torproject/android/service/TorServiceConstants.java index 7a5a14a..745d74f 100644 --- a/src/org/torproject/android/service/TorServiceConstants.java +++ b/src/org/torproject/android/service/TorServiceConstants.java @@ -84,6 +84,7 @@ public interface TorServiceConstants { public static final int LOG_MSG = 4; 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"; public static final String CMD_VPN = "vpn";

1 0

[orbot/master] rename startService() to sendIntentToService() to reflect what it does
by n8fr8＠torproject.org 25 Jun '15

25 Jun '15

commit 4470771c0dd4b9966ba53e5aa4d0539a8901c6bd Author: Hans-Christoph Steiner <hans(a)eds.org> Date: Tue Jun 9 13:14:23 2015 -0400 rename startService() to sendIntentToService() to reflect what it does Even though this method is a wrapper around startService(), it is really used to send various Intents to the Service, not only starting it. --- src/org/torproject/android/OrbotMainActivity.java | 35 ++++++--------------- 1 file changed, 9 insertions(+), 26 deletions(-) diff --git a/src/org/torproject/android/OrbotMainActivity.java b/src/org/torproject/android/OrbotMainActivity.java index 417e866..e010e85 100644 --- a/src/org/torproject/android/OrbotMainActivity.java +++ b/src/org/torproject/android/OrbotMainActivity.java @@ -116,13 +116,10 @@ public class OrbotMainActivity extends Activity implements OrbotConstants, OnLon - private void startService (String action) - { - + private void sendIntentToService(String action) { Intent torService = new Intent(this, TorService.class); torService.setAction(action); startService(torService); - } private void stopService () @@ -790,11 +787,7 @@ public class OrbotMainActivity extends Activity implements OrbotConstants, OnLon } else if (request == REQUEST_VPN && response == RESULT_OK) { - startService(TorServiceConstants.CMD_VPN); - - // if (torStatus == TorServiceConstants.STATUS_ON) - // restartTor (); - + sendIntentToService(TorServiceConstants.CMD_VPN); } IntentResult scanResult = IntentIntegrator.parseActivityResult(request, response, data); @@ -1051,28 +1044,24 @@ public class OrbotMainActivity extends Activity implements OrbotConstants, OnLon } else { - startService(TorServiceConstants.CMD_VPN); - // if (torStatus == TorServiceConstants.STATUS_ON) - // restartTor (); - + sendIntentToService(TorServiceConstants.CMD_VPN); } } public void stopVpnService () { - startService(TorServiceConstants.CMD_VPN_CLEAR); - // restartTor (); + sendIntentToService(TorServiceConstants.CMD_VPN_CLEAR); } private boolean flushTransProxy () { - startService(TorServiceConstants.CMD_FLUSH); + sendIntentToService(TorServiceConstants.CMD_FLUSH); return true; } private boolean updateTransProxy () { - startService(TorServiceConstants.CMD_UPDATE_TRANS_PROXY); + sendIntentToService(TorServiceConstants.CMD_UPDATE_TRANS_PROXY); return true; } @@ -1222,9 +1211,7 @@ public class OrbotMainActivity extends Activity implements OrbotConstants, OnLon // to start Tor private void startTor () throws RemoteException { - - - startService (TorServiceConstants.CMD_START); + sendIntentToService (TorServiceConstants.CMD_START); torStatus = TorServiceConstants.STATUS_STARTING; mTxtOrbotLog.setText(""); @@ -1238,19 +1225,15 @@ public class OrbotMainActivity extends Activity implements OrbotConstants, OnLon Message msg = mHandler.obtainMessage(TorServiceConstants.ENABLE_TOR_MSG); msg.getData().putString(HANDLER_TOR_MSG, getString(R.string.status_starting_up)); mHandler.sendMessage(msg); - - } //now we stop Tor! amazing! private void stopTor () throws RemoteException { - - startService (TorServiceConstants.CMD_STOP); + sendIntentToService (TorServiceConstants.CMD_STOP); torStatus = TorServiceConstants.STATUS_OFF; Message msg = mHandler.obtainMessage(TorServiceConstants.DISABLE_TOR_MSG); mHandler.sendMessage(msg); - } /* @@ -1409,7 +1392,7 @@ public class OrbotMainActivity extends Activity implements OrbotConstants, OnLon public void spinOrbot (float direction) { - startService (TorServiceConstants.CMD_NEWNYM); + sendIntentToService (TorServiceConstants.CMD_NEWNYM); Toast.makeText(this, R.string.newnym, Toast.LENGTH_SHORT).show();

1 0

[orbot/master] rename mHandler to mStatusUpdateHandler
by n8fr8＠torproject.org 25 Jun '15

25 Jun '15

commit bfb0a80a18b3c35cf568dbdd9839dd7580751b6c Author: Hans-Christoph Steiner <hans(a)eds.org> Date: Tue Jun 9 13:36:58 2015 -0400 rename mHandler to mStatusUpdateHandler Hopefully this will make the code a little easier to follow... --- src/org/torproject/android/OrbotMainActivity.java | 25 ++++++++------------- 1 file changed, 9 insertions(+), 16 deletions(-) diff --git a/src/org/torproject/android/OrbotMainActivity.java b/src/org/torproject/android/OrbotMainActivity.java index e010e85..d286c47 100644 --- a/src/org/torproject/android/OrbotMainActivity.java +++ b/src/org/torproject/android/OrbotMainActivity.java @@ -153,12 +153,12 @@ public class OrbotMainActivity extends Activity implements OrbotConstants, OnLon long written = intent.getLongExtra("written",0); long read = intent.getLongExtra("read",0); - Message msg = mHandler.obtainMessage(TorServiceConstants.MESSAGE_TRAFFIC_COUNT); + 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); - mHandler.sendMessage(msg); + mStatusUpdateHandler.sendMessage(msg); } else if (intent.hasExtra(TorServiceConstants.EXTRA_STATUS)) @@ -977,8 +977,7 @@ public class OrbotMainActivity extends Activity implements OrbotConstants, OnLon //do auto restart stopTor (); - mHandler.postDelayed(new Runnable () { - + mStatusUpdateHandler.postDelayed(new Runnable () { public void run () { try @@ -1027,9 +1026,7 @@ public class OrbotMainActivity extends Activity implements OrbotConstants, OnLon public void onClick(DialogInterface dialog, int which) { mBtnVPN.setChecked(false); - } - }) .show(); @@ -1075,7 +1072,7 @@ public class OrbotMainActivity extends Activity implements OrbotConstants, OnLon mBtnBridges.setChecked(Prefs.bridgesEnabled()); } - mHandler.postDelayed(new Runnable () + mStatusUpdateHandler.postDelayed(new Runnable () { public void run () { @@ -1222,9 +1219,9 @@ public class OrbotMainActivity extends Activity implements OrbotConstants, OnLon lblStatus.setText(getString(R.string.status_starting_up)); //we send a message here to the progressDialog i believe, but we can clarify that shortly - Message msg = mHandler.obtainMessage(TorServiceConstants.ENABLE_TOR_MSG); + Message msg = mStatusUpdateHandler.obtainMessage(TorServiceConstants.ENABLE_TOR_MSG); msg.getData().putString(HANDLER_TOR_MSG, getString(R.string.status_starting_up)); - mHandler.sendMessage(msg); + mStatusUpdateHandler.sendMessage(msg); } //now we stop Tor! amazing! @@ -1232,8 +1229,8 @@ public class OrbotMainActivity extends Activity implements OrbotConstants, OnLon { sendIntentToService (TorServiceConstants.CMD_STOP); torStatus = TorServiceConstants.STATUS_OFF; - Message msg = mHandler.obtainMessage(TorServiceConstants.DISABLE_TOR_MSG); - mHandler.sendMessage(msg); + Message msg = mStatusUpdateHandler.obtainMessage(TorServiceConstants.DISABLE_TOR_MSG); + mStatusUpdateHandler.sendMessage(msg); } /* @@ -1270,13 +1267,9 @@ public class OrbotMainActivity extends Activity implements OrbotConstants, OnLon } - - - - // this is what takes messages or values from the callback threads or other non-mainUI threads //and passes them back into the main UI thread for display to the user - private Handler mHandler = new Handler() { + private Handler mStatusUpdateHandler = new Handler() { private String lastServiceMsg = null;

1 0

[orbot/master] purge unused OrbotLogActivity
by n8fr8＠torproject.org 25 Jun '15

25 Jun '15

commit 2f7ddc44237779b0713936aeaa2408808f9735dc Author: Hans-Christoph Steiner <hans(a)eds.org> Date: Tue Jun 9 15:11:01 2015 -0400 purge unused OrbotLogActivity --- AndroidManifest.xml | 8 +-- .../torproject/android/ui/OrbotLogActivity.java | 76 -------------------- 2 files changed, 1 insertion(+), 83 deletions(-) diff --git a/AndroidManifest.xml b/AndroidManifest.xml index d7912e5..603ac70 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -56,13 +56,7 @@ </intent-filter> </activity> - - - <activity android:name=".ui.OrbotLogActivity" - android:configChanges="orientation|screenSize" - android:exported="false" - /> - +  diff --git a/src/org/torproject/android/ui/OrbotLogActivity.java b/src/org/torproject/android/ui/OrbotLogActivity.java deleted file mode 100644 index fbf05d2..0000000 --- a/src/org/torproject/android/ui/OrbotLogActivity.java +++ /dev/null @@ -1,76 +0,0 @@ -/* Copyright (c) 2009, Nathan Freitas, Orbot / The Guardian Project - https://guardianproject.info */ -/* See LICENSE for licensing information */ - -package org.torproject.android.ui; - -import org.torproject.android.OrbotConstants; -import org.torproject.android.service.TorServiceConstants; - -import android.app.Activity; -import android.content.BroadcastReceiver; -import android.content.Context; -import android.content.Intent; -import android.content.IntentFilter; -import android.os.Bundle; -import android.support.v4.content.LocalBroadcastManager; - - -public class OrbotLogActivity extends Activity implements OrbotConstants -{ - - /** Called when the activity is first created. */ - public void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - - doLayout(); - LocalBroadcastManager.getInstance(this).registerReceiver(mMessageReceiver, - new IntentFilter(TorServiceConstants.LOCAL_ACTION_LOG)); - - - } - - // Our handler for received Intents. This will be called whenever an Intent - // with an action named "custom-event-name" is broadcasted. - private BroadcastReceiver mMessageReceiver = 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); - } - - - } - }; - - - - private void doLayout () - { - - - } - - - private void updateStatus(String log) - { - - } - - - @Override - protected void onDestroy() { - super.onDestroy(); - LocalBroadcastManager.getInstance(this).unregisterReceiver(mMessageReceiver); - - } - - - -}

1 0

[orbot/master] use the same action string for local and broadcast status
by n8fr8＠torproject.org 25 Jun '15

25 Jun '15

commit bf3572eb82d888142fcc5002cf2364a533f07361 Author: Hans-Christoph Steiner <hans(a)eds.org> Date: Tue Jun 9 15:30:28 2015 -0400 use the same action string for local and broadcast status No need to have separate action strings, using the LocalBroadcastManager enforces the local-only messaging, and Orbot does not claim the global broadcasts in any kind of receiver. --- src/org/torproject/android/OrbotMainActivity.java | 4 ++-- src/org/torproject/android/service/TorServiceConstants.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/org/torproject/android/OrbotMainActivity.java b/src/org/torproject/android/OrbotMainActivity.java index c540163..6eff421 100644 --- a/src/org/torproject/android/OrbotMainActivity.java +++ b/src/org/torproject/android/OrbotMainActivity.java @@ -109,7 +109,7 @@ public class OrbotMainActivity extends Activity implements OrbotConstants, OnLon * info to this app */ LocalBroadcastManager lbm = LocalBroadcastManager.getInstance(this); lbm.registerReceiver(mLocalBroadcastReceiver, - new IntentFilter(TorServiceConstants.LOCAL_ACTION_STATUS)); + new IntentFilter(TorServiceConstants.ACTION_STATUS)); lbm.registerReceiver(mLocalBroadcastReceiver, new IntentFilter(TorServiceConstants.LOCAL_ACTION_BANDWIDTH)); lbm.registerReceiver(mLocalBroadcastReceiver, @@ -161,7 +161,7 @@ public class OrbotMainActivity extends Activity implements OrbotConstants, OnLon msg.getData().putLong("writeTotal", written); mStatusUpdateHandler.sendMessage(msg); - } else if (action.equals(TorServiceConstants.LOCAL_ACTION_STATUS)) { + } else if (action.equals(TorServiceConstants.ACTION_STATUS)) { torStatus = intent.getStringExtra(TorServiceConstants.EXTRA_STATUS); updateStatus(""); } diff --git a/src/org/torproject/android/service/TorServiceConstants.java b/src/org/torproject/android/service/TorServiceConstants.java index a79b7d7..c2c326a 100644 --- a/src/org/torproject/android/service/TorServiceConstants.java +++ b/src/org/torproject/android/service/TorServiceConstants.java @@ -69,7 +69,7 @@ public interface TorServiceConstants { public final static String ACTION_STATUS = "org.torproject.android.intent.action.STATUS"; 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";

1 0

[orbot/master] a couple tweaks to make the long press feel more responsive
by n8fr8＠torproject.org 25 Jun '15

25 Jun '15

commit 13d29878f92ec3b7b9176cc68c1e8eb836a0b2ce Author: Hans-Christoph Steiner <hans(a)eds.org> Date: Tue Jun 9 17:27:01 2015 -0400 a couple tweaks to make the long press feel more responsive --- src/org/torproject/android/OrbotMainActivity.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/org/torproject/android/OrbotMainActivity.java b/src/org/torproject/android/OrbotMainActivity.java index c9c13b0..38d3a80 100644 --- a/src/org/torproject/android/OrbotMainActivity.java +++ b/src/org/torproject/android/OrbotMainActivity.java @@ -126,6 +126,7 @@ public class OrbotMainActivity extends Activity } private void stopTor() { + imgStatus.setImageResource(R.drawable.torstarting); Intent torService = new Intent(this, TorService.class); stopService(torService); } @@ -1118,7 +1119,6 @@ public class OrbotMainActivity extends Activity private void startTor () throws RemoteException { Log.i("OrbotMainActivity", "startTor"); - sendIntentToService (TorServiceConstants.CMD_START); mTxtOrbotLog.setText(""); @@ -1126,6 +1126,8 @@ public class OrbotMainActivity extends Activity //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)); + + sendIntentToService(TorServiceConstants.CMD_START); //we send a message here to the progressDialog i believe, but we can clarify that shortly Message msg = mStatusUpdateHandler.obtainMessage(STATUS_UPDATE);

1 0

[orbot/master] rename mMessageReceiver to mLocalBroadcastReceiver
by n8fr8＠torproject.org 25 Jun '15

25 Jun '15

commit 65d880100510562c74399d1c9d1ce7a009c147c8 Author: Hans-Christoph Steiner <hans(a)eds.org> Date: Tue Jun 9 14:44:13 2015 -0400 rename mMessageReceiver to mLocalBroadcastReceiver --- 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 e588e9c..a73e0db 100644 --- a/src/org/torproject/android/OrbotMainActivity.java +++ b/src/org/torproject/android/OrbotMainActivity.java @@ -107,10 +107,10 @@ 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(mMessageReceiver, + LocalBroadcastManager.getInstance(this).registerReceiver(mLocalBroadcastReceiver, new IntentFilter(TorServiceConstants.LOCAL_ACTION_STATUS)); - LocalBroadcastManager.getInstance(this).registerReceiver(mMessageReceiver, + LocalBroadcastManager.getInstance(this).registerReceiver(mLocalBroadcastReceiver, new IntentFilter(TorServiceConstants.LOCAL_ACTION_LOG)); } @@ -129,7 +129,7 @@ public class OrbotMainActivity extends Activity implements OrbotConstants, OnLon // Our handler for received Intents. This will be called whenever an Intent // with an action named "custom-event-name" is broadcasted. - private BroadcastReceiver mMessageReceiver = new BroadcastReceiver() { + private BroadcastReceiver mLocalBroadcastReceiver = new BroadcastReceiver() { @Override public void onReceive(Context context, Intent intent) { @@ -1255,7 +1255,7 @@ public class OrbotMainActivity extends Activity implements OrbotConstants, OnLon @Override protected void onDestroy() { super.onDestroy(); - LocalBroadcastManager.getInstance(this).unregisterReceiver(mMessageReceiver); + LocalBroadcastManager.getInstance(this).unregisterReceiver(mLocalBroadcastReceiver); }

1 0

[orbot/master] purge unused code from OrbotMainActivity
by n8fr8＠torproject.org 25 Jun '15

25 Jun '15

commit 2f1d52f02d93eef32df8e6a3bdf3913c22e95486 Author: Hans-Christoph Steiner <hans(a)eds.org> Date: Tue Jun 9 16:01:42 2015 -0400 purge unused code from OrbotMainActivity mItemOnOff no longer exists, there is no more start/stop button on the menu and this code was trying to update menu.getItem(0), which is currently the settings button. onSharedPreferenceChanged() was entirely empty, and the prefs are all handled in their own Activity --- src/org/torproject/android/OrbotMainActivity.java | 61 ++------------------- 1 file changed, 6 insertions(+), 55 deletions(-) diff --git a/src/org/torproject/android/OrbotMainActivity.java b/src/org/torproject/android/OrbotMainActivity.java index 6eff421..8d28db0 100644 --- a/src/org/torproject/android/OrbotMainActivity.java +++ b/src/org/torproject/android/OrbotMainActivity.java @@ -28,7 +28,6 @@ import android.content.Intent; import android.content.IntentFilter; import android.content.SharedPreferences; import android.content.SharedPreferences.Editor; -import android.content.SharedPreferences.OnSharedPreferenceChangeListener; import android.content.pm.PackageInfo; import android.content.pm.PackageManager; import android.content.pm.PackageManager.NameNotFoundException; @@ -65,13 +64,13 @@ import com.google.zxing.integration.android.IntentIntegrator; import com.google.zxing.integration.android.IntentResult; -public class OrbotMainActivity extends Activity implements OrbotConstants, OnLongClickListener, OnTouchListener, OnSharedPreferenceChangeListener -{ +public class OrbotMainActivity extends Activity + implements OrbotConstants, OnLongClickListener, OnTouchListener { + /* Useful UI bits */ private TextView lblStatus = null; //the main text display widget private ImageProgressView imgStatus = null; //the main touchable image for activating Orbot - private MenuItem mItemOnOff = null; private TextView downloadText = null; private TextView uploadText = null; private TextView mTxtOrbotLog = null; @@ -79,8 +78,7 @@ public class OrbotMainActivity extends Activity implements OrbotConstants, OnLon private Button mBtnBrowser = null; private ToggleButton mBtnVPN = null; private ToggleButton mBtnBridges = null; - - + private DrawerLayout mDrawer; private ActionBarDrawerToggle mDrawerToggle; private Toolbar mToolbar; @@ -100,7 +98,6 @@ public class OrbotMainActivity extends Activity implements OrbotConstants, OnLon super.onCreate(savedInstanceState); mPrefs = TorServiceUtils.getSharedPrefs(getApplicationContext()); - mPrefs.registerOnSharedPreferenceChangeListener(this); doLayout(); @@ -115,8 +112,6 @@ public class OrbotMainActivity extends Activity implements OrbotConstants, OnLon lbm.registerReceiver(mLocalBroadcastReceiver, new IntentFilter(TorServiceConstants.LOCAL_ACTION_LOG)); } - - private void sendIntentToService(String action) { Intent torService = new Intent(this, TorService.class); @@ -299,40 +294,10 @@ public class OrbotMainActivity extends Activity implements OrbotConstants, OnLon super.onCreateOptionsMenu(menu); MenuInflater inflater = getMenuInflater(); inflater.inflate(R.menu.orbot_main, menu); - - mItemOnOff = menu.getItem(0); - + return true; } - - /** - private void appConflictChecker () - { - SharedPreferences sprefs = TorServiceUtils.getSharedPrefs(getApplicationContext()); - - boolean showAppConflict = true;//sprefs.getBoolean("pref_show_conflict",true); - - String[] badApps = {"com.sec.msc.nts.android.proxy:com.sec.msc.nts.android.proxy","com.sec.pcw:Samsung Link"}; - - for (String badApp : badApps) - { - String[] badAppParts = badApp.split(":"); - - if (appInstalledOrNot(badAppParts[0])) - { - String msg = getString(R.string.please_disable_this_app_in_android_settings_apps_if_you_are_having_problems_with_orbot_) + badAppParts[1]; - - if (showAppConflict) - showAlert(getString(R.string.app_conflict),msg,true); - - // appendLogTextAndScroll(msg); - } - } - - sprefs.edit().putBoolean("pref_show_conflict", false).commit(); - - }*/ - + private void showAbout () { @@ -1094,8 +1059,6 @@ public class OrbotMainActivity extends Activity implements OrbotConstants, OnLon mBtnBrowser.setEnabled(true); - if (mItemOnOff != null) - mItemOnOff.setTitle(R.string.menu_stop); if (lblStatus != null && torServiceMsg != null) if (torServiceMsg.indexOf('%')!=-1) @@ -1130,8 +1093,6 @@ public class OrbotMainActivity extends Activity implements OrbotConstants, OnLon imgStatus.setImageResource(R.drawable.torstarting); - if (mItemOnOff != null) - mItemOnOff.setTitle(R.string.menu_stop); if (lblStatus != null && torServiceMsg != null) if (torServiceMsg.indexOf('%')!=-1) @@ -1146,8 +1107,6 @@ public class OrbotMainActivity extends Activity implements OrbotConstants, OnLon lblStatus.setText(getString(R.string.press_to_start)); mBtnBrowser.setEnabled(false); - if (mItemOnOff != null) - mItemOnOff.setTitle(R.string.menu_start); } @@ -1219,7 +1178,6 @@ public class OrbotMainActivity extends Activity implements OrbotConstants, OnLon break; case TorServiceConstants.ENABLE_TOR_MSG: - updateStatus((String)msg.getData().getString(HANDLER_TOR_MSG)); break; @@ -1302,13 +1260,6 @@ public class OrbotMainActivity extends Activity implements OrbotConstants, OnLon + getString(R.string.mb); } - @Override - public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, - String key) { - - - } - private static final float ROTATE_FROM = 0.0f; private static final float ROTATE_TO = 360.0f*4f;// 3.141592654f * 32.0f;

1 0

[orbot/master] force all UI status updates through mStatusUpdateHandler
by n8fr8＠torproject.org 25 Jun '15

25 Jun '15

commit 25a6bb63b24c377a7c0505e5d2677cf6c90b88fb Author: Hans-Christoph Steiner <hans(a)eds.org> Date: Tue Jun 9 17:02:21 2015 -0400 force all UI status updates through mStatusUpdateHandler The Handler is a message queue for the main thread, so it should help keep the UI working while status updates are coming in. * This removes the constants in TorServiceConstants because the Handler messages are only for OrbotMainActivity * this uses the handy shortcut msg.obj for the status message --- src/org/torproject/android/OrbotConstants.java | 6 +- src/org/torproject/android/OrbotMainActivity.java | 63 +++++++------------- .../android/service/TorServiceConstants.java | 12 +--- 3 files changed, 24 insertions(+), 57 deletions(-) diff --git a/src/org/torproject/android/OrbotConstants.java b/src/org/torproject/android/OrbotConstants.java index 373ff3f..10309fb 100644 --- a/src/org/torproject/android/OrbotConstants.java +++ b/src/org/torproject/android/OrbotConstants.java @@ -16,11 +16,7 @@ public interface OrbotConstants { public final static String URL_TOR_CHECK = "https://check.torproject.org"; public final static String URL_TOR_BRIDGES = "https://bridges.torproject.org/bridges?transport="; - - public final static String NEWLINE = "\n"; - - public final static String HANDLER_TOR_MSG = "torServiceMsg"; - + public final static String PREF_BRIDGES_UPDATED = "pref_bridges_enabled"; //public final static String PREF_BRIDGES_OBFUSCATED = "pref_bridges_obfuscated"; public final static String PREF_OR = "pref_or"; diff --git a/src/org/torproject/android/OrbotMainActivity.java b/src/org/torproject/android/OrbotMainActivity.java index a2e9750..c9c13b0 100644 --- a/src/org/torproject/android/OrbotMainActivity.java +++ b/src/org/torproject/android/OrbotMainActivity.java @@ -92,7 +92,11 @@ public class OrbotMainActivity extends Activity private final static int REQUEST_VPN = 8888; private final static int REQUEST_SETTINGS = 0x9874; - + + // message types for mStatusUpdateHandler + private final static int STATUS_UPDATE = 1; + private static final int MESSAGE_TRAFFIC_COUNT = 2; + /** Called when the activity is first created. */ public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); @@ -141,8 +145,9 @@ public class OrbotMainActivity extends Activity return; if (action.equals(TorServiceConstants.LOCAL_ACTION_LOG)) { - String log = intent.getStringExtra(TorServiceConstants.LOCAL_EXTRA_LOG); - updateStatus(log); + Message msg = mStatusUpdateHandler.obtainMessage(STATUS_UPDATE); + msg.obj = intent.getStringExtra(TorServiceConstants.LOCAL_EXTRA_LOG); + mStatusUpdateHandler.sendMessage(msg); } else if (action.equals(TorServiceConstants.LOCAL_ACTION_BANDWIDTH)) { long upload = intent.getLongExtra("up", 0); @@ -150,8 +155,7 @@ public class OrbotMainActivity extends Activity long written = intent.getLongExtra("written", 0); long read = intent.getLongExtra("read", 0); - Message msg = mStatusUpdateHandler - .obtainMessage(TorServiceConstants.MESSAGE_TRAFFIC_COUNT); + Message msg = mStatusUpdateHandler.obtainMessage(MESSAGE_TRAFFIC_COUNT); msg.getData().putLong("download", download); msg.getData().putLong("upload", upload); msg.getData().putLong("readTotal", read); @@ -160,7 +164,9 @@ public class OrbotMainActivity extends Activity } else if (action.equals(TorServiceConstants.ACTION_STATUS)) { torStatus = intent.getStringExtra(TorServiceConstants.EXTRA_STATUS); - updateStatus(""); + Message msg = mStatusUpdateHandler.obtainMessage(STATUS_UPDATE); + msg.obj = ""; + mStatusUpdateHandler.sendMessage(msg); } } }; @@ -1122,8 +1128,8 @@ public class OrbotMainActivity extends Activity lblStatus.setText(getString(R.string.status_starting_up)); //we send a message here to the progressDialog i believe, but we can clarify that shortly - Message msg = mStatusUpdateHandler.obtainMessage(TorServiceConstants.ENABLE_TOR_MSG); - msg.getData().putString(HANDLER_TOR_MSG, getString(R.string.status_starting_up)); + Message msg = mStatusUpdateHandler.obtainMessage(STATUS_UPDATE); + msg.obj = getString(R.string.status_starting_up); mStatusUpdateHandler.sendMessage(msg); } @@ -1144,38 +1150,16 @@ public class OrbotMainActivity extends Activity // this is what takes messages or values from the callback threads or other non-mainUI threads //and passes them back into the main UI thread for display to the user private Handler mStatusUpdateHandler = new Handler() { - - private String lastServiceMsg = null; - - public void handleMessage(Message msg) { - switch (msg.what) { - case TorServiceConstants.STATUS_MSG: - case TorServiceConstants.LOG_MSG: - String torServiceMsg = (String)msg.getData().getString(HANDLER_TOR_MSG); - - if (lastServiceMsg == null || !lastServiceMsg.equals(torServiceMsg)) - { - updateStatus(torServiceMsg); - - lastServiceMsg = torServiceMsg; - } - - break; - case TorServiceConstants.ENABLE_TOR_MSG: - - updateStatus((String)msg.getData().getString(HANDLER_TOR_MSG)); - - break; - case TorServiceConstants.DISABLE_TOR_MSG: - - updateStatus((String)msg.getData().getString(HANDLER_TOR_MSG)); - + @Override + public void handleMessage(final Message msg) { + switch (msg.what) { + case STATUS_UPDATE: + updateStatus((String) msg.obj); break; - - case TorServiceConstants.MESSAGE_TRAFFIC_COUNT : - + case MESSAGE_TRAFFIC_COUNT: + Bundle data = msg.getData(); DataCount datacount = new DataCount(data.getLong("upload"),data.getLong("download")); @@ -1190,12 +1174,9 @@ public class OrbotMainActivity extends Activity super.handleMessage(msg); } } - - - }; - @Override + @Override protected void onDestroy() { super.onDestroy(); LocalBroadcastManager.getInstance(this).unregisterReceiver(mLocalBroadcastReceiver); diff --git a/src/org/torproject/android/service/TorServiceConstants.java b/src/org/torproject/android/service/TorServiceConstants.java index c2c326a..c31a670 100644 --- a/src/org/torproject/android/service/TorServiceConstants.java +++ b/src/org/torproject/android/service/TorServiceConstants.java @@ -78,12 +78,7 @@ public interface TorServiceConstants { public final static String STATUS_ON = "ON"; public final static String STATUS_STARTING = "STARTING"; public final static String STATUS_STOPPING = "STOPPING"; - - public static final int STATUS_MSG = 1; - public static final int ENABLE_TOR_MSG = 2; - public static final int DISABLE_TOR_MSG = 3; - public static final int LOG_MSG = 4; - + public static final String CMD_START = "start"; public static final String CMD_SIGNAL_HUP = "signal_hup"; public static final String CMD_FLUSH = "flush"; @@ -100,11 +95,6 @@ public interface TorServiceConstants { public static final String OBFSCLIENT_ASSET_KEY = "obfs4proxy"; public static final String MEEK_ASSET_KEY = "meek-client"; - - - public static final int MESSAGE_TRAFFIC_COUNT = 5; - - //name of the iptables binary public final static String IPTABLES_ASSET_KEY = "xtables";

1 0