August 2020 - tor-commits - lists.torproject.org

[orbot/master] remove TorVpnService from manifest to address #327 crash
by n8fr8＠torproject.org 24 Aug '20

24 Aug '20

commit 12a3f4a904df73f7929c4ecc8730eb07a49908a1 Author: n8fr8 <nathan(a)guardianproject.info> Date: Fri May 1 16:08:08 2020 -0400 remove TorVpnService from manifest to address #327 crash --- app/src/main/AndroidManifest.xml | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 011b78c7..2391433b 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -163,16 +163,12 @@ android:name=".service.OrbotService" android:enabled="true" android:permission="android.permission.BIND_VPN_SERVICE" - android:stopWithTask="false" /> - - <service - android:name=".service.vpn.TorVpnService" - android:enabled="true" - android:permission="android.permission.BIND_VPN_SERVICE"> + android:stopWithTask="false" > <intent-filter> <action android:name="android.net.VpnService" /> </intent-filter> </service> + </application> </manifest> \ No newline at end of file

1 0

[orbot/master] update tor and obfs4proxy binary libs to address #326 hopefully
by n8fr8＠torproject.org 24 Aug '20

24 Aug '20

commit d0fec8e3132ccd73c2cb708c60e34d275df0c435 Author: n8fr8 <nathan(a)guardianproject.info> Date: Fri May 1 00:08:55 2020 -0400 update tor and obfs4proxy binary libs to address #326 hopefully --- orbotservice/build.gradle | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/orbotservice/build.gradle b/orbotservice/build.gradle index a011b9df..8233defb 100644 --- a/orbotservice/build.gradle +++ b/orbotservice/build.gradle @@ -43,10 +43,10 @@ dependencies { implementation 'androidx.legacy:legacy-support-v4:1.0.0' - implementation 'org.torproject:tor-android-binary:0.4.2.7' + implementation 'org.torproject:tor-android-binary:0.4.2.7a' - implementation 'info.pluggabletransports.aptds:apt-dispatch-library:1.0.7' - implementation 'info.pluggabletransports.aptds:apt-meek-obfs4-legacy:1.0.8' + implementation 'info.pluggabletransports.aptds:apt-dispatch-library:1.0.9' + implementation 'info.pluggabletransports.aptds:apt-meek-obfs4-legacy:1.0.9' implementation 'info.pluggabletransports.aptds:jsocksAndroid:1.0.4' implementation 'com.jaredrummler:android-shell:1.0.0'

1 0

[orbot/master] Issue #324: Implemented CustomBridgesActivity analogous to Onion Browser iOS.
by n8fr8＠torproject.org 24 Aug '20

24 Aug '20

commit 718bb4216527a6af649d4d821b94f67be0d91ebb Author: Benjamin Erhart <berhart(a)netzarchitekten.com> Date: Mon May 4 15:04:57 2020 +0200 Issue #324: Implemented CustomBridgesActivity analogous to Onion Browser iOS. --- app/src/main/AndroidManifest.xml | 1 + .../java/org/torproject/android/MainConstants.java | 4 +- .../ui/onboarding/BridgeWizardActivity.java | 90 ++------- .../ui/onboarding/CustomBridgesActivity.java | 219 +++++++++++++++++++++ .../android/ui/onboarding/MoatActivity.java | 2 +- .../main/res/layout/activity_custom_bridges.xml | 100 ++++++++++ app/src/main/res/layout/content_bridge_wizard.xml | 20 +- app/src/main/res/values/strings.xml | 11 +- 8 files changed, 365 insertions(+), 82 deletions(-) diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 011b78c7..a3fbec82 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -108,6 +108,7 @@ <activity android:name=".ui.onboarding.OnboardingActivity" /> <activity android:name=".ui.onboarding.BridgeWizardActivity" /> <activity android:name=".ui.onboarding.MoatActivity" /> + <activity android:name=".ui.onboarding.CustomBridgesActivity" /> <provider android:name=".ui.hiddenservices.providers.HSContentProvider" diff --git a/app/src/main/java/org/torproject/android/MainConstants.java b/app/src/main/java/org/torproject/android/MainConstants.java index f7f20cbe..06e99861 100644 --- a/app/src/main/java/org/torproject/android/MainConstants.java +++ b/app/src/main/java/org/torproject/android/MainConstants.java @@ -8,7 +8,9 @@ public interface MainConstants { //path to check Tor against String URL_TOR_CHECK = "https://check.torproject.org"; - String URL_TOR_BRIDGES = "https://bridges.torproject.org/bridges?transport="; + String URL_TOR_BRIDGES = "https://bridges.torproject.org/bridges"; + + String EMAIL_TOR_BRIDGES = "bridges(a)torproject.org"; int RESULT_CLOSE_ALL = 0; 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 6b439468..7f7561ba 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 @@ -1,14 +1,11 @@ package org.torproject.android.ui.onboarding; -import android.app.AlertDialog; -import android.app.Dialog; import android.content.Context; -import android.content.DialogInterface; import android.content.Intent; -import android.net.Uri; import android.os.AsyncTask; import android.os.Bundle; import android.text.TextUtils; +import android.util.Log; import android.view.MenuItem; import android.view.View; import android.widget.RadioButton; @@ -28,8 +25,6 @@ import java.net.InetSocketAddress; import java.net.Socket; import java.net.SocketAddress; -import static org.torproject.android.MainConstants.URL_TOR_BRIDGES; - public class BridgeWizardActivity extends AppCompatActivity { private static int MOAT_REQUEST_CODE = 666; @@ -38,8 +33,7 @@ public class BridgeWizardActivity extends AppCompatActivity { private RadioButton mBtDirect; private RadioButton mBtObfs4; private RadioButton mBtMeek; - private RadioButton mBtNew; - private RadioButton mBtMoat; + private RadioButton mBtCustom; @Override @@ -59,6 +53,14 @@ public class BridgeWizardActivity extends AppCompatActivity { setTitle(getString(R.string.bridges)); + findViewById(R.id.btnMoat).setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + startActivityForResult(new Intent(BridgeWizardActivity.this, MoatActivity.class), + MOAT_REQUEST_CODE); + } + }); + mBtDirect = findViewById(R.id.btnBridgesDirect); mBtDirect.setOnClickListener(new View.OnClickListener() { @Override @@ -91,22 +93,18 @@ public class BridgeWizardActivity extends AppCompatActivity { }); - mBtNew = findViewById(R.id.btnBridgesNew); - mBtNew.setOnClickListener(new View.OnClickListener() { + mBtCustom = findViewById(R.id.btnCustomBridges); + mBtCustom.setOnClickListener(new View.OnClickListener() { @Override - public void onClick(View v) { - showGetBridgePrompt(); + public void onClick(View view) { + startActivity(new Intent(BridgeWizardActivity.this, CustomBridgesActivity.class)); } }); + } - mBtMoat = findViewById(R.id.btnMoat); - mBtMoat.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - startActivityForResult(new Intent(BridgeWizardActivity.this, MoatActivity.class), - MOAT_REQUEST_CODE); - } - }); + @Override + protected void onResume() { + super.onResume(); evaluateBridgeListState(); } @@ -144,49 +142,6 @@ 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(URL_TOR_BRIDGES); - } - }).show(); - } - - private void sendGetBridgeEmail() { - 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))); - } - - - /* - * Launch the system activity for Uri viewing with the provided url - */ - @SuppressWarnings("SameParameterValue") - private void openBrowser(final String browserLaunchUrl) { - startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(browserLaunchUrl))); - } - private void testBridgeConnection() { if (TextUtils.isEmpty(Prefs.getBridgesList()) || (!Prefs.bridgesEnabled())) { @@ -258,6 +213,8 @@ public class BridgeWizardActivity extends AppCompatActivity { } private void evaluateBridgeListState() { + Log.d(getClass().getSimpleName(), String.format("bridgesEnabled=%b, bridgesList=%s", Prefs.bridgesEnabled(), Prefs.getBridgesList())); + if (!Prefs.bridgesEnabled()) { mBtDirect.setChecked(true); } @@ -268,12 +225,7 @@ public class BridgeWizardActivity extends AppCompatActivity { mBtObfs4.setChecked(true); } else { - mBtDirect.setChecked(false); - mBtMeek.setChecked(false); - mBtObfs4.setChecked(false); + mBtCustom.setChecked(true); } - - mBtNew.setChecked(false); - mBtMoat.setChecked(false); } } diff --git a/app/src/main/java/org/torproject/android/ui/onboarding/CustomBridgesActivity.java b/app/src/main/java/org/torproject/android/ui/onboarding/CustomBridgesActivity.java new file mode 100644 index 00000000..0aa0c5ee --- /dev/null +++ b/app/src/main/java/org/torproject/android/ui/onboarding/CustomBridgesActivity.java @@ -0,0 +1,219 @@ +/* Copyright (c) 2020, Benjamin Erhart, Orbot / The Guardian Project - https://guardianproject.info */ +/* See LICENSE for licensing information */ +package org.torproject.android.ui.onboarding; + +import android.content.ClipData; +import android.content.ClipboardManager; +import android.content.Intent; +import android.net.Uri; +import android.os.Bundle; +import android.text.Editable; +import android.text.TextUtils; +import android.text.TextWatcher; +import android.util.Log; +import android.view.MenuItem; +import android.view.View; +import android.widget.EditText; +import android.widget.TextView; +import android.widget.Toast; + +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.appcompat.app.ActionBar; +import androidx.appcompat.app.AppCompatActivity; +import androidx.appcompat.widget.Toolbar; + +import com.google.zxing.integration.android.IntentIntegrator; +import com.google.zxing.integration.android.IntentResult; + +import org.json.JSONArray; +import org.torproject.android.R; +import org.torproject.android.service.OrbotService; +import org.torproject.android.service.TorServiceConstants; +import org.torproject.android.service.util.Prefs; + +import java.io.UnsupportedEncodingException; +import java.net.URLDecoder; +import java.net.URLEncoder; + +import static org.torproject.android.MainConstants.EMAIL_TOR_BRIDGES; +import static org.torproject.android.MainConstants.URL_TOR_BRIDGES; + +public class CustomBridgesActivity extends AppCompatActivity implements View.OnClickListener, TextWatcher { + + private EditText mEtPastedBridges; + + @Override + public void onCreate(@Nullable Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_custom_bridges); + + Toolbar toolbar = findViewById(R.id.toolbar); + setSupportActionBar(toolbar); + + ActionBar actionBar = getSupportActionBar(); + if (actionBar != null) { + actionBar.setDisplayHomeAsUpEnabled(true); + } + + setTitle(getString(R.string.use_custom_bridges)); + + ((TextView) findViewById(R.id.tvDescription)).setText(getString(R.string.in_a_browser, URL_TOR_BRIDGES)); + + findViewById(R.id.btCopyUrl).setOnClickListener(this); + + String bridges = Prefs.getBridgesList().trim(); + if (!Prefs.bridgesEnabled() || bridges.equals("obfs4") || bridges.equals("meek")) { + bridges = null; + } + + mEtPastedBridges = findViewById(R.id.etPastedBridges); + mEtPastedBridges.setText(bridges); + mEtPastedBridges.addTextChangedListener(this); + + findViewById(R.id.btScanQr).setOnClickListener(this); + + findViewById(R.id.btShareQr).setOnClickListener(this); + + findViewById(R.id.btEmail).setOnClickListener(this); + } + + @Override + public boolean onOptionsItemSelected(@NonNull MenuItem item) { + if (item.getItemId() == android.R.id.home) { + finish(); + + return true; + } + + return super.onOptionsItemSelected(item); + } + + @Override + public void onClick(View view) { + IntentIntegrator integrator = new IntentIntegrator(this); + + switch (view.getId()) { + case R.id.btCopyUrl: + ClipboardManager clipboard = (ClipboardManager) getSystemService(CLIPBOARD_SERVICE); + + if (clipboard != null) { + clipboard.setPrimaryClip(ClipData.newPlainText(URL_TOR_BRIDGES, URL_TOR_BRIDGES)); + + Toast.makeText(this, R.string.done, Toast.LENGTH_LONG).show(); + } + + break; + + case R.id.btScanQr: + integrator.initiateScan(); + + break; + + case R.id.btShareQr: + String bridges = Prefs.getBridgesList(); + + if (!TextUtils.isEmpty(bridges)) { + try { + bridges = "bridge://" + URLEncoder.encode(bridges, "UTF-8"); + + integrator.shareText(bridges); + + } catch (UnsupportedEncodingException e) { + e.printStackTrace(); + } + } + + break; + + case R.id.btEmail: + Intent emailIntent = new Intent(Intent.ACTION_SENDTO, Uri.parse("mailto:" + EMAIL_TOR_BRIDGES)); + emailIntent.putExtra(Intent.EXTRA_SUBJECT, "get transport"); + emailIntent.putExtra(Intent.EXTRA_TEXT, "get transport"); + startActivity(Intent.createChooser(emailIntent, getString(R.string.send_email))); + + break; + } + } + + @Override + protected void onActivityResult(int request, int response, Intent data) { + super.onActivityResult(request, response, data); + + IntentResult scanResult = IntentIntegrator.parseActivityResult(request, response, data); + + if (scanResult != null) { + String results = scanResult.getContents(); + + if (!TextUtils.isEmpty(results)) { + try { + + int urlIdx = results.indexOf("://"); + + if (urlIdx != -1) { + results = URLDecoder.decode(results, "UTF-8"); + results = results.substring(urlIdx + 3); + + setNewBridges(results); + } + else { + JSONArray bridgeJson = new JSONArray(results); + StringBuilder bridgeLines = new StringBuilder(); + + for (int i = 0; i < bridgeJson.length(); i++) { + String bridgeLine = bridgeJson.getString(i); + bridgeLines.append(bridgeLine).append("\n"); + } + + setNewBridges(bridgeLines.toString()); + } + } + catch (Exception e) { + Log.e(getClass().getSimpleName(), "unsupported", e); + } + } + + setResult(RESULT_OK); + } + } + + @Override + public void beforeTextChanged(CharSequence charSequence, int i, int i1, int i2) { + // Ignored. + } + + @Override + public void onTextChanged(CharSequence charSequence, int i, int i1, int i2) { + // Ignored. + } + + @Override + public void afterTextChanged(Editable editable) { + setNewBridges(editable.toString(), false); + } + + private void setNewBridges(String newBridgeValue) { + setNewBridges(newBridgeValue, true); + } + + private void setNewBridges(String bridges, boolean updateEditText) { + if (bridges != null) { + bridges = bridges.trim(); + + if (TextUtils.isEmpty(bridges)) { + bridges = null; + } + } + + if (updateEditText) { + mEtPastedBridges.setText(bridges); + } + + Prefs.setBridgesList(bridges); + Prefs.putBridgesEnabled(bridges != null); + + Intent intent = new Intent(this, OrbotService.class); + intent.setAction(TorServiceConstants.CMD_SIGNAL_HUP); + startService(intent); + } +} diff --git a/app/src/main/java/org/torproject/android/ui/onboarding/MoatActivity.java b/app/src/main/java/org/torproject/android/ui/onboarding/MoatActivity.java index 89a20eec..df390a2f 100644 --- a/app/src/main/java/org/torproject/android/ui/onboarding/MoatActivity.java +++ b/app/src/main/java/org/torproject/android/ui/onboarding/MoatActivity.java @@ -405,7 +405,7 @@ public class MoatActivity extends AppCompatActivity implements View.OnClickListe Log.d(MoatActivity.class.getSimpleName(), "Set up Volley queue. host=" + host + ", port=" + port); - mQueue = Volley.newRequestQueue(MoatActivity.this, new ProxiedHurlStack(host, port)); + mQueue = Volley.newRequestQueue(this, new ProxiedHurlStack(host, port)); sendIntentToService(TorServiceConstants.CMD_SIGNAL_HUP); diff --git a/app/src/main/res/layout/activity_custom_bridges.xml b/app/src/main/res/layout/activity_custom_bridges.xml new file mode 100644 index 00000000..8a7b2998 --- /dev/null +++ b/app/src/main/res/layout/activity_custom_bridges.xml @@ -0,0 +1,100 @@ +<?xml version="1.0" encoding="utf-8"?> +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:app="http://schemas.android.com/apk/res-auto" + xmlns:tools="http://schemas.android.com/tools" + android:orientation="vertical" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:background="@color/dark_purple" + tools:context=".ui.onboarding.CustomBridgesActivity"> + + <com.google.android.material.appbar.AppBarLayout + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:theme="@style/DefaultTheme.AppBarOverlay"> + + <androidx.appcompat.widget.Toolbar + android:id="@+id/toolbar" + android:layout_width="match_parent" + android:layout_height="?attr/actionBarSize" + android:background="?attr/colorPrimary" + app:popupTheme="@style/DefaultTheme.PopupOverlay" /> + + </com.google.android.material.appbar.AppBarLayout> + + <ScrollView + android:layout_width="match_parent" + android:layout_height="match_parent"> + + <LinearLayout + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="vertical" > + + <TextView + android:id="@+id/tvDescription" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_margin="12dp" + android:text="@string/in_a_browser" /> + + <Button + android:id="@+id/btCopyUrl" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_margin="12dp" + android:text="@string/copy_address_to_clipboard" /> + + <TextView + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_margin="12dp" + android:text="@string/paste_bridges" /> + + <EditText + android:id="@+id/etPastedBridges" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_margin="12dp" + android:lines="5" + android:inputType="textMultiLine|textNoSuggestions" + tools:ignore="Autofill,LabelFor" /> + + <TextView + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_margin="12dp" + android:text="@string/use_qr_code" /> + + <Button + android:id="@+id/btScanQr" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_margin="12dp" + android:text="@string/menu_scan" /> + + <Button + android:id="@+id/btShareQr" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_margin="12dp" + android:text="@string/menu_share_bridge" /> + + <TextView + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_margin="12dp" + android:text="@string/get_bridges_email" /> + + <Button + android:id="@+id/btEmail" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_margin="12dp" + android:text="@string/get_bridges_email" /> + + </LinearLayout> + + </ScrollView> + +</LinearLayout> \ No newline at end of file diff --git a/app/src/main/res/layout/content_bridge_wizard.xml b/app/src/main/res/layout/content_bridge_wizard.xml index ce8b6e6c..d8e20d82 100644 --- a/app/src/main/res/layout/content_bridge_wizard.xml +++ b/app/src/main/res/layout/content_bridge_wizard.xml @@ -19,8 +19,15 @@ android:textSize="16sp" android:textStyle="bold" /> + <Button + android:id="@+id/btnMoat" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_margin="12dp" + android:text="@string/request_bridges_from_torproject" /> + <RadioGroup - android:layout_width="wrap_content" + android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical"> @@ -46,18 +53,11 @@ android:text="@string/bridge_cloud" /> <RadioButton - android:id="@+id/btnBridgesNew" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_margin="12dp" - android:text="@string/bridges_get_new" /> - - <RadioButton - android:id="@+id/btnMoat" + android:id="@+id/btnCustomBridges" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_margin="12dp" - android:text="@string/bridges_get_new_moat"/> + android:text="@string/custom_bridges"/> </RadioGroup> diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 072de5b5..d7139115 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -249,7 +249,6 @@ <string name="bridge_community">Connect through community servers</string> <string name="bridge_cloud">Connect through cloud servers</string> <string name="bridges_get_new">Request New Bridges via Email...</string> - <string name="bridges_get_new_moat">Request New Bridges Directly...</string> <string name="trouble_connecting">Trouble connecting?</string> <string name="full_device_vpn">Full Device VPN</string> @@ -268,4 +267,14 @@ <string name="solve_captcha_instruction">Solve the CAPTCHA to request bridges.</string> <string name="captcha">Captcha</string> <string name="enter_characters_from_image">Enter characters from image</string> + +  + <string name="request_bridges_from_torproject">Request Bridges from torproject.org</string> + <string name="custom_bridges">Custom Bridges</string> + +  + <string name="use_custom_bridges">Use Custom Bridges</string> + <string name="in_a_browser">In a browser, visit %s and tap "Get Bridges" > "Just Give Me Bridges!"</string> + <string name="paste_bridges">Paste Bridges</string> + <string name="use_qr_code">Use QR Code</string> </resources>

1 0

[orbot/master] update binary install scripts, to fix pdnsd install
by n8fr8＠torproject.org 24 Aug '20

24 Aug '20

commit 22bd248a4b65e28f03429a4443dfdf2201da4005 Author: n8fr8 <nathan(a)guardianproject.info> Date: Fri May 1 14:00:56 2020 -0400 update binary install scripts, to fix pdnsd install - now pdnsd is packaged as libpdsnd.so to work on newer platforms --- .../torproject/android/service/util/CustomNativeLoader.java | 2 ++ .../android/service/util/CustomTorResourceInstaller.java | 12 +++++++----- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/orbotservice/src/main/java/org/torproject/android/service/util/CustomNativeLoader.java b/orbotservice/src/main/java/org/torproject/android/service/util/CustomNativeLoader.java index 24a994d5..50dc2825 100644 --- a/orbotservice/src/main/java/org/torproject/android/service/util/CustomNativeLoader.java +++ b/orbotservice/src/main/java/org/torproject/android/service/util/CustomNativeLoader.java @@ -75,6 +75,8 @@ public class CustomNativeLoader { File fileNativeBin = new File(getNativeLibraryDir(context),libname + ".so"); + if (!fileNativeBin.exists()) + fileNativeBin = new File(getNativeLibraryDir(context),"lib" + libname + ".so"); if (fileNativeBin.exists()) { diff --git a/orbotservice/src/main/java/org/torproject/android/service/util/CustomTorResourceInstaller.java b/orbotservice/src/main/java/org/torproject/android/service/util/CustomTorResourceInstaller.java index a44ff18d..3c4c1fc3 100644 --- a/orbotservice/src/main/java/org/torproject/android/service/util/CustomTorResourceInstaller.java +++ b/orbotservice/src/main/java/org/torproject/android/service/util/CustomTorResourceInstaller.java @@ -63,18 +63,20 @@ public class CustomTorResourceInstaller implements TorServiceConstants { } } + File fileTorBin = new File(installFolder, TOR_BINARY_KEY); + //it exists but we can't execute it, so copy it to a new path if (fileTor.exists()) { InputStream is = new FileInputStream(fileTor); - streamToFile(is, fileTor, false, true); - setExecutable(fileTor); + streamToFile(is, fileTorBin, false, true); + setExecutable(fileTorBin); - if (fileTor.exists() && fileTor.canExecute()) - return fileTor; + if (fileTorBin.exists() && fileTorBin.canExecute()) + return fileTorBin; } //let's try another approach - fileTor = CustomNativeLoader.loadNativeBinary(context,TOR_ASSET_KEY,new File(installFolder, TOR_ASSET_KEY)); + fileTor = CustomNativeLoader.loadNativeBinary(context,TOR_ASSET_KEY,fileTorBin); if (fileTor != null && fileTor.exists()) setExecutable(fileTor);

1 0

[orbot/master] don't start tun2socks/VPN if it is already running
by n8fr8＠torproject.org 24 Aug '20

24 Aug '20

commit cabf328b52ea7ed105c15952902cc0cc66baa1d6 Author: n8fr8 <nathan(a)guardianproject.info> Date: Mon May 4 11:13:53 2020 -0400 don't start tun2socks/VPN if it is already running --- .../torproject/android/service/OrbotService.java | 33 ++++++++++++++-------- .../android/service/vpn/OrbotVpnManager.java | 13 ++++++--- 2 files changed, 30 insertions(+), 16 deletions(-) diff --git a/orbotservice/src/main/java/org/torproject/android/service/OrbotService.java b/orbotservice/src/main/java/org/torproject/android/service/OrbotService.java index 596771cf..9ecd9c96 100644 --- a/orbotservice/src/main/java/org/torproject/android/service/OrbotService.java +++ b/orbotservice/src/main/java/org/torproject/android/service/OrbotService.java @@ -373,27 +373,36 @@ public class OrbotService extends VpnService implements TorServiceConstants, Orb if (Prefs.useVpn()) { + if (!mVpnManager.isStarted()) { + //start VPN here + Intent vpnIntent = VpnService.prepare(OrbotService.this); + if (vpnIntent == null) //then we can run the VPN + { + mVpnManager.handleIntent(new Builder(), mIntent); + + } + } + + if (mPortSOCKS != -1 && mPortHTTP != -1) + sendCallbackPorts(mPortSOCKS, mPortHTTP, mPortDns, mPortTrans); + } + + } + else if (action.equals(ACTION_START_VPN)) { + if (!mVpnManager.isStarted()) { //start VPN here Intent vpnIntent = VpnService.prepare(OrbotService.this); if (vpnIntent == null) //then we can run the VPN { mVpnManager.handleIntent(new Builder(), mIntent); - if (mPortSOCKS != -1 && mPortHTTP != -1) - sendCallbackPorts(mPortSOCKS, mPortHTTP, mPortDns, mPortTrans); + + } } - } - else if (action.equals(ACTION_START_VPN)) { - //start VPN here - Intent vpnIntent = VpnService.prepare(OrbotService.this); - if (vpnIntent == null) //then we can run the VPN - { - mVpnManager.handleIntent(new Builder(), mIntent); + if (mPortSOCKS != -1 && mPortHTTP != -1) + sendCallbackPorts(mPortSOCKS, mPortHTTP, mPortDns, mPortTrans); - if (mPortSOCKS != -1 && mPortHTTP != -1) - sendCallbackPorts(mPortSOCKS, mPortHTTP, mPortDns, mPortTrans); - } } else if (action.equals(ACTION_STOP_VPN)) { diff --git a/orbotservice/src/main/java/org/torproject/android/service/vpn/OrbotVpnManager.java b/orbotservice/src/main/java/org/torproject/android/service/vpn/OrbotVpnManager.java index f5a3e8a9..81e8f1a0 100644 --- a/orbotservice/src/main/java/org/torproject/android/service/vpn/OrbotVpnManager.java +++ b/orbotservice/src/main/java/org/torproject/android/service/vpn/OrbotVpnManager.java @@ -236,8 +236,10 @@ public class OrbotVpnManager implements Handler.Callback { { if (mIsLollipop) stopSocksBypass (); - - if (mInterface != null){ + + Tun2Socks.Stop(); + + if (mInterface != null){ try { Log.d(TAG,"closing interface, destroying VPN interface"); @@ -256,9 +258,8 @@ public class OrbotVpnManager implements Handler.Callback { } } + stopDns(); - - Tun2Socks.Stop(); mThreadVPN = null; @@ -493,6 +494,10 @@ public class OrbotVpnManager implements Handler.Callback { return fPid; } + public boolean isStarted () + { + return isStarted; + } }

1 0

[orbot/master] update to 16201003
by n8fr8＠torproject.org 24 Aug '20

24 Aug '20

commit 22d7ef8d73d75d44469a4a8e0ccf07106b566936 Author: n8fr8 <nathan(a)guardianproject.info> Date: Fri May 1 14:02:30 2020 -0400 update to 16201003 --- app/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/build.gradle b/app/build.gradle index 66834cee..0c92b234 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -73,7 +73,7 @@ android { minSdkVersion 16 applicationId 'org.torproject.android' targetSdkVersion 29 - versionCode 16201002 + versionCode 16201003 versionName getVersionName() archivesBaseName = "Orbot-$versionName" }

1 0

[orbot/master] update version code
by n8fr8＠torproject.org 24 Aug '20

24 Aug '20

commit 85e027c36686d6e3173322b95ef0913119501df1 Author: n8fr8 <nathan(a)guardianproject.info> Date: Mon May 4 11:14:03 2020 -0400 update version code --- app/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/build.gradle b/app/build.gradle index 0c92b234..e447aa8d 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -73,7 +73,7 @@ android { minSdkVersion 16 applicationId 'org.torproject.android' targetSdkVersion 29 - versionCode 16201003 + versionCode 16201004 versionName getVersionName() archivesBaseName = "Orbot-$versionName" }

1 0

[orbot/master] Merge branch 'master' of https://github.com/tladesignz/orbot into tladesignz-master
by n8fr8＠torproject.org 24 Aug '20

24 Aug '20

commit 875f18adc5eb5e50dbebcb8bbaf9d4387d57d1a0 Merge: 12a3f4a9 718bb421 Author: n8fr8 <nathan(a)guardianproject.info> Date: Mon May 4 11:14:33 2020 -0400 Merge branch 'master' of https://github.com/tladesignz/orbot into tladesignz-master app/src/main/AndroidManifest.xml | 1 + .../java/org/torproject/android/MainConstants.java | 4 +- .../ui/onboarding/BridgeWizardActivity.java | 90 ++------- .../ui/onboarding/CustomBridgesActivity.java | 219 +++++++++++++++++++++ .../android/ui/onboarding/MoatActivity.java | 31 ++- .../main/res/layout/activity_custom_bridges.xml | 100 ++++++++++ app/src/main/res/layout/content_bridge_wizard.xml | 20 +- app/src/main/res/values/strings.xml | 11 +- 8 files changed, 388 insertions(+), 88 deletions(-)

1 0

[orbot/master] Merge branch 'tladesignz-master'
by n8fr8＠torproject.org 24 Aug '20

24 Aug '20

commit a63107723bd0710b7d95ed35cdddf72644219b9a Merge: 85e027c3 875f18ad Author: n8fr8 <nathan(a)guardianproject.info> Date: Mon May 4 11:42:13 2020 -0400 Merge branch 'tladesignz-master' app/src/main/AndroidManifest.xml | 1 + .../java/org/torproject/android/MainConstants.java | 4 +- .../ui/onboarding/BridgeWizardActivity.java | 90 ++------- .../ui/onboarding/CustomBridgesActivity.java | 219 +++++++++++++++++++++ .../android/ui/onboarding/MoatActivity.java | 31 ++- .../main/res/layout/activity_custom_bridges.xml | 100 ++++++++++ app/src/main/res/layout/content_bridge_wizard.xml | 20 +- app/src/main/res/values/strings.xml | 11 +- 8 files changed, 388 insertions(+), 88 deletions(-)

1 0

[orbot/master] Recent changes to the BridgeWizard would cause it not to display
by n8fr8＠torproject.org 24 Aug '20

24 Aug '20

commit 315a1a881ac12511b99e26075b51c82e24501476 Author: bim <dsnake(a)protonmail.com> Date: Sun May 10 20:20:00 2020 -0400 Recent changes to the BridgeWizard would cause it not to display fully in landscape orientation. This was trivially fixed by adding a ScrollView --- app/src/main/res/layout/content_bridge_wizard.xml | 103 ++++++++++++---------- 1 file changed, 55 insertions(+), 48 deletions(-) diff --git a/app/src/main/res/layout/content_bridge_wizard.xml b/app/src/main/res/layout/content_bridge_wizard.xml index d8e20d82..5c3d990e 100644 --- a/app/src/main/res/layout/content_bridge_wizard.xml +++ b/app/src/main/res/layout/content_bridge_wizard.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" +<ScrollView xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" @@ -9,65 +9,72 @@ tools:context="org.torproject.android.ui.onboarding.BridgeWizardActivity" tools:showIn="@layout/activity_bridge_wizard"> - <TextView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_margin="12dp" - - 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" /> - - <Button - android:id="@+id/btnMoat" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_margin="12dp" - android:text="@string/request_bridges_from_torproject" /> - - <RadioGroup + <LinearLayout + android:id="@+id/scrollView" android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical"> - <RadioButton - android:id="@+id/btnBridgesDirect" + <TextView android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_margin="12dp" - android:text="@string/bridge_direct_connect" /> - <RadioButton - android:id="@+id/btnBridgesObfs4" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_margin="12dp" - android:text="@string/bridge_community" /> + 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" /> - <RadioButton - android:id="@+id/btnBridgesMeek" - android:layout_width="wrap_content" + <Button + android:id="@+id/btnMoat" + android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_margin="12dp" - android:text="@string/bridge_cloud" /> + android:text="@string/request_bridges_from_torproject" /> - <RadioButton - android:id="@+id/btnCustomBridges" - android:layout_width="wrap_content" + <RadioGroup + android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_margin="12dp" - android:text="@string/custom_bridges"/> + android:orientation="vertical"> - </RadioGroup> + <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" /> - <TextView - android:id="@+id/lbl_bridge_test_status" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_margin="12dp" - android:gravity="center" - android:textColor="@color/bright_green" - android:textSize="16sp" - android:textStyle="bold" /> -</LinearLayout> + <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/btnCustomBridges" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_margin="12dp" + android:text="@string/custom_bridges" /> + + </RadioGroup> + + <TextView + android:id="@+id/lbl_bridge_test_status" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_margin="12dp" + android:gravity="center" + android:textColor="@color/bright_green" + android:textSize="16sp" + android:textStyle="bold" /> + </LinearLayout> +</ScrollView>

1 0