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

[orbot/master] Enable IsolateDestAddr on HTTPTunnelPort if set
by n8fr8＠torproject.org 22 Dec '21

22 Dec '21

commit 245eb345b0f3af3aaffbc743d56dc1b1b3f5cdea Author: Tad <tad(a)spotco.us> Date: Wed Jun 23 07:40:43 2021 -0400 Enable IsolateDestAddr on HTTPTunnelPort if set Closes https://github.com/guardianproject/orbot/issues/469 --- .../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 483e7120..4ef7b3d5 100644 --- a/orbotservice/src/main/java/org/torproject/android/service/OrbotService.java +++ b/orbotservice/src/main/java/org/torproject/android/service/OrbotService.java @@ -573,7 +573,7 @@ public class OrbotService extends VpnService implements TorServiceConstants, Orb extraLines.append("SocksListenAddress 0.0.0.0").append('\n'); - extraLines.append("HTTPTunnelPort ").append(httpPortPref).append('\n'); + extraLines.append("HTTPTunnelPort ").append(httpPortPref).append(isolate).append('\n'); if (prefs.getBoolean(OrbotConstants.PREF_CONNECTION_PADDING, false)) { extraLines.append("ConnectionPadding 1").append('\n');

1 0

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

22 Dec '21

commit 0636eacb695c89fd419be31294477a271a2bd9bf Merge: 589df2a9 fac3b206 Author: n8fr8 <nathan(a)guardianproject.info> Date: Thu Jun 17 17:19:40 2021 -0400 Merge branch 'weblate-weblate-guardianproject-orbot' app/src/main/res/values-de/strings.xml | 50 +++++-- app/src/main/res/values-fr-rFR/strings.xml | 2 +- app/src/main/res/values-in/strings.xml | 211 ++++++++++++++++------------- app/src/main/res/values-iw/strings.xml | 150 ++++++++++---------- app/src/main/res/values-ms-rMY/strings.xml | 151 +++++++++++---------- app/src/main/res/values-pt-rBR/strings.xml | 2 +- app/src/main/res/values-tr/strings.xml | 2 +- app/src/main/res/values-uk/strings.xml | 2 +- app/src/main/res/values-zh-rCN/strings.xml | 2 +- 9 files changed, 315 insertions(+), 257 deletions(-)

1 0

[orbot/master] only provide 1 snowlake proxy connection at a time
by n8fr8＠torproject.org 22 Dec '21

22 Dec '21

commit f313d83f9a6a7ffe0fad20a5fb94069e297d6a29 Author: n8fr8 <nathan(a)guardianproject.info> Date: Mon Jun 28 23:00:09 2021 -0400 only provide 1 snowlake proxy connection at a time --- .../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..c7d455f7 100644 --- a/orbotservice/src/main/java/org/torproject/android/service/OrbotService.java +++ b/orbotservice/src/main/java/org/torproject/android/service/OrbotService.java @@ -383,7 +383,7 @@ public class OrbotService extends VpnService implements TorServiceConstants, Orb This is to host a snowflake entrance node / bridge */ private void enableSnowflakeProxy () { - int capacity = 3; + int capacity = 1; String broker = "https://snowflake-broker.bamsoftware.com/"; String relay = "wss://snowflake.bamsoftware.com/"; String stun = "stun:stun.stunprotocol.org:3478";

1 0

[orbot/master] Fixup snowflake limit check
by n8fr8＠torproject.org 22 Dec '21

22 Dec '21

commit fe38aa2d5c27af367a24b8c5aeaf296ed03dcca6 Author: Tad <tad(a)spotco.us> Date: Tue Jun 29 15:04:44 2021 -0400 Fixup snowflake limit check --- .../main/java/org/torproject/android/service/OrbotService.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 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 9ebd506f..24567591 100644 --- a/orbotservice/src/main/java/org/torproject/android/service/OrbotService.java +++ b/orbotservice/src/main/java/org/torproject/android/service/OrbotService.java @@ -1558,10 +1558,13 @@ public class OrbotService extends VpnService implements TorServiceConstants, Orb else if (Prefs.beSnowflakeProxy()) { - if (Prefs.limitSnowflakeProxying() - && isChargingAndWifi(OrbotService.this)) + if (Prefs.limitSnowflakeProxying()) { - enableSnowflakeProxy(); + if (isChargingAndWifi(OrbotService.this)) + { + enableSnowflakeProxy(); + } + } else enableSnowflakeProxy();

1 0

[orbot/master] enable limit snowflake proxy mode to plugged in and unmetered connections
by n8fr8＠torproject.org 22 Dec '21

22 Dec '21

commit a398b44641b819468256e721351dc45794a77b74 Author: n8fr8 <nathan(a)guardianproject.info> Date: Mon Jun 28 22:58:11 2021 -0400 enable limit snowflake proxy mode to plugged in and unmetered connections --- app/src/main/AndroidManifest.xml | 2 ++ app/src/main/res/values/strings.xml | 5 ++++ app/src/main/res/xml/preferences.xml | 10 +++++--- .../torproject/android/service/OrbotService.java | 27 +++++++++++++++++++++- .../org/torproject/android/service/util/Prefs.java | 6 +++++ 5 files changed, 46 insertions(+), 4 deletions(-) diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 3bbaf610..2a98ad6f 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -16,6 +16,8 @@ <uses-permission android:name="android.permission.FOREGROUND_SERVICE" /> <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" /> <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" /> + <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" /> + <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" android:maxSdkVersion="18" /> diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 70efb465..94cfc800 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -265,4 +265,9 @@ <string name="bridge_snowflake">Connect through other Tor peers (experimental)</string> <string name="be_a_snowflake_title">Run Snowflake Proxy</string> <string name="be_a_snowflake_desc">Allow other Tor users to connect to Tor through your device</string> + + <string name="be_a_snowflake_title_limit">Snowflake Proxy Limits</string> + <string name="be_a_snowflake_desc_limit">Only when device is plugged in and on wifi</string> + + </resources> diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml index f273f318..ce5b1bbc 100644 --- a/app/src/main/res/xml/preferences.xml +++ b/app/src/main/res/xml/preferences.xml @@ -295,9 +295,13 @@ <CheckBoxPreference android:defaultValue="false" android:key="pref_be_a_snowflake" - android:summary="@string/be_a_snowflake_title" - android:title="@string/be_a_snowflake_desc" /> - + android:title="@string/be_a_snowflake_title" + android:summary="@string/be_a_snowflake_desc" /> + <CheckBoxPreference + android:defaultValue="false" + android:key="pref_be_a_snowflake_limit" + android:title="@string/be_a_snowflake_title_limit" + android:summary="@string/be_a_snowflake_desc_limit" /> </PreferenceCategory> </PreferenceScreen> 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 483e7120..9ebd506f 100644 --- a/orbotservice/src/main/java/org/torproject/android/service/OrbotService.java +++ b/orbotservice/src/main/java/org/torproject/android/service/OrbotService.java @@ -26,8 +26,10 @@ import android.content.ServiceConnection; import android.content.SharedPreferences; import android.content.pm.PackageManager; import android.database.Cursor; +import android.net.ConnectivityManager; import android.net.Uri; import android.net.VpnService; +import android.os.BatteryManager; import android.os.Build; import android.os.Handler; import android.os.HandlerThread; @@ -1554,7 +1556,16 @@ public class OrbotService extends VpnService implements TorServiceConstants, Orb startSnowflakeClient(); } else if (Prefs.beSnowflakeProxy()) - enableSnowflakeProxy(); + { + + if (Prefs.limitSnowflakeProxying() + && isChargingAndWifi(OrbotService.this)) + { + enableSnowflakeProxy(); + } + else + enableSnowflakeProxy(); + } startTor(); replyWithStatus(mIntent); @@ -1608,6 +1619,20 @@ public class OrbotService extends VpnService implements TorServiceConstants, Orb } } + public static boolean isChargingAndWifi(Context context) { + Intent intent = context.registerReceiver(null, new IntentFilter(Intent.ACTION_BATTERY_CHANGED)); + int plugged = intent.getIntExtra(BatteryManager.EXTRA_PLUGGED, -1); + boolean isCharging = plugged == BatteryManager.BATTERY_PLUGGED_AC || plugged == BatteryManager.BATTERY_PLUGGED_USB || plugged == BatteryManager.BATTERY_PLUGGED_WIRELESS; + + ConnectivityManager cm = (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE); + + boolean isUnmetered = cm.getActiveNetworkInfo() != null + && cm.getActiveNetworkInfo().isConnected() + && (!cm.isActiveNetworkMetered()); + + return isCharging && isUnmetered; + } + private class ActionBroadcastReceiver extends BroadcastReceiver { public void onReceive(Context context, Intent intent) { switch (intent.getAction()) { 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 5c36793d..5fa167c2 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 @@ -21,6 +21,8 @@ public class Prefs { private final static String PREF_USE_VPN = "pref_vpn"; private final static String PREF_EXIT_NODES = "pref_exit_nodes"; private final static String PREF_BE_A_SNOWFLAKE = "pref_be_a_snowflake"; + private final static String PREF_BE_A_SNOWFLAKE_LIMIT = "pref_be_a_snowflake_limit"; + private final static String PREF_HOST_ONION_SERVICES = "pref_host_onionservices"; @@ -80,6 +82,10 @@ public class Prefs { putBoolean(PREF_BE_A_SNOWFLAKE,beSnowflakeProxy); } + public static boolean limitSnowflakeProxying () { + return prefs.getBoolean(PREF_BE_A_SNOWFLAKE_LIMIT,false); + } + public static void setDefaultLocale(String value) { putString(PREF_DEFAULT_LOCALE, value); }

1 0

[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