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

[orbot/master] Merge pull request #1 from amoghbl1/issue_2374_story_maker
by n8fr8＠torproject.org 05 Jun '14

05 Jun '14

commit c1110309d20238e42bd8fdda0d2a96118fca6fa4 Merge: cfc8a99 4759d9f Author: n8fr8 <nathan(a)guardianproject.info> Date: Mon May 26 13:00:58 2014 -0400 Merge pull request #1 from amoghbl1/issue_2374_story_maker Issue 2374 story maker res/drawable/icon_story_maker.png | Bin 0 -> 4290 bytes res/layout/layout_wizard_tips.xml | 11 ++++++++++- res/values/strings.xml | 2 ++ src/org/torproject/android/wizard/TipsAndTricks.java | 12 ++++++++++++ 4 files changed, 24 insertions(+), 1 deletion(-)

1 0

[orbot/master] add app description to manifest to support p2p distribution
by n8fr8＠torproject.org 05 Jun '14

05 Jun '14

commit 13ef14340d36872c15dfe57b52aa642187345e2d Author: Hans-Christoph Steiner <hans(a)eds.org> Date: Wed May 28 20:33:41 2014 -0400 add app description to manifest to support p2p distribution This allows other methods of distributing APKs to also include the description text, like the FDroid local repo swapping. --- AndroidManifest.xml | 1 + res/values/strings.xml | 1 + 2 files changed, 2 insertions(+) diff --git a/AndroidManifest.xml b/AndroidManifest.xml index dc3b9ca..e52ebb7 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -18,6 +18,7 @@ <application android:name=".OrbotApp" android:icon="@drawable/ic_launcher" android:label="@string/app_name" + android:description="@string/app_description" android:configChanges="locale|orientation|screenSize" android:theme="@style/Theme.AppCompat" android:allowBackup="false" diff --git a/res/values/strings.xml b/res/values/strings.xml index c4c6143..6deceaf 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -1,6 +1,7 @@ <?xml version='1.0' encoding='UTF-8'?> <resources> <string name="app_name">Orbot</string> + <string name="app_description">Orbot is a free proxy app that empowers other apps to use the internet more securely. Orbot uses Tor to encrypt your Internet traffic and then hides it by bouncing through a series of computers around the world. Tor is free software and an open network that helps you defend against a form of network surveillance that threatens personal freedom and privacy, confidential business activities and relationships, and state security known as traffic analysis.</string> <string name="internal_web_url">http://orbot/</string> <string name="default_web_url">http://check.torproject.org</string> <string name="secure_default_web_url">https://check.torproject.org</string>

1 0

[orbot/master] implemented button click function for the story maker button, also url added in strings, change to liking at review
by n8fr8＠torproject.org 05 Jun '14

05 Jun '14

commit 4759d9f14326a7ce5dae67a4c9779d4adf9ea548 Author: Amogh Pradeep <amoghbl1(a)gmail.com> Date: Sat May 24 03:15:33 2014 +0530 implemented button click function for the story maker button, also url added in strings, change to liking at review --- res/values/strings.xml | 1 + src/org/torproject/android/wizard/TipsAndTricks.java | 12 ++++++++++++ 2 files changed, 13 insertions(+) diff --git a/res/values/strings.xml b/res/values/strings.xml index 52905ff..28d74f8 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -80,6 +80,7 @@ <string name="proxymob_setup_url">https://guardianproject.info/releases/proxymob-latest.xpi</string> <string name="wizard_tips_twitter">Set Twitter proxy to host \"localhost\" and port 8118</string> <string name="wizard_tips_story_maker">StoryMaker - Make a story and leave it to tor for security!</string> + <string name="story_maker_url">https://play.google.com/store/apps/details?id=info.guardianproject.mrapp</string> <string name="twitter_setup_url">https://guardianproject.info/2012/05/02/orbot-your-twitter/</string> <string name="wizard_proxy_help_info">Proxy Settings</string> <string name="wizard_proxy_help_msg">If the Android app you are using can support the use of an HTTP or SOCKS proxy, then you can configure it to connect to Orbot and use Tor.\n\n\n The host settings is 127.0.0.1 or \"localhost\". For HTTP, the port setting is 8118. For SOCKS, the proxy is 9050. You should use SOCKS4A or SOCKS5 if possible.\n \n\n\n You can learn more about proxying on Android via the FAQ at: http://tinyurl.com/proxyandroid\n </string> diff --git a/src/org/torproject/android/wizard/TipsAndTricks.java b/src/org/torproject/android/wizard/TipsAndTricks.java index 5d0872c..300730b 100644 --- a/src/org/torproject/android/wizard/TipsAndTricks.java +++ b/src/org/torproject/android/wizard/TipsAndTricks.java @@ -127,6 +127,18 @@ public class TipsAndTricks extends Activity implements TorConstants { } }); + btnLink = (Button)findViewById(R.id.WizardRootButtonInstallStoryMaker); + + btnLink.setOnClickListener(new OnClickListener() { + + public void onClick(View view) { + + String url = getString(R.string.story_maker_url); + startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(url))); + + } + }); + /** btnLink = (Button)findViewById(R.id.WizardRootButtonGooglePlay);

1 0

[orbot/master] new work on binding and service starting
by n8fr8＠torproject.org 05 Jun '14

05 Jun '14

commit c1f9296164d567a19850e76831beeac85fd75191 Author: Nathan Freitas <nathan(a)freitas.net> Date: Fri May 30 10:36:03 2014 -0400 new work on binding and service starting --- src/org/torproject/android/Orbot.java | 132 +++++++++++++++++++-------------- 1 file changed, 75 insertions(+), 57 deletions(-) diff --git a/src/org/torproject/android/Orbot.java b/src/org/torproject/android/Orbot.java index 94300d1..1848f9b 100644 --- a/src/org/torproject/android/Orbot.java +++ b/src/org/torproject/android/Orbot.java @@ -33,6 +33,8 @@ import android.content.pm.PackageManager; import android.content.pm.PackageManager.NameNotFoundException; import android.content.res.Configuration; import android.net.Uri; +import android.os.AsyncTask; +import android.os.Build; import android.os.Bundle; import android.os.Handler; import android.os.IBinder; @@ -83,7 +85,6 @@ public class Orbot extends ActionBarActivity implements TorConstants, OnLongClic //should move this up with all the other class variables private boolean mIsBound = false; - private Intent mTorService = null; private boolean autoStartFromIntent = false; @@ -98,12 +99,32 @@ public class Orbot extends ActionBarActivity implements TorConstants, OnLongClic doLayout(); - mTorService = new Intent(this, TorService.class); - getApplication().getApplicationContext().startService(mTorService); - appConflictChecker (); + + startService (); } + + private void startService () + { + Intent torService = new Intent(this, TorService.class); + + if (Build.VERSION.SDK_INT > 14) + { + + bindService(torService, + mConnection, Context.BIND_AUTO_CREATE|Context.BIND_IMPORTANT|Context.BIND_ABOVE_CLIENT); + } + else + { + + bindService(torService, + mConnection, Context.BIND_AUTO_CREATE); + } + + startService(torService); + + } private void doLayout () { @@ -159,9 +180,6 @@ public class Orbot extends ActionBarActivity implements TorConstants, OnLongClic downloadText.setText(formatCount(0) + " / " + formatTotal(0)); uploadText.setText(formatCount(0) + " / " + formatTotal(0)); - updateStatus(""); - - // Gesture detection mGestureDetector = new GestureDetector(this, new MyGestureDetector()); @@ -516,24 +534,11 @@ public class Orbot extends ActionBarActivity implements TorConstants, OnLongClic } - /* (non-Javadoc) - * @see android.app.Activity#onResume() - */ - protected void onResume() { - super.onResume(); - - bindService(); - updateStatus(""); - } - - - @Override protected void onNewIntent(Intent intent) { super.onNewIntent(intent); - updateStatus(""); handleIntents(); } @@ -589,12 +594,8 @@ public class Orbot extends ActionBarActivity implements TorConstants, OnLongClic { autoStartFromIntent = true; - if (mService == null) - { - bindService(); - } - else - { + if (mService != null) + { try { startTor(); } catch (RemoteException e) { @@ -847,17 +848,50 @@ public class Orbot extends ActionBarActivity implements TorConstants, OnLongClic */ public void updateStatus (String torServiceMsg) { + new updateStatusAsync().execute(torServiceMsg); + } + + private class updateStatusAsync extends AsyncTask<String, Void, Integer> { + + String mTorServiceMsg = null; + + @Override + protected Integer doInBackground(String... params) { + + mTorServiceMsg = params[0]; + int newTorStatus = -1; try { - if (torServiceMsg == null || torServiceMsg.length()==0) - torStatus = -1; //reset Tor status - - int newTorStatus = -1; - + if (mTorServiceMsg != null && mTorServiceMsg.length()>0) + { //if the serivce is bound, query it for the curren status value (int) if (mService != null) - newTorStatus = mService.getStatus(); + return new Integer(mService.getStatus()); + } + + } + catch (Exception e) + { + //error + Log.d(TAG,"error in update status",e); + } + + return newTorStatus; + + } + + @Override + protected void onPostExecute(Integer result) { + + updateUI(result.intValue()); + + super.onPostExecute(result); + } + + private void updateUI (int newTorStatus) + { + //now update the layout_main UI based on the status if (imgStatus != null) { @@ -877,10 +911,11 @@ public class Orbot extends ActionBarActivity implements TorConstants, OnLongClic } - if (torServiceMsg != null && torServiceMsg.length() > 0) + if (mTorServiceMsg != null && mTorServiceMsg.length() > 0) { - appendLogTextAndScroll(torServiceMsg); + appendLogTextAndScroll(mTorServiceMsg); } + SharedPreferences mPrefs = TorServiceUtils.getSharedPrefs(getApplicationContext()); boolean showFirstTime = mPrefs.getBoolean("connect_first_time",true); @@ -916,11 +951,11 @@ public class Orbot extends ActionBarActivity implements TorConstants, OnLongClic mItemOnOff.setTitle(R.string.menu_stop); } - if (lblStatus != null && torServiceMsg != null) - if (torServiceMsg.indexOf('%')!=-1) - lblStatus.setText(torServiceMsg); + if (lblStatus != null && mTorServiceMsg != null) + if (mTorServiceMsg.indexOf('%')!=-1) + lblStatus.setText(mTorServiceMsg); - appendLogTextAndScroll(torServiceMsg); + appendLogTextAndScroll(mTorServiceMsg); } @@ -937,14 +972,10 @@ public class Orbot extends ActionBarActivity implements TorConstants, OnLongClic } torStatus = newTorStatus; - - } - catch (RemoteException e) - { - Log.e(TAG,"remote exception updating status",e); - } + + } } // guess what? this start's Tor! actually no it just requests via the local ITorService to the remote TorService instance @@ -1201,19 +1232,6 @@ public class Orbot extends ActionBarActivity implements TorConstants, OnLongClic } }; - //this is where we bind! - private void bindService () - { - - //since its auto create, we prob don't ever need to call startService - //also we should again be consistent with using either iTorService.class.getName() - //or the variable constant - bindService(mTorService, - mConnection, Context.BIND_AUTO_CREATE); - - - - } //unbind removes the callback, and unbinds the service private void unbindService ()

1 0

[orbot/master] Merge branch 'hans_feature_desc'
by n8fr8＠torproject.org 05 Jun '14

05 Jun '14

commit e2e0d2659bee80ed1964040778d61e0d9998d42d Merge: c1f9296 13ef143 Author: Nathan Freitas <nathan(a)freitas.net> Date: Fri May 30 10:36:58 2014 -0400 Merge branch 'hans_feature_desc' AndroidManifest.xml | 1 + res/values/strings.xml | 1 + 2 files changed, 2 insertions(+)

1 0

[orbot/master] removed largeheap value
by n8fr8＠torproject.org 05 Jun '14

05 Jun '14

commit e2e00ccc6aea9e3e289f8588943b42053829e268 Author: Nathan Freitas <nathan(a)freitas.net> Date: Fri May 30 10:35:41 2014 -0400 removed largeheap value --- AndroidManifest.xml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/AndroidManifest.xml b/AndroidManifest.xml index dc3b9ca..b5c31ae 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -3,8 +3,7 @@ package="org.torproject.android" android:versionName="14.0.0-ALPHA-4" android:versionCode="93" - android:installLocation="auto" - + android:installLocation="auto" > <uses-sdk android:minSdkVersion="9" android:targetSdkVersion="19"/> @@ -22,9 +21,6 @@ android:theme="@style/Theme.AppCompat" android:allowBackup="false" android:allowClearUserData="true" - android:largeHeap="true" - - > <activity android:name=".Orbot" android:configChanges="orientation|screenSize"

1 0

[orbot/master] Merge branch 'master' of github.com:n8fr8/orbot
by n8fr8＠torproject.org 05 Jun '14

05 Jun '14

commit 25f6499f6b948b59fbcb4d1ca0ddda5a0e480153 Merge: e2e0d26 c111030 Author: Nathan Freitas <nathan(a)freitas.net> Date: Fri May 30 10:37:14 2014 -0400 Merge branch 'master' of github.com:n8fr8/orbot res/drawable/icon_story_maker.png | Bin 0 -> 4290 bytes res/layout/layout_wizard_tips.xml | 11 ++++++++++- res/values/strings.xml | 2 ++ src/org/torproject/android/wizard/TipsAndTricks.java | 12 ++++++++++++ 4 files changed, 24 insertions(+), 1 deletion(-)

1 0

[orbot/master] Merge branch 'issue_3014_wizard_workflow' of https://github.com/amoghbl1/orbot-1 into amoghbl1-issue_3014_wizard_workflow
by n8fr8＠torproject.org 05 Jun '14

05 Jun '14

commit 63b43047ed1b51a03414b82dd8377674a70316d9 Merge: 25f6499 53e82b1 Author: Nathan Freitas <nathan(a)freitas.net> Date: Fri May 30 10:40:53 2014 -0400 Merge branch 'issue_3014_wizard_workflow' of https://github.com/amoghbl1/orbot-1 into amoghbl1-issue_3014_wizard_workflow res/values/strings.xml | 1 + .../android/wizard/ChooseLocaleWizardActivity.java | 19 ++++++++--- .../android/wizard/ConfigureTransProxy.java | 25 ++++++++++---- src/org/torproject/android/wizard/LotsaText.java | 21 +++++++----- src/org/torproject/android/wizard/Permissions.java | 22 ++++++++---- .../torproject/android/wizard/TipsAndTricks.java | 36 ++++++++++++-------- 6 files changed, 84 insertions(+), 40 deletions(-)

1 0

[orbot/master] fix control port connections with socket timeouts
by n8fr8＠torproject.org 05 Jun '14

05 Jun '14

commit fd47e70f4410af2ed06a6465cf0c4beb394cb680 Author: Nathan Freitas <nathan(a)freitas.net> Date: Wed Jun 4 23:24:11 2014 -0400 fix control port connections with socket timeouts --- src/org/torproject/android/service/TorService.java | 139 ++++++++++++-------- 1 file changed, 81 insertions(+), 58 deletions(-) diff --git a/src/org/torproject/android/service/TorService.java b/src/org/torproject/android/service/TorService.java index 1a90258..ff219f2 100644 --- a/src/org/torproject/android/service/TorService.java +++ b/src/org/torproject/android/service/TorService.java @@ -66,7 +66,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst private static int currentStatus = STATUS_OFF; - private final static int CONTROL_SOCKET_TIMEOUT = 3000; + private final static int CONTROL_SOCKET_TIMEOUT = 10000; private TorControlConnection conn = null; private Socket torConnSocket = null; @@ -170,7 +170,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst } catch (Exception e) { - Log.e(TAG,"error finding proc",e); + //Log.e(TAG,"error finding proc",e); return false; } } @@ -295,7 +295,6 @@ public class TorService extends Service implements TorServiceConstants, TorConst try { - new startTorOperation().execute(intent); return START_STICKY; @@ -730,9 +729,13 @@ public class TorService extends Service implements TorServiceConstants, TorConst //start Tor in the background Shell shell = Shell.startShell(); + + SimpleCommand cmdTor = new SimpleCommand(fileTor.getAbsolutePath() + " DataDirectory " + appCacheHome.getAbsolutePath() + " -f " + torrcPath + " &"); + shell.add(cmdTor); + Thread.sleep(torRetryWaitTimeMS); //now try to connect @@ -742,6 +745,9 @@ public class TorService extends Service implements TorServiceConstants, TorConst { logNotice(getString(R.string.couldn_t_start_tor_process_) + "; exit=" + cmdTor.getExitCode() + ": " + cmdTor.getOutput()); sendCallbackStatusMessage(getString(R.string.couldn_t_start_tor_process_)); + + logNotice("Tor exit code: " + cmdTor.getExitCode()); + throw new Exception ("Unable to start Tor"); } @@ -818,6 +824,18 @@ public class TorService extends Service implements TorServiceConstants, TorConst if (conn != null) { + File fileCookie = new File(appCacheHome, TOR_CONTROL_COOKIE); + + if (fileCookie.exists()) + { + byte[] cookie = new byte[(int)fileCookie.length()]; + DataInputStream fis = new DataInputStream(new FileInputStream(fileCookie)); + fis.read(cookie); + fis.close(); + conn.authenticate(cookie); + + } + String torProcId = conn.getInfo("process/pid"); return Integer.parseInt(torProcId); } @@ -835,6 +853,12 @@ public class TorService extends Service implements TorServiceConstants, TorConst conn = TorControlConnection.getConnection(torConnSocket); + if (ENABLE_DEBUG_LOG) + { + conn.setDebugging(System.out); + + } + logNotice( "SUCCESS connected to Tor control port"); File fileCookie = new File(appCacheHome, TOR_CONTROL_COOKIE); @@ -861,6 +885,8 @@ public class TorService extends Service implements TorServiceConstants, TorConst else { logNotice ("Tor authentication cookie does not exist yet; trying again..."); + conn = null; + } } catch (Exception ce) @@ -868,11 +894,10 @@ public class TorService extends Service implements TorServiceConstants, TorConst conn = null; logNotice( "Error connecting to Tor local control port: " + ce.getLocalizedMessage()); - // Log.d(TAG,"Attempt: Error connecting to control port: " + ce.getLocalizedMessage(),ce); + Log.d(TAG,"Attempt: Error connecting to control port: " + ce.getLocalizedMessage(),ce); } - sendCallbackStatusMessage(getString(R.string.tor_process_waiting)); - Thread.sleep(3000); + } } @@ -976,59 +1001,37 @@ public class TorService extends Service implements TorServiceConstants, TorConst return PROFILE_ON; } - public void setTorProfile(int profile) { - // logNotice("Tor profile set to " + profile); - - if (profile == PROFILE_ON) - { - - new StartStopTorOperation().execute(true); - } - else if (profile == PROFILE_OFF) - { - - new StartStopTorOperation().execute(false); - - } - } - private class StartStopTorOperation extends AsyncTask<Boolean, Void, Boolean> { - @Override - protected Boolean doInBackground(Boolean... params) { + public synchronized void setTorProfile(int profile) { + + if (profile == PROFILE_ON && currentStatus == STATUS_OFF) + { + + currentStatus = STATUS_CONNECTING; + sendCallbackStatusMessage (getString(R.string.status_starting_up)); + + try + { + initTor(); + } + catch (Exception e) + { + + logException("Unable to start Tor: " + e.toString(),e); + currentStatus = STATUS_OFF; + showToolbarNotification(getString(R.string.unable_to_start_tor) + ": " + e.getMessage(), ERROR_NOTIFY_ID, R.drawable.ic_stat_notifyerr, false); + } + } + else + { + currentStatus = STATUS_OFF; + sendCallbackStatusMessage (getString(R.string.status_shutting_down)); - if (params[0].booleanValue() == true) - { - - currentStatus = STATUS_CONNECTING; - sendCallbackStatusMessage (getString(R.string.status_starting_up)); - - try - { - initTor(); - } - catch (Exception e) - { - - logException("Unable to start Tor: " + e.toString(),e); - currentStatus = STATUS_OFF; - showToolbarNotification(getString(R.string.unable_to_start_tor) + ": " + e.getMessage(), ERROR_NOTIFY_ID, R.drawable.ic_stat_notifyerr, false); - } - } - else - { - currentStatus = STATUS_OFF; - sendCallbackStatusMessage (getString(R.string.status_shutting_down)); - - stopTor(); - - } - - - return true; - } - - } - + stopTor(); + + } + } + public void message(String severity, String msg) { @@ -1290,7 +1293,27 @@ public class TorService extends Service implements TorServiceConstants, TorConst public void setProfile (int profile) { - setTorProfile(profile); + + new AsyncTask<Integer, Void, Boolean>() { + @Override + protected Boolean doInBackground(Integer... params) { + + try + { + + setTorProfile(params[0].intValue()); + + } + catch (Exception e) + { + Log.e(TAG,"error onBind",e); + } + + + return true; + } + + }.execute(profile); }

1 0

[orbot/master] status should update whether there is msg or not
by n8fr8＠torproject.org 05 Jun '14

05 Jun '14

commit 36a6349b6727c1679c7e747e2218f67af058a688 Author: Nathan Freitas <nathan(a)freitas.net> Date: Fri May 30 11:26:48 2014 -0400 status should update whether there is msg or not --- src/org/torproject/android/Orbot.java | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/src/org/torproject/android/Orbot.java b/src/org/torproject/android/Orbot.java index 1848f9b..32726d3 100644 --- a/src/org/torproject/android/Orbot.java +++ b/src/org/torproject/android/Orbot.java @@ -862,13 +862,8 @@ public class Orbot extends ActionBarActivity implements TorConstants, OnLongClic int newTorStatus = -1; try { - if (mTorServiceMsg != null && mTorServiceMsg.length()>0) - { - //if the serivce is bound, query it for the curren status value (int) - if (mService != null) - return new Integer(mService.getStatus()); - - } + if (mService != null) + return new Integer(mService.getStatus()); } catch (Exception e)

1 0