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

[orbot/master] buildToolsVersion '29.0.0' has been released
by n8fr8＠torproject.org 28 Apr '20

28 Apr '20

commit 516eb8a7eb49522b5bc40e0cffa22335d28dfea7 Author: Hans-Christoph Steiner <hans(a)eds.org> Date: Mon Oct 7 17:51:11 2019 +0200 buildToolsVersion '29.0.0' has been released --- app-mini/build.gradle | 2 +- app/build.gradle | 2 +- orbotservice/build.gradle | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app-mini/build.gradle b/app-mini/build.gradle index 58f8a714..e48340e8 100644 --- a/app-mini/build.gradle +++ b/app-mini/build.gradle @@ -25,7 +25,7 @@ android { } compileSdkVersion 29 - buildToolsVersion '29.0.0 rc2' + buildToolsVersion '29.0.0' defaultConfig { applicationId "org.torproject.android.mini" minSdkVersion 16 diff --git a/app/build.gradle b/app/build.gradle index 4d606125..3c6e1b6c 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -25,7 +25,7 @@ android { } compileSdkVersion 29 - buildToolsVersion '29.0.0 rc2' + buildToolsVersion '29.0.0' defaultConfig { applicationId "org.torproject.android" minSdkVersion 16 diff --git a/orbotservice/build.gradle b/orbotservice/build.gradle index cbf7e5a7..6e1dda4e 100644 --- a/orbotservice/build.gradle +++ b/orbotservice/build.gradle @@ -2,7 +2,7 @@ apply plugin: 'com.android.library' android { compileSdkVersion 29 - buildToolsVersion '29.0.0 rc2' + buildToolsVersion '29.0.0' sourceSets { main {

1 0

[orbot/master] add appmax flavor builds
by n8fr8＠torproject.org 28 Apr '20

28 Apr '20

commit faef65ee6e1cb0969ed7adb0cbbb21b7947ebd19 Author: n8fr8 <nathan(a)guardianproject.info> Date: Tue Oct 29 09:37:04 2019 -0400 add appmax flavor builds --- app/src/appmax/ic_launcher-web.png | Bin 0 -> 26340 bytes app/src/appmax/res/mipmap-anydpi-v26/ic_launcher.xml | 5 +++++ .../appmax/res/mipmap-anydpi-v26/ic_launcher_round.xml | 5 +++++ app/src/appmax/res/mipmap-hdpi/ic_launcher.png | Bin 0 -> 2858 bytes .../appmax/res/mipmap-hdpi/ic_launcher_foreground.png | Bin 0 -> 2629 bytes app/src/appmax/res/mipmap-hdpi/ic_launcher_round.png | Bin 0 -> 5049 bytes app/src/appmax/res/mipmap-mdpi/ic_launcher.png | Bin 0 -> 1713 bytes .../appmax/res/mipmap-mdpi/ic_launcher_foreground.png | Bin 0 -> 1663 bytes app/src/appmax/res/mipmap-mdpi/ic_launcher_round.png | Bin 0 -> 2928 bytes app/src/appmax/res/mipmap-xhdpi/ic_launcher.png | Bin 0 -> 3827 bytes .../appmax/res/mipmap-xhdpi/ic_launcher_foreground.png | Bin 0 -> 3594 bytes app/src/appmax/res/mipmap-xhdpi/ic_launcher_round.png | Bin 0 -> 6995 bytes app/src/appmax/res/mipmap-xxhdpi/ic_launcher.png | Bin 0 -> 5759 bytes .../appmax/res/mipmap-xxhdpi/ic_launcher_foreground.png | Bin 0 -> 5804 bytes app/src/appmax/res/mipmap-xxhdpi/ic_launcher_round.png | Bin 0 -> 10664 bytes app/src/appmax/res/mipmap-xxxhdpi/ic_launcher.png | Bin 0 -> 7711 bytes .../res/mipmap-xxxhdpi/ic_launcher_foreground.png | Bin 0 -> 8206 bytes app/src/appmax/res/mipmap-xxxhdpi/ic_launcher_round.png | Bin 0 -> 14870 bytes app/src/appmax/res/values/ic_launcher_background.xml | 4 ++++ 19 files changed, 14 insertions(+) diff --git a/app/src/appmax/ic_launcher-web.png b/app/src/appmax/ic_launcher-web.png new file mode 100644 index 00000000..64e54bb0 Binary files /dev/null and b/app/src/appmax/ic_launcher-web.png differ diff --git a/app/src/appmax/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/appmax/res/mipmap-anydpi-v26/ic_launcher.xml new file mode 100644 index 00000000..036d09bc --- /dev/null +++ b/app/src/appmax/res/mipmap-anydpi-v26/ic_launcher.xml @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="utf-8"?> +<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android"> + <background android:drawable="@color/ic_launcher_background"/> + <foreground android:drawable="@mipmap/ic_launcher_foreground"/> +</adaptive-icon> \ No newline at end of file diff --git a/app/src/appmax/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/appmax/res/mipmap-anydpi-v26/ic_launcher_round.xml new file mode 100644 index 00000000..036d09bc --- /dev/null +++ b/app/src/appmax/res/mipmap-anydpi-v26/ic_launcher_round.xml @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="utf-8"?> +<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android"> + <background android:drawable="@color/ic_launcher_background"/> + <foreground android:drawable="@mipmap/ic_launcher_foreground"/> +</adaptive-icon> \ No newline at end of file diff --git a/app/src/appmax/res/mipmap-hdpi/ic_launcher.png b/app/src/appmax/res/mipmap-hdpi/ic_launcher.png new file mode 100644 index 00000000..dbd6e745 Binary files /dev/null and b/app/src/appmax/res/mipmap-hdpi/ic_launcher.png differ diff --git a/app/src/appmax/res/mipmap-hdpi/ic_launcher_foreground.png b/app/src/appmax/res/mipmap-hdpi/ic_launcher_foreground.png new file mode 100644 index 00000000..dc0c1811 Binary files /dev/null and b/app/src/appmax/res/mipmap-hdpi/ic_launcher_foreground.png differ diff --git a/app/src/appmax/res/mipmap-hdpi/ic_launcher_round.png b/app/src/appmax/res/mipmap-hdpi/ic_launcher_round.png new file mode 100644 index 00000000..52607429 Binary files /dev/null and b/app/src/appmax/res/mipmap-hdpi/ic_launcher_round.png differ diff --git a/app/src/appmax/res/mipmap-mdpi/ic_launcher.png b/app/src/appmax/res/mipmap-mdpi/ic_launcher.png new file mode 100644 index 00000000..cf639a2c Binary files /dev/null and b/app/src/appmax/res/mipmap-mdpi/ic_launcher.png differ diff --git a/app/src/appmax/res/mipmap-mdpi/ic_launcher_foreground.png b/app/src/appmax/res/mipmap-mdpi/ic_launcher_foreground.png new file mode 100644 index 00000000..9038937b Binary files /dev/null and b/app/src/appmax/res/mipmap-mdpi/ic_launcher_foreground.png differ diff --git a/app/src/appmax/res/mipmap-mdpi/ic_launcher_round.png b/app/src/appmax/res/mipmap-mdpi/ic_launcher_round.png new file mode 100644 index 00000000..fe7f8737 Binary files /dev/null and b/app/src/appmax/res/mipmap-mdpi/ic_launcher_round.png differ diff --git a/app/src/appmax/res/mipmap-xhdpi/ic_launcher.png b/app/src/appmax/res/mipmap-xhdpi/ic_launcher.png new file mode 100644 index 00000000..cb327015 Binary files /dev/null and b/app/src/appmax/res/mipmap-xhdpi/ic_launcher.png differ diff --git a/app/src/appmax/res/mipmap-xhdpi/ic_launcher_foreground.png b/app/src/appmax/res/mipmap-xhdpi/ic_launcher_foreground.png new file mode 100644 index 00000000..c93ae0ce Binary files /dev/null and b/app/src/appmax/res/mipmap-xhdpi/ic_launcher_foreground.png differ diff --git a/app/src/appmax/res/mipmap-xhdpi/ic_launcher_round.png b/app/src/appmax/res/mipmap-xhdpi/ic_launcher_round.png new file mode 100644 index 00000000..96148faf Binary files /dev/null and b/app/src/appmax/res/mipmap-xhdpi/ic_launcher_round.png differ diff --git a/app/src/appmax/res/mipmap-xxhdpi/ic_launcher.png b/app/src/appmax/res/mipmap-xxhdpi/ic_launcher.png new file mode 100644 index 00000000..8474d14f Binary files /dev/null and b/app/src/appmax/res/mipmap-xxhdpi/ic_launcher.png differ diff --git a/app/src/appmax/res/mipmap-xxhdpi/ic_launcher_foreground.png b/app/src/appmax/res/mipmap-xxhdpi/ic_launcher_foreground.png new file mode 100644 index 00000000..bf41594e Binary files /dev/null and b/app/src/appmax/res/mipmap-xxhdpi/ic_launcher_foreground.png differ diff --git a/app/src/appmax/res/mipmap-xxhdpi/ic_launcher_round.png b/app/src/appmax/res/mipmap-xxhdpi/ic_launcher_round.png new file mode 100644 index 00000000..0579eabc Binary files /dev/null and b/app/src/appmax/res/mipmap-xxhdpi/ic_launcher_round.png differ diff --git a/app/src/appmax/res/mipmap-xxxhdpi/ic_launcher.png b/app/src/appmax/res/mipmap-xxxhdpi/ic_launcher.png new file mode 100644 index 00000000..1795e37d Binary files /dev/null and b/app/src/appmax/res/mipmap-xxxhdpi/ic_launcher.png differ diff --git a/app/src/appmax/res/mipmap-xxxhdpi/ic_launcher_foreground.png b/app/src/appmax/res/mipmap-xxxhdpi/ic_launcher_foreground.png new file mode 100644 index 00000000..5a4c77bc Binary files /dev/null and b/app/src/appmax/res/mipmap-xxxhdpi/ic_launcher_foreground.png differ diff --git a/app/src/appmax/res/mipmap-xxxhdpi/ic_launcher_round.png b/app/src/appmax/res/mipmap-xxxhdpi/ic_launcher_round.png new file mode 100644 index 00000000..7e2084c6 Binary files /dev/null and b/app/src/appmax/res/mipmap-xxxhdpi/ic_launcher_round.png differ diff --git a/app/src/appmax/res/values/ic_launcher_background.xml b/app/src/appmax/res/values/ic_launcher_background.xml new file mode 100644 index 00000000..225a1525 --- /dev/null +++ b/app/src/appmax/res/values/ic_launcher_background.xml @@ -0,0 +1,4 @@ +<?xml version="1.0" encoding="utf-8"?> +<resources> + <color name="ic_launcher_background">#EAA9E5</color> +</resources> \ No newline at end of file

1 0

[orbot/master] Merge pull request #270 from SkewedZeppelin/master
by n8fr8＠torproject.org 28 Apr '20

28 Apr '20

commit dbf13dcc5942436b7e3124761091219ce25dc84a Merge: 2055823e e71c225e Author: Nathan Freitas <nathan(a)guardianproject.info> Date: Tue Oct 29 09:27:30 2019 -0400 Merge pull request #270 from SkewedZeppelin/master Expose *CircuitPadding app-mini/src/main/res/values/strings.xml | 4 ++++ app-mini/src/main/res/xml/preferences.xml | 14 +++++++++++++- app/src/main/res/values/strings.xml | 4 ++++ app/src/main/res/xml/preferences.xml | 14 +++++++++++++- .../org/torproject/android/service/OrbotConstants.java | 2 ++ .../java/org/torproject/android/service/TorService.java | 12 ++++++++++++ 6 files changed, 48 insertions(+), 2 deletions(-)

1 0

[orbot/master] move getSharedPrefs() from TorServiceUtils to Prefs
by n8fr8＠torproject.org 28 Apr '20

28 Apr '20

commit 22bf175cc027f40a2a66d6532a7b483e2263e03e Author: Hans-Christoph Steiner <hans(a)eds.org> Date: Mon Oct 7 17:18:09 2019 +0200 move getSharedPrefs() from TorServiceUtils to Prefs --- .../java/org/torproject/android/mini/MiniMainActivity.java | 3 +-- .../org/torproject/android/mini/ui/AppConfigActivity.java | 4 ++-- .../org/torproject/android/mini/ui/AppManagerActivity.java | 4 ++-- .../java/org/torproject/android/OrbotMainActivity.java | 3 +-- .../java/org/torproject/android/ui/AppManagerActivity.java | 4 ++-- .../java/org/torproject/android/service/TorService.java | 14 +++++++------- .../java/org/torproject/android/service/util/Prefs.java | 7 ++++++- .../torproject/android/service/util/TorServiceUtils.java | 4 ---- 8 files changed, 21 insertions(+), 22 deletions(-) diff --git a/app-mini/src/main/java/org/torproject/android/mini/MiniMainActivity.java b/app-mini/src/main/java/org/torproject/android/mini/MiniMainActivity.java index 6710778d..e8612ed5 100644 --- a/app-mini/src/main/java/org/torproject/android/mini/MiniMainActivity.java +++ b/app-mini/src/main/java/org/torproject/android/mini/MiniMainActivity.java @@ -61,7 +61,6 @@ import org.torproject.android.service.OrbotConstants; import org.torproject.android.service.TorService; import org.torproject.android.service.TorServiceConstants; import org.torproject.android.service.util.Prefs; -import org.torproject.android.service.util.TorServiceUtils; import org.torproject.android.service.vpn.TorifiedApp; import org.torproject.android.service.vpn.VpnConstants; import org.torproject.android.service.vpn.VpnPrefs; @@ -124,7 +123,7 @@ public class MiniMainActivity extends AppCompatActivity public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - mPrefs = TorServiceUtils.getSharedPrefs(getApplicationContext()); + mPrefs = Prefs.getSharedPrefs(getApplicationContext()); /* Create the widgets before registering for broadcasts to guarantee * that the widgets exist when the status updates try to update them */ diff --git a/app-mini/src/main/java/org/torproject/android/mini/ui/AppConfigActivity.java b/app-mini/src/main/java/org/torproject/android/mini/ui/AppConfigActivity.java index a8488e3d..a731ef29 100644 --- a/app-mini/src/main/java/org/torproject/android/mini/ui/AppConfigActivity.java +++ b/app-mini/src/main/java/org/torproject/android/mini/ui/AppConfigActivity.java @@ -13,7 +13,7 @@ import android.widget.CompoundButton; import android.widget.Switch; import org.torproject.android.mini.R; import org.torproject.android.service.OrbotConstants; -import org.torproject.android.service.util.TorServiceUtils; +import org.torproject.android.service.util.Prefs; import org.torproject.android.service.vpn.TorifiedApp; import static org.torproject.android.mini.MiniMainActivity.getApp; @@ -40,7 +40,7 @@ public class AppConfigActivity extends AppCompatActivity { final String pkgId = getIntent().getStringExtra(Intent.EXTRA_PACKAGE_NAME); - mPrefs = TorServiceUtils.getSharedPrefs(getApplicationContext()); + mPrefs = Prefs.getSharedPrefs(getApplicationContext()); ApplicationInfo aInfo = null; try { diff --git a/app-mini/src/main/java/org/torproject/android/mini/ui/AppManagerActivity.java b/app-mini/src/main/java/org/torproject/android/mini/ui/AppManagerActivity.java index 27425bce..489aba4c 100644 --- a/app-mini/src/main/java/org/torproject/android/mini/ui/AppManagerActivity.java +++ b/app-mini/src/main/java/org/torproject/android/mini/ui/AppManagerActivity.java @@ -28,7 +28,7 @@ import android.widget.ProgressBar; import android.widget.TextView; import org.torproject.android.mini.R; import org.torproject.android.service.OrbotConstants; -import org.torproject.android.service.util.TorServiceUtils; +import org.torproject.android.service.util.Prefs; import org.torproject.android.service.vpn.TorifiedApp; import java.util.ArrayList; @@ -63,7 +63,7 @@ public class AppManagerActivity extends AppCompatActivity implements OnClickList @Override protected void onResume() { super.onResume(); - mPrefs = TorServiceUtils.getSharedPrefs(getApplicationContext()); + mPrefs = Prefs.getSharedPrefs(getApplicationContext()); reloadApps(); } diff --git a/app/src/main/java/org/torproject/android/OrbotMainActivity.java b/app/src/main/java/org/torproject/android/OrbotMainActivity.java index 82a0cef9..947f3a76 100644 --- a/app/src/main/java/org/torproject/android/OrbotMainActivity.java +++ b/app/src/main/java/org/torproject/android/OrbotMainActivity.java @@ -57,7 +57,6 @@ import org.torproject.android.service.OrbotConstants; import org.torproject.android.service.TorService; import org.torproject.android.service.TorServiceConstants; import org.torproject.android.service.util.Prefs; -import org.torproject.android.service.util.TorServiceUtils; import org.torproject.android.service.vpn.VpnConstants; import org.torproject.android.service.vpn.VpnPrefs; import org.torproject.android.settings.Languages; @@ -167,7 +166,7 @@ public class OrbotMainActivity extends AppCompatActivity public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - mPrefs = TorServiceUtils.getSharedPrefs(getApplicationContext()); + mPrefs = Prefs.getSharedPrefs(getApplicationContext()); migratePreferences(); // Migrate old preferences diff --git a/app/src/main/java/org/torproject/android/ui/AppManagerActivity.java b/app/src/main/java/org/torproject/android/ui/AppManagerActivity.java index d5ea6f8e..111dda5f 100644 --- a/app/src/main/java/org/torproject/android/ui/AppManagerActivity.java +++ b/app/src/main/java/org/torproject/android/ui/AppManagerActivity.java @@ -29,7 +29,7 @@ import android.widget.ProgressBar; import android.widget.TextView; import org.torproject.android.R; import org.torproject.android.service.OrbotConstants; -import org.torproject.android.service.util.TorServiceUtils; +import org.torproject.android.service.util.Prefs; import org.torproject.android.service.vpn.TorifiedApp; import java.util.ArrayList; @@ -65,7 +65,7 @@ public class AppManagerActivity extends AppCompatActivity implements OnClickList @Override protected void onResume() { super.onResume(); - mPrefs = TorServiceUtils.getSharedPrefs(getApplicationContext()); + mPrefs = Prefs.getSharedPrefs(getApplicationContext()); reloadApps(); } diff --git a/orbotservice/src/main/java/org/torproject/android/service/TorService.java b/orbotservice/src/main/java/org/torproject/android/service/TorService.java index 96dedfd8..f8137632 100644 --- a/orbotservice/src/main/java/org/torproject/android/service/TorService.java +++ b/orbotservice/src/main/java/org/torproject/android/service/TorService.java @@ -610,7 +610,7 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon private boolean torUpgradeAndConfig() throws IOException, TimeoutException { - SharedPreferences prefs = TorServiceUtils.getSharedPrefs(getApplicationContext()); + SharedPreferences prefs = Prefs.getSharedPrefs(getApplicationContext()); String version = prefs.getString(PREF_BINARY_TOR_VERSION_INSTALLED,null); logNotice("checking binary version: " + version); @@ -638,7 +638,7 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon private File updateTorrcCustomFile () throws IOException, TimeoutException { - SharedPreferences prefs = TorServiceUtils.getSharedPrefs(getApplicationContext()); + SharedPreferences prefs = Prefs.getSharedPrefs(getApplicationContext()); StringBuffer extraLines = new StringBuffer(); @@ -838,7 +838,7 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon // make sure there are no stray daemons running killAllDaemons(); - SharedPreferences prefs = TorServiceUtils.getSharedPrefs(getApplicationContext()); + SharedPreferences prefs = Prefs.getSharedPrefs(getApplicationContext()); String version = prefs.getString(PREF_BINARY_TOR_VERSION_INSTALLED,null); logNotice("checking binary version: " + version); @@ -1152,7 +1152,7 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon bufferedReader.close(); //store last valid control port - SharedPreferences prefs = TorServiceUtils.getSharedPrefs(getApplicationContext()); + SharedPreferences prefs = Prefs.getSharedPrefs(getApplicationContext()); prefs.edit().putInt("controlport", result).commit(); } @@ -1471,7 +1471,7 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon if (mCurrentStatus == STATUS_OFF) return; - SharedPreferences prefs = TorServiceUtils.getSharedPrefs(getApplicationContext()); + SharedPreferences prefs = Prefs.getSharedPrefs(getApplicationContext()); boolean doNetworKSleep = prefs.getBoolean(OrbotConstants.PREF_DISABLE_NETWORK, true); @@ -1530,7 +1530,7 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon { logNotice(getString(R.string.updating_settings_in_tor_service)); - SharedPreferences prefs = TorServiceUtils.getSharedPrefs(getApplicationContext()); + SharedPreferences prefs = Prefs.getSharedPrefs(getApplicationContext()); boolean useBridges = Prefs.bridgesEnabled(); @@ -1897,7 +1897,7 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon private void setExitNode (String newExits) { - SharedPreferences prefs = TorServiceUtils.getSharedPrefs(getApplicationContext()); + SharedPreferences prefs = Prefs.getSharedPrefs(getApplicationContext()); if (TextUtils.isEmpty(newExits)) { 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 7b5f132b..9b6ab825 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 @@ -3,6 +3,7 @@ package org.torproject.android.service.util; import android.content.Context; import android.content.SharedPreferences; +import org.torproject.android.service.OrbotConstants; import java.util.Locale; @@ -24,7 +25,7 @@ public class Prefs { public static void setContext(Context context) { if (prefs == null) - prefs = TorServiceUtils.getSharedPrefs(context); + prefs = getSharedPrefs(context); } private static void putBoolean(String key, boolean value) { @@ -109,4 +110,8 @@ public class Prefs { { putString(PREF_EXIT_NODES,exits); } + + public static SharedPreferences getSharedPrefs (Context context) { + return context.getSharedPreferences(OrbotConstants.PREF_TOR_SHARED_PREFS,0 | Context.MODE_MULTI_PROCESS); + } } diff --git a/orbotservice/src/main/java/org/torproject/android/service/util/TorServiceUtils.java b/orbotservice/src/main/java/org/torproject/android/service/util/TorServiceUtils.java index e9e88590..018d7e42 100644 --- a/orbotservice/src/main/java/org/torproject/android/service/util/TorServiceUtils.java +++ b/orbotservice/src/main/java/org/torproject/android/service/util/TorServiceUtils.java @@ -13,10 +13,6 @@ import java.net.Socket; public class TorServiceUtils implements TorServiceConstants { - public static SharedPreferences getSharedPrefs (Context context) { - return context.getSharedPreferences(OrbotConstants.PREF_TOR_SHARED_PREFS,0 | Context.MODE_MULTI_PROCESS); - } - public static boolean isPortOpen(final String ip, final int port, final int timeout) { try { Socket socket = new Socket();

1 0

[orbot/master] Merge pull request #267 from eighthave/set-versionName-from-git-tags
by n8fr8＠torproject.org 28 Apr '20

28 Apr '20

commit bf720400193cb93b36653beabf51890a298b3acc Merge: 4150ef67 04bdf167 Author: Nathan Freitas <nathan(a)guardianproject.info> Date: Mon Oct 7 12:13:07 2019 -0400 Merge pull request #267 from eighthave/set-versionName-from-git-tags Set versionName from git tags app/build.gradle | 14 +++++++++++++- make-release-build | 6 +++--- 2 files changed, 16 insertions(+), 4 deletions(-)

1 0

[orbot/master] bugfix issue #271 fixes HiddenService creation by adding correct version to the torrc.custom file
by n8fr8＠torproject.org 28 Apr '20

28 Apr '20

commit 3fbeeb2012b4be8b679c817e7de0da3481739c02 Author: Matthew Nelson <05nelsonm(a)protonmail.com> Date: Fri Oct 18 11:06:33 2019 -0400 bugfix issue #271 fixes HiddenService creation by adding correct version to the torrc.custom file --- .../src/main/java/org/torproject/android/service/TorService.java | 1 + 1 file changed, 1 insertion(+) diff --git a/orbotservice/src/main/java/org/torproject/android/service/TorService.java b/orbotservice/src/main/java/org/torproject/android/service/TorService.java index e2eb9589..96dedfd8 100644 --- a/orbotservice/src/main/java/org/torproject/android/service/TorService.java +++ b/orbotservice/src/main/java/org/torproject/android/service/TorService.java @@ -1738,6 +1738,7 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon extraLines.append("HiddenServiceDir" + ' ' + hsDirPath).append('\n'); extraLines.append("HiddenServicePort" + ' ' + HSOnionPort + " 127.0.0.1:" + HSLocalPort).append('\n'); + extraLines.append("HiddenServiceVersion 2").append('\n'); if(HSAuthCookie == 1) extraLines.append("HiddenServiceAuthorizeClient stealth " + HSname).append('\n');

1 0

[orbot/master] send TorVpnService Intents directly, do not go through TorService
by n8fr8＠torproject.org 28 Apr '20

28 Apr '20

commit 6f5d48dff413b68daca79ca1a4814fa6a8194d61 Author: Hans-Christoph Steiner <hans(a)eds.org> Date: Mon Oct 7 22:26:06 2019 +0200 send TorVpnService Intents directly, do not go through TorService This follows the standard pattern as documented in the Android docs for starting and stopping a Service with Intents. --- .../torproject/android/mini/MiniMainActivity.java | 13 ++++------- .../android/mini/vpn/VPNEnableActivity.java | 6 +++-- .../org/torproject/android/OrbotMainActivity.java | 12 ++++------ .../torproject/android/ui/VPNEnableActivity.java | 5 ++-- .../org/torproject/android/service/TorService.java | 26 --------------------- .../android/service/TorServiceConstants.java | 2 -- .../android/service/vpn/TorVpnService.java | 27 ++++++++++++++++++++-- 7 files changed, 41 insertions(+), 50 deletions(-) diff --git a/app-mini/src/main/java/org/torproject/android/mini/MiniMainActivity.java b/app-mini/src/main/java/org/torproject/android/mini/MiniMainActivity.java index e8612ed5..52148113 100644 --- a/app-mini/src/main/java/org/torproject/android/mini/MiniMainActivity.java +++ b/app-mini/src/main/java/org/torproject/android/mini/MiniMainActivity.java @@ -58,6 +58,7 @@ import org.torproject.android.mini.ui.Rotate3dAnimation; import org.torproject.android.mini.ui.onboarding.OnboardingActivity; import org.torproject.android.mini.vpn.VPNEnableActivity; import org.torproject.android.service.OrbotConstants; +import org.torproject.android.service.vpn.TorVpnService; import org.torproject.android.service.TorService; import org.torproject.android.service.TorServiceConstants; import org.torproject.android.service.util.Prefs; @@ -466,7 +467,7 @@ public class MiniMainActivity extends AppCompatActivity private void refreshVPNApps () { - stopVpnService(); + TorVpnService.start(this); startActivity(new Intent(MiniMainActivity.this, VPNEnableActivity.class)); } @@ -482,7 +483,7 @@ public class MiniMainActivity extends AppCompatActivity if (enable) { startActivityForResult(new Intent(MiniMainActivity.this, VPNEnableActivity.class), REQUEST_VPN); } else { - stopVpnService(); + TorVpnService.start(this); stopTor(); } } @@ -610,7 +611,8 @@ public class MiniMainActivity extends AppCompatActivity else if (request == REQUEST_VPN) { if (response == RESULT_OK) { - sendIntentToService(TorServiceConstants.CMD_VPN); + TorVpnService.start(this); + } else if (response == VPNEnableActivity.ACTIVITY_RESULT_VPN_DENIED) { @@ -710,11 +712,6 @@ public class MiniMainActivity extends AppCompatActivity private void requestTorRereadConfig() { sendIntentToService(TorServiceConstants.CMD_SIGNAL_HUP); } - - public void stopVpnService () - { - sendIntentToService(TorServiceConstants.CMD_VPN_CLEAR); - } @Override protected void onResume() { diff --git a/app-mini/src/main/java/org/torproject/android/mini/vpn/VPNEnableActivity.java b/app-mini/src/main/java/org/torproject/android/mini/vpn/VPNEnableActivity.java index c252852b..bb263372 100644 --- a/app-mini/src/main/java/org/torproject/android/mini/vpn/VPNEnableActivity.java +++ b/app-mini/src/main/java/org/torproject/android/mini/vpn/VPNEnableActivity.java @@ -11,6 +11,7 @@ import android.view.Window; import org.torproject.android.service.TorService; import org.torproject.android.service.TorServiceConstants; import org.torproject.android.service.util.Prefs; +import org.torproject.android.service.vpn.TorVpnService; /** * To combat background service being stopped/swiped @@ -59,7 +60,7 @@ public class VPNEnableActivity extends AppCompatActivity { Prefs.putUseVpn(true); Log.d("VPNEnableActivity","VPN enabled, starting Tor..."); - sendIntentToService(TorServiceConstants.CMD_VPN); + TorVpnService.start(this); Handler h = new Handler(); h.postDelayed(new Runnable () { @@ -89,7 +90,8 @@ public class VPNEnableActivity extends AppCompatActivity { super.onActivityResult(request, response, data); if (request == REQUEST_VPN && response == RESULT_OK) { - sendIntentToService(TorServiceConstants.CMD_VPN); + TorVpnService.start(this); + h.postDelayed(new Runnable () { @Override public void run () { diff --git a/app/src/main/java/org/torproject/android/OrbotMainActivity.java b/app/src/main/java/org/torproject/android/OrbotMainActivity.java index 947f3a76..4ff3e850 100644 --- a/app/src/main/java/org/torproject/android/OrbotMainActivity.java +++ b/app/src/main/java/org/torproject/android/OrbotMainActivity.java @@ -57,6 +57,7 @@ import org.torproject.android.service.OrbotConstants; import org.torproject.android.service.TorService; import org.torproject.android.service.TorServiceConstants; import org.torproject.android.service.util.Prefs; +import org.torproject.android.service.vpn.TorVpnService; import org.torproject.android.service.vpn.VpnConstants; import org.torproject.android.service.vpn.VpnPrefs; import org.torproject.android.settings.Languages; @@ -600,7 +601,7 @@ public class OrbotMainActivity extends AppCompatActivity private void refreshVPNApps () { - stopVpnService(); + TorVpnService.stop(this); startActivity(new Intent(OrbotMainActivity.this, VPNEnableActivity.class)); } @@ -611,7 +612,7 @@ public class OrbotMainActivity extends AppCompatActivity if (enable) { startActivityForResult(new Intent(OrbotMainActivity.this, VPNEnableActivity.class), REQUEST_VPN); } else - stopVpnService(); + TorVpnService.stop(this); addAppShortcuts(); } @@ -903,7 +904,7 @@ public class OrbotMainActivity extends AppCompatActivity else if (request == REQUEST_VPN) { if (response == RESULT_OK) { - sendIntentToService(TorServiceConstants.CMD_VPN); + TorVpnService.start(this); } else if (response == VPNEnableActivity.ACTIVITY_RESULT_VPN_DENIED) { @@ -997,11 +998,6 @@ public class OrbotMainActivity extends AppCompatActivity private void requestTorRereadConfig() { sendIntentToService(TorServiceConstants.CMD_SIGNAL_HUP); } - - public void stopVpnService () - { - sendIntentToService(TorServiceConstants.CMD_VPN_CLEAR); - } @Override protected void onResume() { diff --git a/app/src/main/java/org/torproject/android/ui/VPNEnableActivity.java b/app/src/main/java/org/torproject/android/ui/VPNEnableActivity.java index 09bdf84a..e910be32 100644 --- a/app/src/main/java/org/torproject/android/ui/VPNEnableActivity.java +++ b/app/src/main/java/org/torproject/android/ui/VPNEnableActivity.java @@ -11,6 +11,7 @@ import android.view.Window; import org.torproject.android.service.TorService; import org.torproject.android.service.TorServiceConstants; import org.torproject.android.service.util.Prefs; +import org.torproject.android.service.vpn.TorVpnService; /** * To combat background service being stopped/swiped @@ -59,7 +60,7 @@ public class VPNEnableActivity extends AppCompatActivity { Prefs.putUseVpn(true); Log.d("VPNEnableActivity","VPN enabled, starting Tor..."); - sendIntentToService(TorServiceConstants.CMD_VPN); + TorVpnService.start(this); Handler h = new Handler(); h.postDelayed(new Runnable () { @@ -89,7 +90,7 @@ public class VPNEnableActivity extends AppCompatActivity { super.onActivityResult(request, response, data); if (request == REQUEST_VPN && response == RESULT_OK) { - sendIntentToService(TorServiceConstants.CMD_VPN); + TorVpnService.start(this); h.postDelayed(new Runnable () { @Override public void run () { diff --git a/orbotservice/src/main/java/org/torproject/android/service/TorService.java b/orbotservice/src/main/java/org/torproject/android/service/TorService.java index f8137632..08c15abf 100644 --- a/orbotservice/src/main/java/org/torproject/android/service/TorService.java +++ b/orbotservice/src/main/java/org/torproject/android/service/TorService.java @@ -50,7 +50,6 @@ import org.torproject.android.service.util.Prefs; import org.torproject.android.service.util.TorServiceUtils; import org.torproject.android.service.util.Utils; import org.torproject.android.service.vpn.OrbotVpnManager; -import org.torproject.android.service.vpn.TorVpnService; import org.torproject.android.service.vpn.VpnPrefs; import java.io.BufferedReader; @@ -381,10 +380,6 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon requestTorRereadConfig(); } else if (action.equals(CMD_NEWNYM)) { newIdentity(); - } else if (action.equals(CMD_VPN)) { - startVPNService(); - } else if (action.equals(CMD_VPN_CLEAR)) { - clearVpnProxy(); } else if (action.equals(CMD_SET_EXIT)) { setExitNode(mIntent.getStringExtra("exit")); @@ -1961,27 +1956,6 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon return NOTIFY_ID; } - private void startVPNService () - { - Intent intentVpn = new Intent(this, TorVpnService.class); - intentVpn.setAction("start"); - startService(intentVpn); - - } - - - public void clearVpnProxy () - { - debug ("clearing VPN Proxy"); - Prefs.putUseVpn(false); - - Intent intentVpn = new Intent(this,TorVpnService.class); - intentVpn.setAction("stop"); - startService(intentVpn); - - } - - // for bridge loading from the assets default bridges.txt file class Bridge { diff --git a/orbotservice/src/main/java/org/torproject/android/service/TorServiceConstants.java b/orbotservice/src/main/java/org/torproject/android/service/TorServiceConstants.java index b805cd6a..ffcdefab 100644 --- a/orbotservice/src/main/java/org/torproject/android/service/TorServiceConstants.java +++ b/orbotservice/src/main/java/org/torproject/android/service/TorServiceConstants.java @@ -96,8 +96,6 @@ public interface TorServiceConstants { String CMD_STATUS = "status"; String CMD_FLUSH = "flush"; String CMD_NEWNYM = "newnym"; - String CMD_VPN = "vpn"; - String CMD_VPN_CLEAR = "vpnclear"; String CMD_UPDATE_TRANS_PROXY = "update"; String CMD_SET_EXIT = "setexit"; diff --git a/orbotservice/src/main/java/org/torproject/android/service/vpn/TorVpnService.java b/orbotservice/src/main/java/org/torproject/android/service/vpn/TorVpnService.java index ceae17e2..13ff2c49 100644 --- a/orbotservice/src/main/java/org/torproject/android/service/vpn/TorVpnService.java +++ b/orbotservice/src/main/java/org/torproject/android/service/vpn/TorVpnService.java @@ -7,8 +7,10 @@ import android.content.Intent; import android.content.IntentFilter; import android.net.VpnService; import android.support.v4.content.LocalBroadcastManager; +import android.util.Log; import org.torproject.android.service.TorService; import org.torproject.android.service.TorServiceConstants; +import org.torproject.android.service.util.Prefs; import java.io.IOException; import java.util.concurrent.TimeoutException; @@ -17,6 +19,24 @@ import java.util.concurrent.TimeoutException; * Created by n8fr8 on 9/26/16. */ public class TorVpnService extends VpnService { + + public static final String TAG = "TorVpnService"; + + private static final String ACTION_START = "start"; + private static final String ACTION_STOP = "stop"; + + public static void start(Context context) { + Intent intent = new Intent(context, TorVpnService.class); + intent.setAction(ACTION_START); + context.startService(intent); + } + + public static void stop(Context context) { + Intent intent = new Intent(context, TorVpnService.class); + intent.setAction(ACTION_STOP); + context.startService(intent); + } + OrbotVpnManager mVpnManager; @Override @@ -38,14 +58,17 @@ public class TorVpnService extends VpnService { */ public int onStartCommand(Intent intent, int flags, int startId) { - if (intent.getAction().equals("start")) + if (ACTION_START.equals(intent.getAction())) { LocalBroadcastManager lbm = LocalBroadcastManager.getInstance(this); lbm.registerReceiver(mLocalBroadcastReceiver, new IntentFilter(TorServiceConstants.LOCAL_ACTION_PORTS)); } - else if (intent.getAction().equals("stop")) + else if (ACTION_STOP.equals(intent.getAction())) { + Log.d(TAG, "clearing VPN Proxy"); + Prefs.putUseVpn(false); + LocalBroadcastManager lbm = LocalBroadcastManager.getInstance(this); lbm.unregisterReceiver(mLocalBroadcastReceiver); }

1 0

[orbot/master] remove unused constants from TorServiceConstants
by n8fr8＠torproject.org 28 Apr '20

28 Apr '20

commit 4d0a8342d6821b41f2da3c2a5146c6515f58d0ac Author: Hans-Christoph Steiner <hans(a)eds.org> Date: Mon Oct 7 23:13:31 2019 +0200 remove unused constants from TorServiceConstants --- .../main/java/org/torproject/android/service/TorServiceConstants.java | 3 --- 1 file changed, 3 deletions(-) diff --git a/orbotservice/src/main/java/org/torproject/android/service/TorServiceConstants.java b/orbotservice/src/main/java/org/torproject/android/service/TorServiceConstants.java index ffcdefab..70193edc 100644 --- a/orbotservice/src/main/java/org/torproject/android/service/TorServiceConstants.java +++ b/orbotservice/src/main/java/org/torproject/android/service/TorServiceConstants.java @@ -93,10 +93,7 @@ public interface TorServiceConstants { // actions for internal command Intents String CMD_SIGNAL_HUP = "signal_hup"; - String CMD_STATUS = "status"; - String CMD_FLUSH = "flush"; String CMD_NEWNYM = "newnym"; - String CMD_UPDATE_TRANS_PROXY = "update"; String CMD_SET_EXIT = "setexit"; String PREF_BINARY_TOR_VERSION_INSTALLED = "BINARY_TOR_VERSION_INSTALLED";

1 0

[orbot/master] update work on hidden service name setting
by n8fr8＠torproject.org 28 Apr '20

28 Apr '20

commit 56e4726e4ab934f18a30e1c9543e86238544283b Author: n8fr8 <nathan(a)guardianproject.info> Date: Tue Oct 29 09:38:06 2019 -0400 update work on hidden service name setting --- .../org/torproject/android/service/TorService.java | 84 ++++++++++++---------- 1 file changed, 48 insertions(+), 36 deletions(-) diff --git a/orbotservice/src/main/java/org/torproject/android/service/TorService.java b/orbotservice/src/main/java/org/torproject/android/service/TorService.java index a566b6d4..8c8330be 100644 --- a/orbotservice/src/main/java/org/torproject/android/service/TorService.java +++ b/orbotservice/src/main/java/org/torproject/android/service/TorService.java @@ -862,7 +862,11 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon if (success) { - updateOnionNames (); + try { updateOnionNames (); } + catch (SecurityException se) + { + logNotice("unable to upload onion names"); + } } } catch (Exception e) { @@ -875,7 +879,7 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon } } - private void updateOnionNames () + private void updateOnionNames () throws SecurityException { // Tor is running, update new .onion names at db ContentResolver mCR = getApplicationContext().getContentResolver(); @@ -1726,49 +1730,57 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon ContentResolver mCR = getApplicationContext().getContentResolver(); - /* ---- Hidden Services ---- */ - Cursor hidden_services = mCR.query(HS_CONTENT_URI, hsProjection, HiddenService.ENABLED + "=1", null, null); - if(hidden_services != null) { - try { - while (hidden_services.moveToNext()) { - String HSname = hidden_services.getString(hidden_services.getColumnIndex(HiddenService.NAME)); - Integer HSLocalPort = hidden_services.getInt(hidden_services.getColumnIndex(HiddenService.PORT)); - Integer HSOnionPort = hidden_services.getInt(hidden_services.getColumnIndex(HiddenService.ONION_PORT)); - Integer HSAuthCookie = hidden_services.getInt(hidden_services.getColumnIndex(HiddenService.AUTH_COOKIE)); - String hsDirPath = new File(mHSBasePath.getAbsolutePath(),"hs" + HSLocalPort).getCanonicalPath(); + try { + /* ---- Hidden Services ---- */ + Cursor hidden_services = mCR.query(HS_CONTENT_URI, hsProjection, HiddenService.ENABLED + "=1", null, null); + if (hidden_services != null) { + try { + while (hidden_services.moveToNext()) { + String HSname = hidden_services.getString(hidden_services.getColumnIndex(HiddenService.NAME)); + Integer HSLocalPort = hidden_services.getInt(hidden_services.getColumnIndex(HiddenService.PORT)); + Integer HSOnionPort = hidden_services.getInt(hidden_services.getColumnIndex(HiddenService.ONION_PORT)); + Integer HSAuthCookie = hidden_services.getInt(hidden_services.getColumnIndex(HiddenService.AUTH_COOKIE)); + String hsDirPath = new File(mHSBasePath.getAbsolutePath(), "hs" + HSLocalPort).getCanonicalPath(); - debug("Adding hidden service on port: " + HSLocalPort); + debug("Adding hidden service on port: " + HSLocalPort); - extraLines.append("HiddenServiceDir" + ' ' + hsDirPath).append('\n'); - extraLines.append("HiddenServicePort" + ' ' + HSOnionPort + " 127.0.0.1:" + HSLocalPort).append('\n'); + extraLines.append("HiddenServiceDir" + ' ' + hsDirPath).append('\n'); + extraLines.append("HiddenServicePort" + ' ' + HSOnionPort + " 127.0.0.1:" + HSLocalPort).append('\n'); - if(HSAuthCookie == 1) - extraLines.append("HiddenServiceAuthorizeClient stealth " + HSname).append('\n'); + if (HSAuthCookie == 1) + extraLines.append("HiddenServiceAuthorizeClient stealth " + HSname).append('\n'); + } + } catch (NumberFormatException e) { + Log.e(OrbotConstants.TAG, "error parsing hsport", e); + } catch (Exception e) { + Log.e(OrbotConstants.TAG, "error starting share server", e); } - } catch (NumberFormatException e) { - Log.e(OrbotConstants.TAG,"error parsing hsport",e); - } catch (Exception e) { - Log.e(OrbotConstants.TAG,"error starting share server",e); + + hidden_services.close(); } + } + catch (SecurityException se) {} - hidden_services.close(); - } + try + { - /* ---- Client Cookies ---- */ - Cursor client_cookies = mCR.query(COOKIE_CONTENT_URI, cookieProjection, ClientCookie.ENABLED + "=1", null, null); - if(client_cookies != null) { - try { - while (client_cookies.moveToNext()) { - String domain = client_cookies.getString(client_cookies.getColumnIndex(ClientCookie.DOMAIN)); - String cookie = client_cookies.getString(client_cookies.getColumnIndex(ClientCookie.AUTH_COOKIE_VALUE)); - extraLines.append("HidServAuth" + ' ' + domain + ' ' + cookie).append('\n'); + /* ---- Client Cookies ---- */ + Cursor client_cookies = mCR.query(COOKIE_CONTENT_URI, cookieProjection, ClientCookie.ENABLED + "=1", null, null); + if(client_cookies != null) { + try { + while (client_cookies.moveToNext()) { + String domain = client_cookies.getString(client_cookies.getColumnIndex(ClientCookie.DOMAIN)); + String cookie = client_cookies.getString(client_cookies.getColumnIndex(ClientCookie.AUTH_COOKIE_VALUE)); + extraLines.append("HidServAuth" + ' ' + domain + ' ' + cookie).append('\n'); + } + } catch (Exception e) { + Log.e(OrbotConstants.TAG,"error starting share server",e); } - } catch (Exception e) { - Log.e(OrbotConstants.TAG,"error starting share server",e); - } - client_cookies.close(); - } + client_cookies.close(); + } + } + catch (SecurityException se) {} return extraLines; }

1 0

[orbot/master] need the v4 support lib for LocalBroadcastManager
by n8fr8＠torproject.org 28 Apr '20

28 Apr '20

commit a479cc9a2bad449db960fbb7b62cfe5b94746321 Author: n8fr8 <nathan(a)guardianproject.info> Date: Tue Oct 29 10:33:12 2019 -0400 need the v4 support lib for LocalBroadcastManager --- orbotservice/build.gradle | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/orbotservice/build.gradle b/orbotservice/build.gradle index dde7a232..13987ab9 100644 --- a/orbotservice/build.gradle +++ b/orbotservice/build.gradle @@ -41,7 +41,9 @@ android { dependencies { - implementation 'org.torproject:tor-android-binary:0.4.0.4-rc' + implementation 'com.android.support:support-v4:28.0.0' + + implementation 'org.torproject:tor-android-binary:0.4.1.5' implementation 'info.pluggabletransports.aptds:apt-dispatch-library:1.0.7' implementation 'info.pluggabletransports.aptds:apt-meek-obfs4-legacy:1.0.7' implementation 'info.pluggabletransports.aptds:jsocksAndroid:1.0.4'

1 0