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

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

23 Dec '20

commit 9be60c28b603cf9d5138307377aa6dc0e3985483 Merge: 47b7b805 626a341d Author: n8fr8 <nathan(a)guardianproject.info> Date: Mon Dec 14 13:46:53 2020 -0500 Merge branch 'master' of github.com:guardianproject/orbot .../torproject/android/service/OrbotService.java | 45 +++++++++++----------- 1 file changed, 22 insertions(+), 23 deletions(-) diff --cc orbotservice/src/main/java/org/torproject/android/service/OrbotService.java index 227f503e,10f4a686..6274b18b --- a/orbotservice/src/main/java/org/torproject/android/service/OrbotService.java +++ b/orbotservice/src/main/java/org/torproject/android/service/OrbotService.java @@@ -297,54 -297,35 +297,53 @@@ public class OrbotService extends VpnSe super.onDestroy(); } - private void stopTor() { - new Thread(this::stopTorAsync).start(); - } - private void stopTorAsync() { - Log.i("OrbotService", "stopTor"); + try { - sendCallbackStatus(STATUS_STOPPING); - sendCallbackLogMessage(getString(R.string.status_shutting_down)); + - if (useIPtObfsMeekProxy()) - IPtProxy.stopObfs4Proxy(); + new Thread(() ->{ + Log.i("OrbotService", "stopTor"); + try { + sendCallbackStatus(STATUS_STOPPING); + sendCallbackLogMessage(getString(R.string.status_shutting_down)); - if (useIPtSnowflakeProxy()) - IPtProxy.stopSnowflake(); - if (useIPtProxy()) - IPtProxy.stopObfs4Proxy(); ++ if (useIPtObfsMeekProxy()) ++ IPtProxy.stopObfs4Proxy(); + - stopTorDaemon(true); ++ if (useIPtSnowflakeProxy()) ++ IPtProxy.stopSnowflake(); + - //stop the foreground priority and make sure to remove the persistant notification - stopForeground(true); - sendCallbackLogMessage(getString(R.string.status_disabled)); - } catch (Exception e) { - logNotice("An error occured stopping Tor: " + e.getMessage()); - sendCallbackLogMessage(getString(R.string.something_bad_happened)); - } - clearNotifications(); - sendCallbackStatus(STATUS_OFF); + stopTorDaemon(true); + //stop the foreground priority and make sure to remove the persistant notification + stopForeground(true); + sendCallbackLogMessage(getString(R.string.status_disabled)); + } catch (Exception e) { + logNotice("An error occured stopping Tor: " + e.getMessage()); + sendCallbackLogMessage(getString(R.string.something_bad_happened)); + } + clearNotifications(); + sendCallbackStatus(STATUS_OFF); + }).start(); } - private static boolean useIPtProxy () + private static boolean useIPtObfsMeekProxy () + { + String bridgeList = Prefs.getBridgesList(); + return bridgeList.contains("obfs")||bridgeList.contains("meek"); + } + + private static boolean useIPtSnowflakeProxy () { String bridgeList = Prefs.getBridgesList(); - return bridgeList.contains("obfs3")|| bridgeList.contains("obfs4")||bridgeList.contains("meek"); + return bridgeList.contains("snowflake"); + } + + private void startSnowflakeProxy () { + //this is using the current, default Tor snowflake infrastructure + IPtProxy.startSnowflake( "stun:stun.l.google.com:19302", "https://snowflake-broker.azureedge.net/", + "ajax.aspnetcdn.com", null, true, false, true, 3); } /**

1 0

[orbot/master] stopTor just invokes stopTorAsync so i got rid of it
by n8fr8＠torproject.org 23 Dec '20

23 Dec '20

commit 626a341d088588d4090ccb90b03f4e3ac4e908a1 Author: bim <dsnake(a)protonmail.com> Date: Sun Dec 13 19:10:01 2020 -0500 stopTor just invokes stopTorAsync so i got rid of it --- .../torproject/android/service/OrbotService.java | 44 ++++++++++------------ 1 file changed, 20 insertions(+), 24 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 04f4f053..10f4a686 100644 --- a/orbotservice/src/main/java/org/torproject/android/service/OrbotService.java +++ b/orbotservice/src/main/java/org/torproject/android/service/OrbotService.java @@ -292,38 +292,34 @@ public class OrbotService extends VpnService implements TorServiceConstants, Orb //not registered yet } - stopTor(); + stopTorAsync(); super.onDestroy(); } - private void stopTor() { - new Thread(this::stopTorAsync).start(); - } - private void stopTorAsync() { - Log.i("OrbotService", "stopTor"); - try { - sendCallbackStatus(STATUS_STOPPING); - sendCallbackLogMessage(getString(R.string.status_shutting_down)); - - if (useIPtProxy()) - IPtProxy.stopObfs4Proxy(); - - stopTorDaemon(true); + new Thread(() ->{ + Log.i("OrbotService", "stopTor"); + try { + sendCallbackStatus(STATUS_STOPPING); + sendCallbackLogMessage(getString(R.string.status_shutting_down)); - //stop the foreground priority and make sure to remove the persistant notification - stopForeground(true); + if (useIPtProxy()) + IPtProxy.stopObfs4Proxy(); - sendCallbackLogMessage(getString(R.string.status_disabled)); - } catch (Exception e) { - logNotice("An error occured stopping Tor: " + e.getMessage()); - sendCallbackLogMessage(getString(R.string.something_bad_happened)); - } - clearNotifications(); - sendCallbackStatus(STATUS_OFF); + stopTorDaemon(true); + //stop the foreground priority and make sure to remove the persistant notification + stopForeground(true); + sendCallbackLogMessage(getString(R.string.status_disabled)); + } catch (Exception e) { + logNotice("An error occured stopping Tor: " + e.getMessage()); + sendCallbackLogMessage(getString(R.string.something_bad_happened)); + } + clearNotifications(); + sendCallbackStatus(STATUS_OFF); + }).start(); } private static boolean useIPtProxy () @@ -760,7 +756,7 @@ public class OrbotService extends VpnService implements TorServiceConstants, Orb } catch (Exception e) { logException("Unable to start Tor: " + e.toString(), e); - stopTor(); + stopTorAsync(); showToolbarNotification( getString(R.string.unable_to_start_tor) + ": " + e.getMessage(), ERROR_NOTIFY_ID, R.drawable.ic_stat_notifyerr);

1 0

[orbot/master] Merge remote-tracking branch 'upstream/master'
by n8fr8＠torproject.org 23 Dec '20

23 Dec '20

commit a11e73a95f7bf111d5e2e8b80ecf4e192d8f6629 Merge: 4a5aad92 eeb31422 Author: Benjamin Erhart <berhart(a)netzarchitekten.com> Date: Tue Dec 15 11:52:16 2020 +0100 Merge remote-tracking branch 'upstream/master' CHANGELOG | 23 +++++ INSTALL | 40 -------- IPtProxy/IPtProxy.aar | Bin 29425327 -> 0 bytes IPtProxy/build.gradle | 2 - LICENSE | 2 +- README => README.md | 0 TODO | 8 -- app-mini/src/main/res/values-ar/strings.xml | 2 - app-mini/src/main/res/values-ay/strings.xml | 2 - app-mini/src/main/res/values-az/strings.xml | 2 - app-mini/src/main/res/values-be/strings.xml | 2 - app-mini/src/main/res/values-bg/strings.xml | 2 - app-mini/src/main/res/values-ca/strings.xml | 2 - app-mini/src/main/res/values-cs-rCZ/strings.xml | 2 - app-mini/src/main/res/values-de/strings.xml | 2 - app-mini/src/main/res/values-el/strings.xml | 2 - app-mini/src/main/res/values-es-rAR/strings.xml | 2 - app-mini/src/main/res/values-es/strings.xml | 2 - app-mini/src/main/res/values-eu/strings.xml | 2 - app-mini/src/main/res/values-fa/strings.xml | 2 - app-mini/src/main/res/values-fi/strings.xml | 2 - app-mini/src/main/res/values-fr-rFR/strings.xml | 2 - app-mini/src/main/res/values-fr/strings.xml | 2 - app-mini/src/main/res/values-gl/strings.xml | 2 - app-mini/src/main/res/values-he/strings.xml | 2 - app-mini/src/main/res/values-hi/strings.xml | 2 - app-mini/src/main/res/values-hr/strings.xml | 2 - app-mini/src/main/res/values-hu/strings.xml | 2 - app-mini/src/main/res/values-id/strings.xml | 2 - app-mini/src/main/res/values-in-rID/strings.xml | 2 - app-mini/src/main/res/values-is/strings.xml | 2 - app-mini/src/main/res/values-it/strings.xml | 2 - app-mini/src/main/res/values-iw/strings.xml | 2 - app-mini/src/main/res/values-ja/strings.xml | 2 - app-mini/src/main/res/values-ko/strings.xml | 2 - app-mini/src/main/res/values-lv/strings.xml | 2 - app-mini/src/main/res/values-mk/strings.xml | 2 - app-mini/src/main/res/values-nb/strings.xml | 2 - app-mini/src/main/res/values-nl/strings.xml | 2 - app-mini/src/main/res/values-pl/strings.xml | 2 - app-mini/src/main/res/values-pt-rBR/strings.xml | 2 - app-mini/src/main/res/values-pt-rPT/strings.xml | 2 - app-mini/src/main/res/values-pt/strings.xml | 2 - app-mini/src/main/res/values-ro/strings.xml | 2 - app-mini/src/main/res/values-ru/strings.xml | 2 - app-mini/src/main/res/values-sk/strings.xml | 2 - app-mini/src/main/res/values-sr/strings.xml | 2 - app-mini/src/main/res/values-sv/strings.xml | 2 - app-mini/src/main/res/values-th/strings.xml | 2 - app-mini/src/main/res/values-tl/strings.xml | 2 - app-mini/src/main/res/values-tr/strings.xml | 2 - app-mini/src/main/res/values-uk/strings.xml | 2 - app-mini/src/main/res/values-vi/strings.xml | 2 - app-mini/src/main/res/values-zh-rCN/strings.xml | 2 - app-mini/src/main/res/values-zh-rTW/strings.xml | 2 - app-mini/src/main/res/values/strings.xml | 4 - app/build.gradle | 2 +- .../org/torproject/android/OrbotMainActivity.java | 16 ++-- .../ui/onboarding/BridgeWizardActivity.java | 11 +++ app/src/main/res/layout/content_bridge_wizard.xml | 7 ++ app/src/main/res/values-ar/strings.xml | 4 - app/src/main/res/values-ay/strings.xml | 4 - app/src/main/res/values-az/strings.xml | 4 - app/src/main/res/values-be/strings.xml | 4 - app/src/main/res/values-bg/strings.xml | 4 - app/src/main/res/values-ca/strings.xml | 4 - app/src/main/res/values-cs-rCZ/strings.xml | 4 - app/src/main/res/values-da/strings.xml | 2 - app/src/main/res/values-de/strings.xml | 4 - app/src/main/res/values-el/strings.xml | 4 - app/src/main/res/values-es-rAR/strings.xml | 4 - app/src/main/res/values-es/strings.xml | 4 - app/src/main/res/values-eu/strings.xml | 4 - app/src/main/res/values-fa/strings.xml | 4 - app/src/main/res/values-fi/strings.xml | 4 - app/src/main/res/values-fr-rFR/strings.xml | 4 - app/src/main/res/values-fr/strings.xml | 4 - app/src/main/res/values-gl/strings.xml | 4 - app/src/main/res/values-he/strings.xml | 4 - app/src/main/res/values-hi/strings.xml | 4 - app/src/main/res/values-hr/strings.xml | 4 - app/src/main/res/values-hu/strings.xml | 4 - app/src/main/res/values-id/strings.xml | 4 - app/src/main/res/values-in-rID/strings.xml | 4 - app/src/main/res/values-is/strings.xml | 4 - app/src/main/res/values-it/strings.xml | 4 - app/src/main/res/values-iw/strings.xml | 4 - app/src/main/res/values-ja/strings.xml | 4 - app/src/main/res/values-ko/strings.xml | 4 - app/src/main/res/values-lv/strings.xml | 4 - app/src/main/res/values-mk/strings.xml | 4 - app/src/main/res/values-my/strings.xml | 2 - app/src/main/res/values-nb/strings.xml | 4 - app/src/main/res/values-nl/strings.xml | 4 - app/src/main/res/values-pl/strings.xml | 4 - app/src/main/res/values-pt-rBR/strings.xml | 4 - app/src/main/res/values-pt-rPT/strings.xml | 4 - app/src/main/res/values-pt/strings.xml | 4 - app/src/main/res/values-ro/strings.xml | 4 - app/src/main/res/values-ru/strings.xml | 4 - app/src/main/res/values-si-rLK/strings.xml | 2 - app/src/main/res/values-sk/strings.xml | 4 - app/src/main/res/values-sr/strings.xml | 4 - app/src/main/res/values-sv/strings.xml | 4 - app/src/main/res/values-th/strings.xml | 4 - app/src/main/res/values-tl/strings.xml | 4 - app/src/main/res/values-tr/strings.xml | 4 - app/src/main/res/values-uk/strings.xml | 4 - app/src/main/res/values-vi/strings.xml | 4 - app/src/main/res/values-zh-rCN/strings.xml | 4 - app/src/main/res/values-zh-rTW/strings.xml | 4 - app/src/main/res/values/strings.xml | 12 +-- docs/GSoC.txt | 45 --------- docs/WALKTHROUGH | 85 ----------------- ic_launcher.svg => docs/ic_launcher.svg | 0 docs/onionroots.xcf | Bin 1748142 -> 0 bytes docs/orbotnewicons.xcf | Bin 1118257 -> 0 bytes orbotservice/build.gradle | 3 +- .../torproject/android/service/OrbotService.java | 102 ++++++++++++--------- orbotservice/src/main/res/raw-fa/bridges.txt | 1 + orbotservice/src/main/res/raw/bridges.txt | 1 + settings.gradle | 1 - 122 files changed, 119 insertions(+), 540 deletions(-)

1 0

[orbot/master] Merge branch 'dev_snowflake_new'
by n8fr8＠torproject.org 23 Dec '20

23 Dec '20

commit 47b7b8054f1c8ad8b607677f7a03112c1bd3b8af Merge: 823f4646 4a2e8b14 Author: n8fr8 <nathan(a)guardianproject.info> Date: Mon Dec 14 11:00:43 2020 -0500 Merge branch 'dev_snowflake_new' IPtProxy/IPtProxy.aar | Bin 29425327 -> 0 bytes IPtProxy/build.gradle | 2 - .../ui/onboarding/BridgeWizardActivity.java | 11 ++++ app/src/main/res/layout/content_bridge_wizard.xml | 7 +++ app/src/main/res/values/strings.xml | 1 + orbotservice/build.gradle | 3 +- .../torproject/android/service/OrbotService.java | 62 ++++++++++++++------- orbotservice/src/main/res/raw-fa/bridges.txt | 1 + orbotservice/src/main/res/raw/bridges.txt | 1 + settings.gradle | 1 - 10 files changed, 63 insertions(+), 26 deletions(-)

1 0

[orbot/master] fix "try" typo from merge
by n8fr8＠torproject.org 23 Dec '20

23 Dec '20

commit eeb31422723193a7b2e98f712529ef13ad35d194 Author: n8fr8 <nathan(a)guardianproject.info> Date: Mon Dec 14 13:51:54 2020 -0500 fix "try" typo from merge --- .../src/main/java/org/torproject/android/service/OrbotService.java | 1 - 1 file changed, 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 6274b18b..36dcb0ae 100644 --- a/orbotservice/src/main/java/org/torproject/android/service/OrbotService.java +++ b/orbotservice/src/main/java/org/torproject/android/service/OrbotService.java @@ -298,7 +298,6 @@ public class OrbotService extends VpnService implements TorServiceConstants, Orb } private void stopTorAsync() { - try { new Thread(() ->{ Log.i("OrbotService", "stopTor");

1 0

[orbot/master] Update to latest Android API 30. Update dependencies.
by n8fr8＠torproject.org 23 Dec '20

23 Dec '20

commit d0aa2e01e544871ee92fc8001f0468a3271daaf8 Author: Benjamin Erhart <berhart(a)netzarchitekten.com> Date: Tue Dec 15 12:08:49 2020 +0100 Update to latest Android API 30. Update dependencies. --- app-mini/build.gradle | 8 ++++---- app/build.gradle | 6 +++--- appcore/build.gradle | 10 +++++----- build.gradle | 2 +- intentintegrator/build.gradle | 6 +++--- orbotservice/build.gradle | 8 ++++---- 6 files changed, 20 insertions(+), 20 deletions(-) diff --git a/app-mini/build.gradle b/app-mini/build.gradle index 01b30f4f..dd1914d0 100644 --- a/app-mini/build.gradle +++ b/app-mini/build.gradle @@ -30,12 +30,12 @@ android { targetCompatibility JavaVersion.VERSION_1_8 } - compileSdkVersion 29 - buildToolsVersion '29.0.3' + compileSdkVersion 30 + buildToolsVersion '30.0.3' defaultConfig { applicationId "org.torproject.android.mini" minSdkVersion 16 - targetSdkVersion 29 + targetSdkVersion 30 } lintOptions { checkReleaseBuilds false @@ -109,7 +109,7 @@ dependencies { implementation project(':orbotservice') implementation 'com.github.apl-devs:appintro:v4.2.2' implementation 'androidx.palette:palette:1.0.0' - implementation 'androidx.constraintlayout:constraintlayout:1.1.3' + implementation 'androidx.constraintlayout:constraintlayout:2.0.4' implementation project(path: ':appcore') implementation 'androidx.recyclerview:recyclerview:1.1.0' implementation 'androidx.coordinatorlayout:coordinatorlayout:1.1.0' diff --git a/app/build.gradle b/app/build.gradle index 8902fcfa..867dcd6d 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -35,13 +35,13 @@ android { } } - compileSdkVersion 29 - buildToolsVersion '29.0.3' + compileSdkVersion 30 + buildToolsVersion '30.0.3' defaultConfig { applicationId "org.torproject.android" versionName getVersionName() minSdkVersion 16 - targetSdkVersion 29 + targetSdkVersion 30 } compileOptions { sourceCompatibility JavaVersion.VERSION_1_8 diff --git a/appcore/build.gradle b/appcore/build.gradle index 701ce2bf..035af370 100644 --- a/appcore/build.gradle +++ b/appcore/build.gradle @@ -3,12 +3,12 @@ apply plugin: 'kotlin-android' apply plugin: 'kotlin-android-extensions' android { - compileSdkVersion 29 - buildToolsVersion "29.0.3" + compileSdkVersion 30 + buildToolsVersion '30.0.3' defaultConfig { minSdkVersion 16 - targetSdkVersion 29 + targetSdkVersion 30 versionCode 1 versionName "1.0" @@ -31,10 +31,10 @@ android { dependencies { implementation fileTree(dir: "libs", include: ["*.jar"]) implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" - implementation 'androidx.core:core-ktx:1.3.1' + implementation 'androidx.core:core-ktx:1.3.2' implementation 'androidx.appcompat:appcompat:1.2.0' implementation project(path: ':orbotservice') - testImplementation 'junit:junit:4.12' + testImplementation 'junit:junit:4.13.1' 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 d99de80f..b4fa04ad 100644 --- a/build.gradle +++ b/build.gradle @@ -1,7 +1,7 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. buildscript { ext { - kotlin_version = '1.4.10' + kotlin_version = '1.4.21' } repositories { jcenter() diff --git a/intentintegrator/build.gradle b/intentintegrator/build.gradle index 81efeb31..f5822fc0 100644 --- a/intentintegrator/build.gradle +++ b/intentintegrator/build.gradle @@ -1,12 +1,12 @@ apply plugin: 'com.android.library' android { - compileSdkVersion 29 - buildToolsVersion "29.0.3" + compileSdkVersion 30 + buildToolsVersion "30.0.3" defaultConfig { minSdkVersion 16 - targetSdkVersion 29 + targetSdkVersion 30 versionCode 1 versionName "1.0" consumerProguardFiles "consumer-rules.pro" diff --git a/orbotservice/build.gradle b/orbotservice/build.gradle index c1b99e7b..877ac512 100644 --- a/orbotservice/build.gradle +++ b/orbotservice/build.gradle @@ -1,8 +1,8 @@ apply plugin: 'com.android.library' android { - compileSdkVersion 29 - buildToolsVersion '29.0.3' + compileSdkVersion 30 + buildToolsVersion '30.0.3' ndkVersion '21.3.6528147' sourceSets { @@ -13,7 +13,7 @@ android { defaultConfig { minSdkVersion 16 - targetSdkVersion 29 + targetSdkVersion 30 } compileOptions { sourceCompatibility JavaVersion.VERSION_1_8 @@ -54,7 +54,7 @@ dependencies { implementation 'androidx.core:core:1.3.2' implementation 'androidx.localbroadcastmanager:localbroadcastmanager:1.0.0' - testImplementation 'junit:junit:4.13' + testImplementation 'junit:junit:4.13.1' implementation 'com.offbynull.portmapper:portmapper:2.0.5'

1 0

[orbot/master] Issue #370: Improved MOAT implementation. Use Meek directly instead of via Tor with the newly available IPtProxy.
by n8fr8＠torproject.org 23 Dec '20

23 Dec '20

commit cb5f1c4ed4a5678bab9709eb41aaff9746b3c46a Author: Benjamin Erhart <berhart(a)netzarchitekten.com> Date: Tue Dec 15 14:00:23 2020 +0100 Issue #370: Improved MOAT implementation. Use Meek directly instead of via Tor with the newly available IPtProxy. Unfortunately couldn't fully test, as meek-azure seems broken for me. But this should do it. --- app/build.gradle | 2 +- .../android/ui/onboarding/MoatActivity.java | 57 ++++++---------------- 2 files changed, 16 insertions(+), 43 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 867dcd6d..d9d7d917 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -119,7 +119,7 @@ dependencies { implementation 'com.android.volley:volley:1.1.1' 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:goptbundle:1.0.0' + implementation 'com.github.tladesignz:IPtProxy:0.5.0' } // Map for the version code that gives each ABI a value. 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 329c8aff..619a371b 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 @@ -10,6 +10,7 @@ import android.content.IntentFilter; import android.graphics.BitmapFactory; import android.os.Bundle; import android.os.Handler; +import android.os.Looper; import android.text.TextUtils; import android.util.Base64; import android.util.Log; @@ -47,14 +48,9 @@ import org.torproject.android.service.TorServiceConstants; import org.torproject.android.service.util.Prefs; import org.torproject.android.ui.dialog.MoatErrorDialogFragment; -import java.util.ArrayList; -import java.util.Properties; +import java.io.File; -import goptbundle.Goptbundle; -import info.pluggabletransports.dispatch.DispatchConstants; -import info.pluggabletransports.dispatch.Dispatcher; -import info.pluggabletransports.dispatch.Transport; -import info.pluggabletransports.dispatch.transports.legacy.MeekTransport; +import IPtProxy.IPtProxy; /** * Implements the MOAT protocol: Fetches OBFS4 bridges via Meek Azure. @@ -68,7 +64,7 @@ import info.pluggabletransports.dispatch.transports.legacy.MeekTransport; */ public class MoatActivity extends AppCompatActivity implements View.OnClickListener, TextView.OnEditorActionListener { - private static String moatBaseUrl = "https://bridges.torproject.org/moat"; + private static final String moatBaseUrl = "https://bridges.torproject.org/moat"; private ImageView mIvCaptcha; private ProgressBar mProgressBar; @@ -87,7 +83,7 @@ public class MoatActivity extends AppCompatActivity implements View.OnClickListe private boolean mRequestInProgress = true; - private BroadcastReceiver mBroadcastReceiver = new BroadcastReceiver() { + private final BroadcastReceiver mBroadcastReceiver = new BroadcastReceiver() { @Override public void onReceive(Context context, Intent intent) { String host = intent.getStringExtra(OrbotService.EXTRA_SOCKS_PROXY_HOST); @@ -179,48 +175,25 @@ public class MoatActivity extends AppCompatActivity implements View.OnClickListe protected void onResume() { super.onResume(); - new MeekTransport().register(); - - Properties options = new Properties(); - options.put(MeekTransport.OPTION_URL, "https://onion.azureedge.net/"); - options.put(MeekTransport.OPTION_FRONT, "ajax.aspnetcdn.com"); - - Transport transport = Dispatcher.get().getTransport(this, DispatchConstants.PT_TRANSPORTS_MEEK, options); - - if (transport != null) { - new Thread(() -> { - Goptbundle.setenv(DispatchConstants.TOR_PT_LOG_LEVEL, "DEBUG"); - Goptbundle.setenv(DispatchConstants.TOR_PT_CLIENT_TRANSPORTS, DispatchConstants.PT_TRANSPORTS_MEEK); - Goptbundle.setenv(DispatchConstants.TOR_PT_MANAGED_TRANSPORT_VER, "1"); - Goptbundle.setenv(DispatchConstants.TOR_PT_EXIT_ON_STDIN_CLOSE, "0"); - Goptbundle.load(getDir("pt-state", Context.MODE_PRIVATE).getAbsolutePath()); - }).start(); - - ArrayList<String> args = new ArrayList<>(); - - for (Object key : options.keySet()) { - String k = (String) key; + File fileCacheDir = new File(getCacheDir(),"pt"); + if (!fileCacheDir.exists()) { + //noinspection ResultOfMethodCallIgnored + fileCacheDir.mkdir(); + } - args.add(String.format("%s=%s", k, options.getProperty(k))); - } + IPtProxy.setStateLocation(fileCacheDir.getAbsolutePath()); - StringBuilder sb = new StringBuilder(); + IPtProxy.startObfs4Proxy("DEBUG", false, false); - for (String arg : args) { - sb.append(arg).append(";"); - } + ProxiedHurlStack phs = new ProxiedHurlStack("127.0.0.1", (int) IPtProxy.MeekSocksPort, + "url=https://meek.azureedge.net/;front=ajax.aspnetcdn.com", "\0"); - ProxiedHurlStack phs = new ProxiedHurlStack("127.0.0.1", 47352, - sb.toString(), "\0"); - - mQueue = Volley.newRequestQueue(MoatActivity.this, phs); + mQueue = Volley.newRequestQueue(MoatActivity.this, phs); if (mCaptcha == null) { new Handler().postDelayed(this::fetchCaptcha, 1000); } } - -// sendIntentToService(TorServiceConstants.ACTION_STATUS); } @Override

1 0

[orbot/master] Update to latest IPtProxy, which fixes cert issues with the meek-azure bridge.
by n8fr8＠torproject.org 23 Dec '20

23 Dec '20

commit 16010aa0ed203599a558c6410b766e5c80651d9a Author: Benjamin Erhart <berhart(a)netzarchitekten.com> Date: Fri Dec 18 13:19:13 2020 +0100 Update to latest IPtProxy, which fixes cert issues with the meek-azure bridge. --- app/build.gradle | 2 +- orbotservice/build.gradle | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index d9d7d917..d0602012 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -119,7 +119,7 @@ dependencies { implementation 'com.android.volley:volley:1.1.1' implementation 'info.pluggabletransports.aptds:apt-dispatch-library:1.0.9' implementation 'info.pluggabletransports.aptds:apt-meek-obfs4-legacy:1.0.9' - implementation 'com.github.tladesignz:IPtProxy:0.5.0' + implementation 'com.github.tladesignz:IPtProxy:0.5.2' } // Map for the version code that gives each ABI a value. diff --git a/orbotservice/build.gradle b/orbotservice/build.gradle index 877ac512..3a3e1adc 100644 --- a/orbotservice/build.gradle +++ b/orbotservice/build.gradle @@ -60,5 +60,5 @@ dependencies { implementation 'info.guardianproject:jtorctl:0.4' - implementation 'com.github.tladesignz:IPtProxy:0.5.0' + implementation 'com.github.tladesignz:IPtProxy:0.5.2' }

1 0

[orbot/master] Fixed compiler warnings.
by n8fr8＠torproject.org 23 Dec '20

23 Dec '20

commit f000d58b146c12d6d3d04bacf9842aa7732b4d0f Author: Benjamin Erhart <berhart(a)netzarchitekten.com> Date: Tue Dec 15 14:00:44 2020 +0100 Fixed compiler warnings. --- .../android/ui/onboarding/MoatActivity.java | 24 +++++++++++----------- 1 file changed, 12 insertions(+), 12 deletions(-) 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 619a371b..f1bce82a 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 @@ -190,9 +190,8 @@ public class MoatActivity extends AppCompatActivity implements View.OnClickListe mQueue = Volley.newRequestQueue(MoatActivity.this, phs); - if (mCaptcha == null) { - new Handler().postDelayed(this::fetchCaptcha, 1000); - } + if (mCaptcha == null) { + new Handler(Looper.getMainLooper()).postDelayed(this::fetchCaptcha, 1000); } } @@ -205,15 +204,16 @@ public class MoatActivity extends AppCompatActivity implements View.OnClickListe @Override public boolean onOptionsItemSelected(MenuItem item) { - switch (item.getItemId()) { - case R.id.menu_refresh: - mEtSolution.setText(""); - fetchCaptcha(); - return true; - - case android.R.id.home: - finish(); - return true; + int id = item.getItemId(); + + if (id == R.id.menu_refresh) { + mEtSolution.setText(""); + fetchCaptcha(); + return true; + } + else if (id == android.R.id.home) { + finish(); + return true; } return super.onOptionsItemSelected(item);

1 0

[orbot/master] Fixed meek server URL to reach MOAT service.
by n8fr8＠torproject.org 23 Dec '20

23 Dec '20

commit e7f0feb6e7ee6b224c56abe843b62a7778dde690 Author: Benjamin Erhart <berhart(a)netzarchitekten.com> Date: Fri Dec 18 15:14:56 2020 +0100 Fixed meek server URL to reach MOAT service. --- .../main/java/org/torproject/android/ui/onboarding/MoatActivity.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 f1bce82a..7431965d 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 @@ -186,7 +186,7 @@ public class MoatActivity extends AppCompatActivity implements View.OnClickListe IPtProxy.startObfs4Proxy("DEBUG", false, false); ProxiedHurlStack phs = new ProxiedHurlStack("127.0.0.1", (int) IPtProxy.MeekSocksPort, - "url=https://meek.azureedge.net/;front=ajax.aspnetcdn.com", "\0"); + "url=https://onion.azureedge.net/;front=ajax.aspnetcdn.com", "\0"); mQueue = Volley.newRequestQueue(MoatActivity.this, phs); @@ -371,6 +371,7 @@ public class MoatActivity extends AppCompatActivity implements View.OnClickListe mProgressBar.setVisibility(View.GONE); Log.d(MoatActivity.class.getSimpleName(), "Error response."); + error.printStackTrace(); displayError(error, null); }

1 0