- tor-commits - lists.torproject.org

[orbot/master] Build pdnsd as shared library
by n8fr8＠torproject.org 22 Dec '21

22 Dec '21

commit e07c31297642cf73973100177f312162bb76377c Author: syphyr <syphyr(a)gmail.com> Date: Thu Jun 24 20:32:24 2021 +0200 Build pdnsd as shared library The pdnsd executable must be in the form of libpdnsd.so, otherwise, it is not included in the apk files. --- orbotservice/src/main/jni/Android.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/orbotservice/src/main/jni/Android.mk b/orbotservice/src/main/jni/Android.mk index 10accb58..3d32a41b 100644 --- a/orbotservice/src/main/jni/Android.mk +++ b/orbotservice/src/main/jni/Android.mk @@ -30,7 +30,7 @@ LOCAL_SRC_FILES := $(PDNSD_SOURCES:$(LOCAL_PATH)/%=%) LOCAL_CFLAGS := -Wall -O2 -I$(LOCAL_PATH)/pdnsd -DHAVE_STPCPY -include $(BUILD_EXECUTABLE) +include $(BUILD_SHARED_LIBRARY) ######################################################## ## libancillary

1 0

[orbot/master] update grade and tor-android to 0.4.5.9
by n8fr8＠torproject.org 22 Dec '21

22 Dec '21

commit 7e3b3e5b1da0bb7c0b6f09232c58b670312bd339 Author: n8fr8 <nathan(a)guardianproject.info> Date: Mon Jun 28 22:37:24 2021 -0400 update grade and tor-android to 0.4.5.9 --- app/build.gradle | 2 +- appcore/build.gradle | 6 +++--- build.gradle | 2 +- orbotservice/build.gradle | 7 +++---- 4 files changed, 8 insertions(+), 9 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 1b5dc167..9528bbbe 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -127,7 +127,7 @@ repositories { dependencies { implementation project(':orbotservice') - implementation 'com.google.android.material:material:1.2.1' + implementation 'com.google.android.material:material:1.3.0' implementation 'pl.bclogic:pulsator4droid:1.0.3' implementation 'com.github.apl-devs:appintro:v4.2.2' implementation project(path: ':appcore') diff --git a/appcore/build.gradle b/appcore/build.gradle index 6c6e3bbf..ade6ddf3 100644 --- a/appcore/build.gradle +++ b/appcore/build.gradle @@ -30,10 +30,10 @@ android { dependencies { implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" - implementation 'androidx.core:core-ktx:1.3.2' - implementation 'androidx.appcompat:appcompat:1.2.0' + implementation 'androidx.core:core-ktx:1.5.0' + implementation 'androidx.appcompat:appcompat:1.3.0' implementation project(path: ':orbotservice') - testImplementation 'junit:junit:4.13.1' + testImplementation 'junit:junit:4.13.2' androidTestImplementation 'androidx.test.ext:junit:1.1.2' androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0' diff --git a/build.gradle b/build.gradle index 357a92ba..212e7ca6 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.0' + classpath 'com.android.tools.build:gradle:4.2.1' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" } } diff --git a/orbotservice/build.gradle b/orbotservice/build.gradle index d680cd09..022cb8b6 100644 --- a/orbotservice/build.gradle +++ b/orbotservice/build.gradle @@ -51,18 +51,17 @@ dependencies { implementation 'com.gitlab.guardianproject:jsocksandroid:1.0.4' implementation 'com.jaredrummler:android-shell:1.0.0' - //implementation fileTree(dir: 'libs', include: ['.so','.aar']) - implementation 'androidx.core:core:1.3.2' + implementation 'androidx.core:core:1.5.0' implementation 'androidx.localbroadcastmanager:localbroadcastmanager:1.0.0' - testImplementation 'junit:junit:4.13.1' + testImplementation 'junit:junit:4.13.2' implementation 'com.offbynull.portmapper:portmapper:2.0.5' implementation 'info.guardianproject:geoip:20191217' api 'info.guardianproject:jtorctl:0.4.5.7' - implementation 'info.guardianproject:tor-android:0.4.5.7' + implementation 'info.guardianproject:tor-android:0.4.5.9' implementation 'com.github.tladesignz:IPtProxy:1.0.0' }

1 0

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

22 Dec '21

commit 206e7ee246234fa7d17c4798284aa5841cf444d9 Author: n8fr8 <nathan(a)guardianproject.info> Date: Fri Jul 2 14:22:39 2021 -0400 update to 1651100100 --- app/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/build.gradle b/app/build.gradle index 9528bbbe..a456a18e 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -82,7 +82,7 @@ android { minSdkVersion 16 applicationId 'org.torproject.android' targetSdkVersion 29 - versionCode 1650200100 + versionCode 1651100100 versionName getVersionName() archivesBaseName = "Orbot-$versionName"

1 0

[orbot/master] Translated using Weblate (Finnish)
by n8fr8＠torproject.org 22 Dec '21

22 Dec '21

commit 9226ccbeffce240073d2e1eb97897a65a2e2033d Author: janne ojanperä <janne.ojanpera(a)iki.fi> Date: Fri Jul 2 20:13:21 2021 +0200 Translated using Weblate (Finnish) Currently translated at 65.6% (145 of 221 strings) Co-authored-by: janne ojanperä <janne.ojanpera(a)iki.fi> Translate-URL: https://hosted.weblate.org/projects/guardianproject/orbot/fi/ Translation: Guardian Project/Orbot --- app/src/main/res/values-fi/strings.xml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml index 90e1a25d..24b991f8 100644 --- a/app/src/main/res/values-fi/strings.xml +++ b/app/src/main/res/values-fi/strings.xml @@ -153,4 +153,6 @@ <string name="confirm">Vahvista</string> <string name="deny">Kiellä</string> <string name="allow">Salli</string> -</resources> + <string name="mebibyte">MiB</string> + <string name="kibibyte">KiB</string> +</resources> \ No newline at end of file

1 0

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

22 Dec '21

commit ddb95c33bd2bcf25cc008b9afc62e950e4312273 Merge: 7d526c2e 3498903f Author: Nathan Freitas <nathan(a)guardianproject.info> Date: Fri Jul 2 14:26:51 2021 -0400 Merge pull request #482 from SkewedZeppelin/snowflakelimitdefault Limit snowflake by default 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(-)

1 0

[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