December 2021 - tor-commits - lists.torproject.org

[orbot/master] Merge pull request #485 from weblate/weblate-guardianproject-orbot
by n8fr8＠torproject.org 22 Dec '21

22 Dec '21

commit 2f62f17fad7e7a45496bdd55950a2a311a70ad95 Merge: 806b7233 9226ccbe Author: Nathan Freitas <nathan(a)guardianproject.info> Date: Fri Jul 2 14:23:44 2021 -0400 Merge pull request #485 from weblate/weblate-guardianproject-orbot Translations update from Weblate app/src/main/res/values-fi/strings.xml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)

1 0

[orbot/master] Limit snowflake by default
by n8fr8＠torproject.org 22 Dec '21

22 Dec '21

commit 3498903f0e5abdccfd22e4a0ace58a2bd1052714 Author: Tad <tad(a)spotco.us> Date: Tue Jun 29 15:06:28 2021 -0400 Limit snowflake by default No need to kill batteries and data plans --- app/src/main/res/xml/preferences.xml | 2 +- .../src/main/java/org/torproject/android/service/util/Prefs.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml index ce5b1bbc..28e06052 100644 --- a/app/src/main/res/xml/preferences.xml +++ b/app/src/main/res/xml/preferences.xml @@ -298,7 +298,7 @@ android:title="@string/be_a_snowflake_title" android:summary="@string/be_a_snowflake_desc" /> <CheckBoxPreference - android:defaultValue="false" + android:defaultValue="true" android:key="pref_be_a_snowflake_limit" android:title="@string/be_a_snowflake_title_limit" android:summary="@string/be_a_snowflake_desc_limit" /> diff --git a/orbotservice/src/main/java/org/torproject/android/service/util/Prefs.java b/orbotservice/src/main/java/org/torproject/android/service/util/Prefs.java index 5fa167c2..eaec24e5 100644 --- a/orbotservice/src/main/java/org/torproject/android/service/util/Prefs.java +++ b/orbotservice/src/main/java/org/torproject/android/service/util/Prefs.java @@ -83,7 +83,7 @@ public class Prefs { } public static boolean limitSnowflakeProxying () { - return prefs.getBoolean(PREF_BE_A_SNOWFLAKE_LIMIT,false); + return prefs.getBoolean(PREF_BE_A_SNOWFLAKE_LIMIT,true); } public static void setDefaultLocale(String value) {

1 0

[orbot/master] improve stop/start logic for tor and snowflake
by n8fr8＠torproject.org 22 Dec '21

22 Dec '21

commit 806b7233b2bc54f10e464ba9d0cfbf4621783344 Author: n8fr8 <nathan(a)guardianproject.info> Date: Fri Jul 2 14:09:51 2021 -0400 improve stop/start logic for tor and snowflake --- .../torproject/android/service/OrbotService.java | 28 +++++++--------------- 1 file changed, 9 insertions(+), 19 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 c7d455f7..ca4b538c 100644 --- a/orbotservice/src/main/java/org/torproject/android/service/OrbotService.java +++ b/orbotservice/src/main/java/org/torproject/android/service/OrbotService.java @@ -288,7 +288,7 @@ public class OrbotService extends VpnService implements TorServiceConstants, Orb //not registered yet } - stopTorAsync(); + super.onDestroy(); } @@ -404,7 +404,7 @@ public class OrbotService extends VpnService implements TorServiceConstants, Orb /** * if someone stops during startup, we may have to wait for the conn port to be setup, so we can properly shutdown tor */ - private synchronized void stopTor() throws Exception { + private void stopTor() throws Exception { if (conn != null) { logNotice("Using control port to shutdown Tor"); @@ -695,12 +695,8 @@ public class OrbotService extends VpnService implements TorServiceConstants, Orb private void startTor() { try { - // STATUS_STARTING is set in onCreate() - if (mCurrentStatus.equals(STATUS_STOPPING)) { - // these states should probably be handled better - sendCallbackLogMessage("Ignoring start request, currently " + mCurrentStatus); - return; - } else if (mCurrentStatus.equals(STATUS_ON)) { + if (torServiceConnection != null && conn != null) + { showConnectedToTorNetworkNotification(); sendCallbackLogMessage("Ignoring start request, already started."); return; @@ -708,9 +704,6 @@ public class OrbotService extends VpnService implements TorServiceConstants, Orb sendCallbackStatus(STATUS_STARTING); - // make sure there are no stray daemons running - stopTor(); - showToolbarNotification(getString(R.string.status_starting_up), NOTIFY_ID, R.drawable.ic_stat_tor); //sendCallbackLogMessage(getString(R.string.status_starting_up)); //logNotice(getString(R.string.status_starting_up)); @@ -1554,16 +1547,12 @@ public class OrbotService extends VpnService implements TorServiceConstants, Orb IPtProxy.startObfs4Proxy("DEBUG", false, false); else if (useIPtSnowflakeProxy()) startSnowflakeClient(); - } - else if (Prefs.beSnowflakeProxy()) - { + } else if (Prefs.beSnowflakeProxy()) { if (Prefs.limitSnowflakeProxying() - && isChargingAndWifi(OrbotService.this)) - { + && isChargingAndWifi(OrbotService.this)) { enableSnowflakeProxy(); - } - else + } else enableSnowflakeProxy(); } @@ -1585,7 +1574,8 @@ public class OrbotService extends VpnService implements TorServiceConstants, Orb if (mPortSOCKS != -1 && mPortHTTP != -1) sendCallbackPorts(mPortSOCKS, mPortHTTP, mPortDns, mPortTrans); } - + } else if (action.equals(ACTION_STOP)) { + stopTorAsync(); } else if (action.equals(ACTION_START_VPN)) { if (mVpnManager != null && (!mVpnManager.isStarted())) { //start VPN here

1 0

[orbot/master] Actually enable AvoidDiskWrites
by n8fr8＠torproject.org 22 Dec '21

22 Dec '21

commit f2199c5973821deceea379f5f2e05f2c917845ba Author: Tad <tad(a)spotco.us> Date: Tue Jun 29 22:27:01 2021 -0400 Actually enable AvoidDiskWrites --- .../src/main/java/org/torproject/android/service/OrbotService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 9ebd506f..f4cbaacd 100644 --- a/orbotservice/src/main/java/org/torproject/android/service/OrbotService.java +++ b/orbotservice/src/main/java/org/torproject/android/service/OrbotService.java @@ -536,7 +536,7 @@ public class OrbotService extends VpnService implements TorServiceConstants, Orb extraLines.append("\n"); extraLines.append("RunAsDaemon 0").append('\n'); - extraLines.append("AvoidDiskWrites 0").append('\n'); + extraLines.append("AvoidDiskWrites 1").append('\n'); String socksPortPref = prefs.getString(OrbotConstants.PREF_SOCKS, (TorServiceConstants.SOCKS_PROXY_PORT_DEFAULT));

1 0

[orbot/master] don't destroy service each time you stop Tor - causes memory issues and crashes in libtor
by n8fr8＠torproject.org 22 Dec '21

22 Dec '21

commit c0b09bffc61302ff3e3cad2be9248762304217d1 Author: n8fr8 <nathan(a)guardianproject.info> Date: Fri Jul 2 14:09:30 2021 -0400 don't destroy service each time you stop Tor - causes memory issues and crashes in libtor --- app/src/main/java/org/torproject/android/OrbotMainActivity.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/org/torproject/android/OrbotMainActivity.java b/app/src/main/java/org/torproject/android/OrbotMainActivity.java index aff0f2b2..4f0143d3 100644 --- a/app/src/main/java/org/torproject/android/OrbotMainActivity.java +++ b/app/src/main/java/org/torproject/android/OrbotMainActivity.java @@ -89,6 +89,7 @@ import pl.bclogic.pulsator4droid.library.PulsatorLayout; import static androidx.core.content.FileProvider.getUriForFile; import static org.torproject.android.service.TorServiceConstants.ACTION_START; import static org.torproject.android.service.TorServiceConstants.ACTION_START_VPN; +import static org.torproject.android.service.TorServiceConstants.ACTION_STOP; import static org.torproject.android.service.TorServiceConstants.ACTION_STOP_VPN; import static org.torproject.android.service.TorServiceConstants.DIRECTORY_TOR_DATA; import static org.torproject.android.service.TorServiceConstants.STATUS_OFF; @@ -280,8 +281,8 @@ public class OrbotMainActivity extends AppCompatActivity implements OrbotConstan private void stopTor() { if (mBtnVPN.isChecked()) sendIntentToService(ACTION_STOP_VPN); - Intent intent = new Intent(OrbotMainActivity.this, OrbotService.class); - stopService(intent); + sendIntentToService(ACTION_STOP); + } private void doLayout() {

1 0

[orbot/master] Merge branch 'master' of github.com:guardianproject/orbot
by n8fr8＠torproject.org 22 Dec '21

22 Dec '21

commit 65168659497d0d22c6b0d71ea8d99818b6150db8 Merge: 206e7ee2 2f62f17f Author: n8fr8 <nathan(a)guardianproject.info> Date: Fri Jul 2 14:23:51 2021 -0400 Merge branch 'master' of github.com:guardianproject/orbot app/src/main/res/values-fi/strings.xml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)

1 0

[orbot/master] Merge pull request #476 from SkewedZeppelin/isolatehttp
by n8fr8＠torproject.org 22 Dec '21

22 Dec '21

commit 7d526c2ea03a181d5022f41725f3eac252e7f82c Merge: 2f62f17f 245eb345 Author: Nathan Freitas <nathan(a)guardianproject.info> Date: Fri Jul 2 14:25:44 2021 -0400 Merge pull request #476 from SkewedZeppelin/isolatehttp Enable IsolateDestAddr on HTTPTunnelPort if set .../src/main/java/org/torproject/android/service/OrbotService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[orbot/master] update gradle tools
by n8fr8＠torproject.org 22 Dec '21

22 Dec '21

commit 78f0b76521655afc615026ac5171db04ec8f2f69 Author: n8fr8 <nathan(a)guardianproject.info> Date: Fri Jul 2 14:36:49 2021 -0400 update gradle tools --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 212e7ca6..3bcead6e 100644 --- a/build.gradle +++ b/build.gradle @@ -9,7 +9,7 @@ buildscript { maven { url 'https://jitpack.io' } } dependencies { - classpath 'com.android.tools.build:gradle:4.2.1' + classpath 'com.android.tools.build:gradle:4.2.2' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" } }

1 0

[orbot/master] Merge branch 'SkewedZeppelin-snowflakelimit'
by n8fr8＠torproject.org 22 Dec '21

22 Dec '21

commit d55ebce9ee7ecd23af307a3e49a2a07f8803a6b8 Merge: ef0e1c24 877556a9 Author: n8fr8 <nathan(a)guardianproject.info> Date: Fri Jul 2 14:29:59 2021 -0400 Merge branch 'SkewedZeppelin-snowflakelimit' .../java/org/torproject/android/service/OrbotService.java | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-)

1 0

[orbot/master] Merge branch 'master' of github.com:guardianproject/orbot
by n8fr8＠torproject.org 22 Dec '21

22 Dec '21

commit ef0e1c2466b4078c466cf2030b08630757271453 Merge: 65168659 ddb95c33 Author: n8fr8 <nathan(a)guardianproject.info> Date: Fri Jul 2 14:26:58 2021 -0400 Merge branch 'master' of github.com:guardianproject/orbot app/src/main/res/xml/preferences.xml | 2 +- .../src/main/java/org/torproject/android/service/OrbotService.java | 2 +- .../src/main/java/org/torproject/android/service/util/Prefs.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)

1 0