September 2018 - tor-commits - lists.torproject.org

[tor/master] Merge remote-tracking branch 'UntoSten/inform-about-conf-includes'
by nickm＠torproject.org 13 Sep '18

13 Sep '18

commit 2d05500a1eacf3680a1b45992306c4b38f965616 Merge: 787da5185 ba3c78509 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Sep 13 13:35:59 2018 -0400 Merge remote-tracking branch 'UntoSten/inform-about-conf-includes' src/lib/encoding/confline.c | 3 +++ 1 file changed, 3 insertions(+)

1 0

[tor/master] Changes file for 27186
by nickm＠torproject.org 13 Sep '18

13 Sep '18

commit 3adef11d10aa0019f07ea10264504e82541b3aa7 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Sep 13 13:37:29 2018 -0400 Changes file for 27186 --- changes/27186 | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/changes/27186 b/changes/27186 new file mode 100644 index 000000000..522580e91 --- /dev/null +++ b/changes/27186 @@ -0,0 +1,4 @@ + o Minor features (UI): + - Log each included configuration file or directory as we read it, to + provide more visibility about where Tor is reading from. + Patch from Unto Sten; closes ticket 27186.

1 0

[tor/master] Fix a memory leak in tortls/openssl/context_new test.
by nickm＠torproject.org 13 Sep '18

13 Sep '18

commit d28018ea1eb4140353c2af3bdd03d2bf6b7a5ffd Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Sep 13 12:43:37 2018 -0400 Fix a memory leak in tortls/openssl/context_new test. Bugfix on 0.3.5.x; bugfix not on any released Tor. --- src/test/test_tortls_openssl.c | 44 +++++++++++++++++++++++++++++++++++++++--- 1 file changed, 41 insertions(+), 3 deletions(-) diff --git a/src/test/test_tortls_openssl.c b/src/test/test_tortls_openssl.c index 608625288..e3dd6adaa 100644 --- a/src/test/test_tortls_openssl.c +++ b/src/test/test_tortls_openssl.c @@ -1848,16 +1848,44 @@ fixed_tor_tls_create_certificate(crypto_pk_t *rsa, (void)cname; (void)cname_sign; (void)cert_lifetime; - return fixed_tor_tls_create_certificate_result[ + X509 *result = fixed_tor_tls_create_certificate_result[ fixed_tor_tls_create_certificate_result_index++]; + if (result) + return X509_dup(result); + else + return NULL; +} + +static void +fixed_tor_tls_create_certificate_results_free(void) +{ + unsigned i; + for (i = 0; i < ARRAY_LENGTH(fixed_tor_tls_create_certificate_result); ++i) { + X509 *cert = fixed_tor_tls_create_certificate_result[i]; + if (cert) + X509_free(cert); + fixed_tor_tls_create_certificate_result[i] = NULL; + } +} + +static void +fixed_tor_x509_cert_new_results_free(void) +{ + unsigned i; + for (i = 0; i < ARRAY_LENGTH(fixed_tor_x509_cert_new_result); ++i) { + tor_x509_cert_free(fixed_tor_x509_cert_new_result[i]); + } } static tor_x509_cert_t * fixed_tor_x509_cert_new(tor_x509_cert_impl_t *x509_cert) { (void) x509_cert; - return fixed_tor_x509_cert_new_result[ - fixed_tor_x509_cert_new_result_index++]; + tor_x509_cert_t **certp = + &fixed_tor_x509_cert_new_result[fixed_tor_x509_cert_new_result_index++]; + tor_x509_cert_t *cert = *certp; + *certp = NULL; + return cert; } static void @@ -1937,6 +1965,7 @@ test_tortls_context_new(void *ignored) fixed_tor_tls_create_certificate_result[2] = X509_new(); ret = tor_tls_context_new(NULL, 0, 0, 0); tt_assert(!ret); + fixed_tor_tls_create_certificate_results_free(); fixed_crypto_pk_new_result_index = 0; fixed_crypto_pk_new_result[0] = pk7; @@ -1949,6 +1978,7 @@ test_tortls_context_new(void *ignored) fixed_tor_tls_create_certificate_result[2] = X509_new(); ret = tor_tls_context_new(NULL, 0, 0, 0); tt_assert(!ret); + fixed_tor_tls_create_certificate_results_free(); fixed_crypto_pk_new_result_index = 0; fixed_crypto_pk_new_result[0] = pk9; @@ -1961,6 +1991,7 @@ test_tortls_context_new(void *ignored) fixed_tor_tls_create_certificate_result[2] = NULL; ret = tor_tls_context_new(NULL, 0, 0, 0); tt_assert(!ret); + fixed_tor_tls_create_certificate_results_free(); MOCK(tor_x509_cert_new, fixed_tor_x509_cert_new); fixed_crypto_pk_new_result_index = 0; @@ -1978,6 +2009,7 @@ test_tortls_context_new(void *ignored) fixed_tor_x509_cert_new_result[2] = NULL; ret = tor_tls_context_new(NULL, 0, 0, 0); tt_assert(!ret); + fixed_tor_tls_create_certificate_results_free(); fixed_crypto_pk_new_result_index = 0; fixed_crypto_pk_new_result[0] = pk13; @@ -1994,6 +2026,8 @@ test_tortls_context_new(void *ignored) fixed_tor_x509_cert_new_result[2] = NULL; ret = tor_tls_context_new(NULL, 0, 0, 0); tt_assert(!ret); + fixed_tor_tls_create_certificate_results_free(); + fixed_tor_x509_cert_new_results_free(); fixed_crypto_pk_new_result_index = 0; fixed_crypto_pk_new_result[0] = pk15; @@ -2010,6 +2044,8 @@ test_tortls_context_new(void *ignored) fixed_tor_x509_cert_new_result[2] = NULL; ret = tor_tls_context_new(NULL, 0, 0, 0); tt_assert(!ret); + fixed_tor_tls_create_certificate_results_free(); + fixed_tor_x509_cert_new_results_free(); fixed_crypto_pk_new_result_index = 0; fixed_crypto_pk_new_result[0] = pk17; @@ -2028,6 +2064,8 @@ test_tortls_context_new(void *ignored) tt_assert(!ret); done: + fixed_tor_tls_create_certificate_results_free(); + fixed_tor_x509_cert_new_results_free(); UNMOCK(tor_x509_cert_new); UNMOCK(tor_tls_create_certificate); UNMOCK(crypto_pk_generate_key_with_bits);

1 0

[tor/master] Merge branches 'bug27684' and 'bug27685'
by nickm＠torproject.org 13 Sep '18

13 Sep '18

commit e8b81d7dc5cb03a97136125d3ea50788fad9eab3 Merge: db27a70c9 15596f6c0 d28018ea1 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Sep 13 13:09:57 2018 -0400 Merge branches 'bug27684' and 'bug27685' src/test/test_tortls_openssl.c | 45 +++++++++++++++++++++++++++++++++++++++--- 1 file changed, 42 insertions(+), 3 deletions(-)

1 0

[tor/master] Fix a memory leak in tortls/openssl/try_to_extract_certs_from_tls
by nickm＠torproject.org 13 Sep '18

13 Sep '18

commit 15596f6c0c0a8aea262c225ebb99ce0caeecc562 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Sep 13 12:47:42 2018 -0400 Fix a memory leak in tortls/openssl/try_to_extract_certs_from_tls Since this is an "intrusive" test, it only shows up for openssl <1.1 This is a bugfix on 0.3.5.x; bug not in any released Tor. --- src/test/test_tortls_openssl.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/test/test_tortls_openssl.c b/src/test/test_tortls_openssl.c index 608625288..3928b754a 100644 --- a/src/test/test_tortls_openssl.c +++ b/src/test/test_tortls_openssl.c @@ -1007,6 +1007,7 @@ test_tortls_try_to_extract_certs_from_tls(void *ignored) tt_assert(cert == c1); tt_assert(id_cert); X509_free(cert); /* decrease refcnt */ + X509_free(id_cert); /* decrease refcnt */ done: sk_X509_free(sess->cert_chain);

1 0

[orbot/master] proguard: disable obfuscation
by n8fr8＠torproject.org 13 Sep '18

13 Sep '18

commit 749ca3ec8ce73c6809b38c1dc2b0c384be57773c Author: Unpublished <unpublished(a)gmx.net> Date: Wed Apr 4 17:41:53 2018 +0200 proguard: disable obfuscation not needed since we are open source and reduces future incompatibilities - keep logTun2Socks callback --- app/build.gradle | 4 ++-- app/proguard-rules.txt | 8 ++++++++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 7fd095b1..6642226e 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -16,8 +16,8 @@ android { } buildTypes { release { - minifyEnabled false - shrinkResources false + minifyEnabled true + shrinkResources true proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt' } } diff --git a/app/proguard-rules.txt b/app/proguard-rules.txt index bc4eb0c1..b1120f82 100644 --- a/app/proguard-rules.txt +++ b/app/proguard-rules.txt @@ -1,3 +1,11 @@ +-dontobfuscate +# https://stackoverflow.com/questions/9651703/using-proguard-with-android-wit… +-optimizations !code/simplification/arithmetic,!field/*,!class/merging/*,!code/allocation/variable + +-keep class org.torproject.android.service.vpn.Tun2Socks { + void logTun2Socks(java.lang.String, java.lang.String, java.lang.String); +} + -keepattributes Signature -keepattributes Annotation -keep class okhttp3.** { *; }

1 0

[orbot/master] Only email clients are listed when you request a bridge over email
by n8fr8＠torproject.org 13 Sep '18

13 Sep '18

commit 44d088ba4c7dc280ea7883adf2daf8a4da526e09 Author: lexi <bird.s.lex(a)gmail.com> Date: Sat May 19 15:01:59 2018 -0400 Only email clients are listed when you request a bridge over email --- .../ui/onboarding/BridgeWizardActivity.java | 62 ++++++---------------- 1 file changed, 16 insertions(+), 46 deletions(-) diff --git a/app/src/main/java/org/torproject/android/ui/onboarding/BridgeWizardActivity.java b/app/src/main/java/org/torproject/android/ui/onboarding/BridgeWizardActivity.java index 1a0f20ca..da23a62a 100644 --- a/app/src/main/java/org/torproject/android/ui/onboarding/BridgeWizardActivity.java +++ b/app/src/main/java/org/torproject/android/ui/onboarding/BridgeWizardActivity.java @@ -10,8 +10,6 @@ import android.content.pm.PackageManager; import android.net.Uri; import android.os.AsyncTask; import android.os.Bundle; -import android.support.design.widget.FloatingActionButton; -import android.support.design.widget.Snackbar; import android.support.v7.app.AppCompatActivity; import android.support.v7.widget.Toolbar; import android.text.TextUtils; @@ -20,11 +18,9 @@ import android.view.MenuItem; import android.view.View; import android.widget.RadioButton; import android.widget.TextView; -import android.widget.Toast; import org.torproject.android.R; import org.torproject.android.service.OrbotConstants; -import org.torproject.android.service.TorServiceConstants; import org.torproject.android.service.util.Prefs; import org.torproject.android.settings.LocaleHelper; @@ -91,7 +87,7 @@ public class BridgeWizardActivity extends AppCompatActivity { btnNew.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - showGetBridgePrompt(""); + showGetBridgePrompt(); } }); @@ -108,7 +104,7 @@ public class BridgeWizardActivity extends AppCompatActivity { @Override protected void attachBaseContext(Context base) { super.attachBaseContext(LocaleHelper.onAttach(base)); - } + }g @Override public boolean onOptionsItemSelected(MenuItem item) { @@ -122,71 +118,45 @@ public class BridgeWizardActivity extends AppCompatActivity { } - private void showGetBridgePrompt (final String type) - { + private void showGetBridgePrompt() { LayoutInflater li = LayoutInflater.from(this); View view = li.inflate(R.layout.layout_diag, null); - TextView versionName = (TextView)view.findViewById(R.id.diaglog); + TextView versionName = view.findViewById(R.id.diaglog); versionName.setText(R.string.you_must_get_a_bridge_address_by_email_web_or_from_a_friend_once_you_have_this_address_please_paste_it_into_the_bridges_preference_in_orbot_s_setting_and_restart_); new AlertDialog.Builder(this) .setTitle(R.string.bridge_mode) .setView(view) - .setNegativeButton(R.string.btn_cancel, new Dialog.OnClickListener() - { + .setNegativeButton(R.string.btn_cancel, new Dialog.OnClickListener() { @Override public void onClick(DialogInterface dialog, int which) { //do nothing } }) - .setNeutralButton(R.string.get_bridges_email, new Dialog.OnClickListener () - { - + .setNeutralButton(R.string.get_bridges_email, new Dialog.OnClickListener() { @Override public void onClick(DialogInterface dialog, int which) { - - - sendGetBridgeEmail(type); - + sendGetBridgeEmail(); } - }) - .setPositiveButton(R.string.get_bridges_web, new Dialog.OnClickListener () - { - + .setPositiveButton(R.string.get_bridges_web, new Dialog.OnClickListener() { @Override public void onClick(DialogInterface dialog, int which) { - - openBrowser(OrbotConstants.URL_TOR_BRIDGES + type,true, null); - + openBrowser(OrbotConstants.URL_TOR_BRIDGES, true, null); } - - }).show(); } - private void sendGetBridgeEmail (String type) + private void sendGetBridgeEmail() { - Intent intent = new Intent(Intent.ACTION_SEND); - intent.setType("message/rfc822"); - intent.putExtra(Intent.EXTRA_EMAIL , new String[]{"bridges(a)torproject.org"}); - - if (type != null) - { - intent.putExtra(Intent.EXTRA_SUBJECT, "get transport " + type); - intent.putExtra(Intent.EXTRA_TEXT, "get transport " + type); - - } - else - { - intent.putExtra(Intent.EXTRA_SUBJECT, "get bridges"); - intent.putExtra(Intent.EXTRA_TEXT, "get bridges"); - - } - - startActivity(Intent.createChooser(intent, getString(R.string.send_email))); + String email = "bridges(a)torproject.org"; + Uri emailUri = Uri.parse("mailto:" + email); + Intent emailIntent = new Intent(Intent.ACTION_SENDTO, emailUri); + emailIntent.putExtra(Intent.EXTRA_SUBJECT, "get transport"); + emailIntent.putExtra(Intent.EXTRA_TEXT, "get transport"); + startActivity(Intent.createChooser(emailIntent, getString(R.string.send_email))); }

1 0

[orbot/master] Formatted BridgeWizardActivity and layout; removed unnecessary code
by n8fr8＠torproject.org 13 Sep '18

13 Sep '18

commit be2d41171d25e23b545544a32c718baa5dfef40d Author: lexi <bird.s.lex(a)gmail.com> Date: Sat May 19 15:16:23 2018 -0400 Formatted BridgeWizardActivity and layout; removed unnecessary code --- .../ui/onboarding/BridgeWizardActivity.java | 189 +++++++-------------- app/src/main/res/layout/content_bridge_wizard.xml | 71 ++++---- 2 files changed, 98 insertions(+), 162 deletions(-) diff --git a/app/src/main/java/org/torproject/android/ui/onboarding/BridgeWizardActivity.java b/app/src/main/java/org/torproject/android/ui/onboarding/BridgeWizardActivity.java index 66ea8f60..e03a8d2d 100644 --- a/app/src/main/java/org/torproject/android/ui/onboarding/BridgeWizardActivity.java +++ b/app/src/main/java/org/torproject/android/ui/onboarding/BridgeWizardActivity.java @@ -5,8 +5,6 @@ import android.app.Dialog; import android.content.Context; import android.content.DialogInterface; import android.content.Intent; -import android.content.pm.PackageInfo; -import android.content.pm.PackageManager; import android.net.Uri; import android.os.AsyncTask; import android.os.Bundle; @@ -36,53 +34,48 @@ public class BridgeWizardActivity extends AppCompatActivity { protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.activity_bridge_wizard); - Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar); + Toolbar toolbar = findViewById(R.id.toolbar); setSupportActionBar(toolbar); getSupportActionBar().setDisplayHomeAsUpEnabled(true); - tvStatus = (TextView)findViewById(R.id.lbl_bridge_test_status); + tvStatus = findViewById(R.id.lbl_bridge_test_status); tvStatus.setVisibility(View.GONE); setTitle(getString(R.string.bridges)); - RadioButton btnDirect = (RadioButton) - findViewById(R.id.btnBridgesDirect); + RadioButton btnDirect = findViewById(R.id.btnBridgesDirect); btnDirect.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { Prefs.setBridgesList(""); Prefs.putBridgesEnabled(false); testBridgeConnection(); - } }); - RadioButton btnObfs4 = (RadioButton)findViewById(R.id.btnBridgesObfs4); + RadioButton btnObfs4 = findViewById(R.id.btnBridgesObfs4); btnObfs4.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { Prefs.setBridgesList("obfs4"); Prefs.putBridgesEnabled(true); testBridgeConnection(); - } }); - RadioButton btnMeek = (RadioButton)findViewById(R.id.btnBridgesMeek); - + RadioButton btnMeek = findViewById(R.id.btnBridgesMeek); btnMeek.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { Prefs.setBridgesList("meek"); Prefs.putBridgesEnabled(true); testBridgeConnection(); - } }); - RadioButton btnNew = (RadioButton)findViewById(R.id.btnBridgesNew); + RadioButton btnNew = findViewById(R.id.btnBridgesNew); btnNew.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { @@ -97,7 +90,6 @@ public class BridgeWizardActivity extends AppCompatActivity { else if (Prefs.getBridgesList().equals("obfs4")) btnObfs4.setChecked(true); - } @Override @@ -107,8 +99,7 @@ public class BridgeWizardActivity extends AppCompatActivity { @Override public boolean onOptionsItemSelected(MenuItem item) { - if (item.getItemId() == android.R.id.home) - { + if (item.getItemId() == android.R.id.home) { finish(); return true; } @@ -119,31 +110,30 @@ public class BridgeWizardActivity extends AppCompatActivity { private void showGetBridgePrompt() { new AlertDialog.Builder(this) - .setTitle(R.string.bridge_mode) - .setMessage(R.string.you_must_get_a_bridge_address_by_email_web_or_from_a_friend_once_you_have_this_address_please_paste_it_into_the_bridges_preference_in_orbot_s_setting_and_restart_) - .setNegativeButton(R.string.btn_cancel, new Dialog.OnClickListener() { - @Override - public void onClick(DialogInterface dialog, int which) { - //do nothing - } - }) - .setNeutralButton(R.string.get_bridges_email, new Dialog.OnClickListener() { - @Override - public void onClick(DialogInterface dialog, int which) { - sendGetBridgeEmail(); - } - - }) - .setPositiveButton(R.string.get_bridges_web, new Dialog.OnClickListener() { - @Override - public void onClick(DialogInterface dialog, int which) { - openBrowser(OrbotConstants.URL_TOR_BRIDGES, true); - } - }).show(); + .setTitle(R.string.bridge_mode) + .setMessage(R.string.you_must_get_a_bridge_address_by_email_web_or_from_a_friend_once_you_have_this_address_please_paste_it_into_the_bridges_preference_in_orbot_s_setting_and_restart_) + .setNegativeButton(R.string.btn_cancel, new Dialog.OnClickListener() { + @Override + public void onClick(DialogInterface dialog, int which) { + //do nothing + } + }) + .setNeutralButton(R.string.get_bridges_email, new Dialog.OnClickListener() { + @Override + public void onClick(DialogInterface dialog, int which) { + sendGetBridgeEmail(); + } + + }) + .setPositiveButton(R.string.get_bridges_web, new Dialog.OnClickListener() { + @Override + public void onClick(DialogInterface dialog, int which) { + openBrowser(OrbotConstants.URL_TOR_BRIDGES, true); + } + }).show(); } - private void sendGetBridgeEmail() - { + private void sendGetBridgeEmail() { String email = "bridges(a)torproject.org"; Uri emailUri = Uri.parse("mailto:" + email); Intent emailIntent = new Intent(Intent.ACTION_SENDTO, emailUri); @@ -156,109 +146,62 @@ public class BridgeWizardActivity extends AppCompatActivity { /* * Launch the system activity for Uri viewing with the provided url */ - private void openBrowser(final String browserLaunchUrl, boolean forceExternal) - { - startActivity(new Intent(Intent.ACTION_VIEW,Uri.parse(browserLaunchUrl))); - } - - - private void startIntent (String pkg, String action, Uri data) - { - Intent i; - PackageManager pm = getPackageManager(); - - try { - if (pkg != null) { - i = pm.getLaunchIntentForPackage(pkg); - if (i == null) - throw new PackageManager.NameNotFoundException(); - } - else - { - i = new Intent(); - } - - i.setAction(action); - i.setData(data); - - if (i.resolveActivity(pm)!=null) - startActivity(i); - - } catch (PackageManager.NameNotFoundException e) { - - } + private void openBrowser(final String browserLaunchUrl, boolean forceExternal) { + startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(browserLaunchUrl))); } - private boolean appInstalledOrNot(String uri) - { - PackageManager pm = getPackageManager(); - try - { - PackageInfo pi = pm.getPackageInfo(uri, PackageManager.GET_ACTIVITIES); - return pi.applicationInfo.enabled; - } - catch (PackageManager.NameNotFoundException e) - { - return false; - } - } - private void testBridgeConnection () - { - if (TextUtils.isEmpty(Prefs.getBridgesList()) || (!Prefs.bridgesEnabled())) - { - new HostTester().execute("check.torproject.org","443"); - } - else if (Prefs.getBridgesList().equals("meek")) - { - new HostTester().execute("meek.azureedge.net","443","d2cly7j4zqgua7.cloudfront.net","443"); - } - else if (Prefs.getBridgesList().equals("obfs4")) - { - new HostTester().execute("85.17.30.79","443","154.35.22.9","443","192.99.11.54","443"); - } - else - { + private void testBridgeConnection() { + if (TextUtils.isEmpty(Prefs.getBridgesList()) || (!Prefs.bridgesEnabled())) { + new HostTester().execute("check.torproject.org", "443"); + } else if (Prefs.getBridgesList().equals("meek")) { + new HostTester().execute("meek.azureedge.net", "443", "d2cly7j4zqgua7.cloudfront.net", "443"); + } else if (Prefs.getBridgesList().equals("obfs4")) { + new HostTester().execute("85.17.30.79", "443", "154.35.22.9", "443", "192.99.11.54", "443"); + } else { tvStatus.setText(""); } } private class HostTester extends AsyncTask<String, Void, Boolean> { + @Override protected void onPreExecute() { // Pre Code tvStatus.setVisibility(View.VISIBLE); tvStatus.setText(R.string.testing_bridges); } - protected Boolean doInBackground(String... host) { - // Background Code - boolean result = false; - - for (int i = 0; i < host.length; i++) { - String testHost = host[i]; - i++; //move to the port - int testPort = Integer.parseInt(host[i]); - result = isHostReachable(testHost, testPort, 10000); - if (result) - return result; - } - return result; - } - protected void onPostExecute(Boolean result) { - // Post Code - if (result) - { - tvStatus.setText(R.string.testing_bridges_success); + @Override + protected Boolean doInBackground(String... host) { + // Background Code + boolean result = false; + + for (int i = 0; i < host.length; i++) { + String testHost = host[i]; + i++; //move to the port + int testPort = Integer.parseInt(host[i]); + result = isHostReachable(testHost, testPort, 10000); + if (result) + return result; + } + return result; } - else - { - tvStatus.setText(R.string.testing_bridges_fail); + @Override + protected void onPostExecute(Boolean result) { + // Post Code + if (result) { + tvStatus.setText(R.string.testing_bridges_success); + + } else { + tvStatus.setText(R.string.testing_bridges_fail); + + } } - }}; + } - private static boolean isHostReachable(String serverAddress, int serverTCPport, int timeoutMS){ + private static boolean isHostReachable(String serverAddress, int serverTCPport, int timeoutMS) { boolean connected = false; Socket socket; try { diff --git a/app/src/main/res/layout/content_bridge_wizard.xml b/app/src/main/res/layout/content_bridge_wizard.xml index 858bf065..244ba37d 100644 --- a/app/src/main/res/layout/content_bridge_wizard.xml +++ b/app/src/main/res/layout/content_bridge_wizard.xml @@ -4,71 +4,64 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" + android:orientation="vertical" app:layout_behavior="@string/appbar_scrolling_view_behavior" tools:context="org.torproject.android.ui.onboarding.BridgeWizardActivity" - tools:showIn="@layout/activity_bridge_wizard" - android:orientation="vertical" - > + tools:showIn="@layout/activity_bridge_wizard"> <TextView android:layout_width="wrap_content" android:layout_height="wrap_content" - android:text="@string/if_your_mobile_network_actively_blocks_tor_you_can_use_a_tor_bridge_to_access_the_network_another_way_to_get_bridges_is_to_send_an_email_to_bridges_torproject_org_please_note_that_you_must_send_the_email_using_an_address_from_one_of_the_following_email_providers_riseup_gmail_or_yahoo_" - android:layout_margin="12dp" - android:textStyle="bold" - android:textSize="16sp" + + android:text="@string/if_your_mobile_network_actively_blocks_tor_you_can_use_a_tor_bridge_to_access_the_network_another_way_to_get_bridges_is_to_send_an_email_to_bridges_torproject_org_please_note_that_you_must_send_the_email_using_an_address_from_one_of_the_following_email_providers_riseup_gmail_or_yahoo_" android:textColor="@color/panel_background_main" - /> + android:textSize="16sp" + android:textStyle="bold" /> + <RadioGroup xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="wrap_content" android:layout_height="wrap_content" android:orientation="vertical"> - <RadioButton - android:id="@+id/btnBridgesDirect" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:text="@string/bridge_direct_connect" - android:layout_margin="12dp" - /> - - <RadioButton - android:id="@+id/btnBridgesObfs4" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:text="@string/bridge_community" - android:layout_margin="12dp" - - /> + <RadioButton + android:id="@+id/btnBridgesDirect" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_margin="12dp" + android:text="@string/bridge_direct_connect" /> - <RadioButton - android:id="@+id/btnBridgesMeek" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:text="@string/bridge_cloud" - android:layout_margin="12dp" + <RadioButton + android:id="@+id/btnBridgesObfs4" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_margin="12dp" + android:text="@string/bridge_community" /> - /> + <RadioButton + android:id="@+id/btnBridgesMeek" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_margin="12dp" + android:text="@string/bridge_cloud" /> <RadioButton android:id="@+id/btnBridgesNew" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:text="@string/bridges_get_new" android:layout_margin="12dp" + android:text="@string/bridges_get_new" /> - /> </RadioGroup> + <TextView + android:id="@+id/lbl_bridge_test_status" android:layout_width="match_parent" android:layout_height="wrap_content" - android:text="..." - android:gravity="center" - android:id="@+id/lbl_bridge_test_status" android:layout_margin="12dp" - android:textStyle="bold" - android:textSize="16sp" + android:gravity="center" + android:text="..." android:textColor="@color/bright_green" - /> + android:textSize="16sp" + android:textStyle="bold" /> </LinearLayout>

1 0

[orbot/master] no previous zipping further reduces apk size
by n8fr8＠torproject.org 13 Sep '18

13 Sep '18

commit edc07b09b4c15df531e4f9448da00527498eaf99 Author: Unpublished <unpublished(a)gmx.net> Date: Fri May 18 11:56:26 2018 +0200 no previous zipping further reduces apk size obfs4proxy.so and pdnsd.so must not be zipped with this --- BUILD | 7 +++---- .../java/org/torproject/android/service/util/NativeLoader.java | 6 ++---- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/BUILD b/BUILD index bbbeaa8f..8e9b9b33 100644 --- a/BUILD +++ b/BUILD @@ -23,10 +23,9 @@ You then need to run "ndk-build" from: cd orbotservice/src/main ndk-build - mkdir -p assets/armeabi - zip assets/armeabi/pdnsd.mp3 libs/armeabi/pdnsd - mkdir -p assets/x86 - zip assets/x86/pdnsd.mp3 libs/x86/pdnsd + mv libs/armeabi/pdnsd libs/armeabi/pdnsd.so + mv libs/armeabi-v7a/pdnsd libs/armeabi-v7a/pdnsd.so + mv libs/x86/pdnsd libs/x86/pdnsd.so This isn't enough though and we'll now sew up the binary into a small package that will handle basic Tor controlling features. diff --git a/orbotservice/src/main/java/org/torproject/android/service/util/NativeLoader.java b/orbotservice/src/main/java/org/torproject/android/service/util/NativeLoader.java index d6a25436..3e910cce 100644 --- a/orbotservice/src/main/java/org/torproject/android/service/util/NativeLoader.java +++ b/orbotservice/src/main/java/org/torproject/android/service/util/NativeLoader.java @@ -21,16 +21,14 @@ public class NativeLoader { ZipFile zipFile = null; - ZipInputStream stream = null; + InputStream stream = null; try { zipFile = new ZipFile(context.getApplicationInfo().sourceDir); ZipEntry entry = zipFile.getEntry("lib/" + folder + "/" + libName + ".so"); if (entry == null) { throw new Exception("Unable to find file in apk:" + "lib/" + folder + "/" + libName); } - //the zip file entry is also zipped itself! - stream = new ZipInputStream(zipFile.getInputStream(entry)); - stream.getNextEntry(); + stream = zipFile.getInputStream(entry); OutputStream out = new FileOutputStream(destLocalFile); byte[] buf = new byte[4096];

1 0

[orbot/master] We get a better material design dialog by not using a custom layout
by n8fr8＠torproject.org 13 Sep '18

13 Sep '18

commit 0b15ae5c12a6940b5d1817a37f55f4aebeecef88 Author: lexi <bird.s.lex(a)gmail.com> Date: Sat May 19 15:03:26 2018 -0400 We get a better material design dialog by not using a custom layout --- .../ui/onboarding/BridgeWizardActivity.java | 53 ++++++++++------------ app/src/main/res/layout/layout_diag.xml | 14 ------ 2 files changed, 23 insertions(+), 44 deletions(-) diff --git a/app/src/main/java/org/torproject/android/ui/onboarding/BridgeWizardActivity.java b/app/src/main/java/org/torproject/android/ui/onboarding/BridgeWizardActivity.java index da23a62a..66ea8f60 100644 --- a/app/src/main/java/org/torproject/android/ui/onboarding/BridgeWizardActivity.java +++ b/app/src/main/java/org/torproject/android/ui/onboarding/BridgeWizardActivity.java @@ -13,7 +13,6 @@ import android.os.Bundle; import android.support.v7.app.AppCompatActivity; import android.support.v7.widget.Toolbar; import android.text.TextUtils; -import android.view.LayoutInflater; import android.view.MenuItem; import android.view.View; import android.widget.RadioButton; @@ -104,7 +103,7 @@ public class BridgeWizardActivity extends AppCompatActivity { @Override protected void attachBaseContext(Context base) { super.attachBaseContext(LocaleHelper.onAttach(base)); - }g + } @Override public boolean onOptionsItemSelected(MenuItem item) { @@ -119,34 +118,28 @@ public class BridgeWizardActivity extends AppCompatActivity { private void showGetBridgePrompt() { - LayoutInflater li = LayoutInflater.from(this); - View view = li.inflate(R.layout.layout_diag, null); - - TextView versionName = view.findViewById(R.id.diaglog); - versionName.setText(R.string.you_must_get_a_bridge_address_by_email_web_or_from_a_friend_once_you_have_this_address_please_paste_it_into_the_bridges_preference_in_orbot_s_setting_and_restart_); - new AlertDialog.Builder(this) - .setTitle(R.string.bridge_mode) - .setView(view) - .setNegativeButton(R.string.btn_cancel, new Dialog.OnClickListener() { - @Override - public void onClick(DialogInterface dialog, int which) { - //do nothing - } - }) - .setNeutralButton(R.string.get_bridges_email, new Dialog.OnClickListener() { - @Override - public void onClick(DialogInterface dialog, int which) { - sendGetBridgeEmail(); - } - - }) - .setPositiveButton(R.string.get_bridges_web, new Dialog.OnClickListener() { - @Override - public void onClick(DialogInterface dialog, int which) { - openBrowser(OrbotConstants.URL_TOR_BRIDGES, true, null); - } - }).show(); + .setTitle(R.string.bridge_mode) + .setMessage(R.string.you_must_get_a_bridge_address_by_email_web_or_from_a_friend_once_you_have_this_address_please_paste_it_into_the_bridges_preference_in_orbot_s_setting_and_restart_) + .setNegativeButton(R.string.btn_cancel, new Dialog.OnClickListener() { + @Override + public void onClick(DialogInterface dialog, int which) { + //do nothing + } + }) + .setNeutralButton(R.string.get_bridges_email, new Dialog.OnClickListener() { + @Override + public void onClick(DialogInterface dialog, int which) { + sendGetBridgeEmail(); + } + + }) + .setPositiveButton(R.string.get_bridges_web, new Dialog.OnClickListener() { + @Override + public void onClick(DialogInterface dialog, int which) { + openBrowser(OrbotConstants.URL_TOR_BRIDGES, true); + } + }).show(); } private void sendGetBridgeEmail() @@ -163,7 +156,7 @@ public class BridgeWizardActivity extends AppCompatActivity { /* * Launch the system activity for Uri viewing with the provided url */ - private void openBrowser(final String browserLaunchUrl,boolean forceExternal, String pkgId) + private void openBrowser(final String browserLaunchUrl, boolean forceExternal) { startActivity(new Intent(Intent.ACTION_VIEW,Uri.parse(browserLaunchUrl))); } diff --git a/app/src/main/res/layout/layout_diag.xml b/app/src/main/res/layout/layout_diag.xml deleted file mode 100644 index 5b4ce215..00000000 --- a/app/src/main/res/layout/layout_diag.xml +++ /dev/null @@ -1,14 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<ScrollView android:id="@+id/aboutscrollview" - xmlns:android="http://schemas.android.com/apk/res/android" - android:orientation="vertical" - android:layout_width="match_parent" - android:layout_height="match_parent"> - <TextView - android:id="@+id/diaglog" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:textAppearance="?android:attr/textAppearanceMedium" - android:layout_margin="6dp" - /> -</ScrollView> \ No newline at end of file

1 0