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

[orbot/master] Fixes #474 Remove Briar from Orbot VPN Routing + UI
by n8fr8＠torproject.org 22 Dec '21

22 Dec '21

commit 9759e94faebaa6d71e8230d15170b0a72d28be39 Author: bim <dsnake(a)protonmail.com> Date: Tue Aug 10 17:08:42 2021 -0400 Fixes #474 Remove Briar from Orbot VPN Routing + UI Also removes Tor Browser and Tor Browser Alpha --- .../java/org/torproject/android/ui/AppManagerActivity.java | 9 +++++++-- .../org/torproject/android/service/vpn/OrbotVpnManager.java | 5 +++-- .../org/torproject/android/service/vpn/TorifiedApp.java | 13 +++++-------- .../java/org/torproject/android/service/vpn/VpnPrefs.java | 10 ++++++++++ 4 files changed, 25 insertions(+), 12 deletions(-) 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 156ccfce..8994ed50 100644 --- a/app/src/main/java/org/torproject/android/ui/AppManagerActivity.java +++ b/app/src/main/java/org/torproject/android/ui/AppManagerActivity.java @@ -34,6 +34,7 @@ import org.torproject.android.R; import org.torproject.android.service.OrbotConstants; import org.torproject.android.service.util.Prefs; import org.torproject.android.service.vpn.TorifiedApp; +import org.torproject.android.service.vpn.VpnPrefs; import java.lang.ref.WeakReference; import java.util.ArrayList; @@ -54,9 +55,13 @@ public class AppManagerActivity extends AppCompatActivity implements OnClickList private ListAdapter adapterApps; private ProgressBar progressBar; - // returns true if the given app is enabled and not orbot + /** + * @return true if the app is "enabled", not Orbot, and not in + * {@link org.torproject.android.service.vpn.VpnPrefs#BYPASS_VPN_PACKAGES} + */ public static boolean includeAppInUi(ApplicationInfo applicationInfo) { if (!applicationInfo.enabled) return false; + if (Arrays.binarySearch(VpnPrefs.BYPASS_VPN_PACKAGES, applicationInfo.packageName) >= 0) return false; return !BuildConfig.APPLICATION_ID.equals(applicationInfo.packageName); } @@ -117,7 +122,7 @@ public class AppManagerActivity extends AppCompatActivity implements OnClickList final LayoutInflater inflater = getLayoutInflater(); - adapterApps = new ArrayAdapter<TorifiedApp>(this, R.layout.layout_apps_item, R.id.itemtext, mApps) { + adapterApps = new ArrayAdapter<>(this, R.layout.layout_apps_item, R.id.itemtext, mApps) { @Override public View getView(int position, View convertView, ViewGroup parent) { diff --git a/orbotservice/src/main/java/org/torproject/android/service/vpn/OrbotVpnManager.java b/orbotservice/src/main/java/org/torproject/android/service/vpn/OrbotVpnManager.java index 0f20b1c6..a0b3178c 100644 --- a/orbotservice/src/main/java/org/torproject/android/service/vpn/OrbotVpnManager.java +++ b/orbotservice/src/main/java/org/torproject/android/service/vpn/OrbotVpnManager.java @@ -344,9 +344,7 @@ public class OrbotVpnManager implements Handler.Callback { for (TorifiedApp app : apps) { if (app.isTorified() && (!app.getPackageName().equals(mService.getPackageName()))) { if (prefs.getBoolean(app.getPackageName() + OrbotConstants.APP_TOR_KEY, true)) { - builder.addAllowedApplication(app.getPackageName()); - } perAppEnabled = true; @@ -354,6 +352,9 @@ public class OrbotVpnManager implements Handler.Callback { } } + for (String packageName : VpnPrefs.BYPASS_VPN_PACKAGES) + builder.addDisallowedApplication(packageName); + if (!perAppEnabled) builder.addDisallowedApplication(mService.getPackageName()); diff --git a/orbotservice/src/main/java/org/torproject/android/service/vpn/TorifiedApp.java b/orbotservice/src/main/java/org/torproject/android/service/vpn/TorifiedApp.java index 2eabaa76..098639ed 100644 --- a/orbotservice/src/main/java/org/torproject/android/service/vpn/TorifiedApp.java +++ b/orbotservice/src/main/java/org/torproject/android/service/vpn/TorifiedApp.java @@ -31,6 +31,8 @@ public class TorifiedApp implements Comparable { private boolean usesInternet = false; private int[] enabledPorts; + + public static ArrayList<TorifiedApp> getApps(Context context, SharedPreferences prefs) { String tordAppString = prefs.getString(PREFS_KEY_TORIFIED, ""); @@ -56,25 +58,22 @@ public class TorifiedApp implements Comparable { ApplicationInfo aInfo; - int appIdx = 0; TorifiedApp app; while (itAppInfo.hasNext()) { aInfo = itAppInfo.next(); app = new TorifiedApp(); - try { PackageInfo pInfo = pMgr.getPackageInfo(aInfo.packageName, PackageManager.GET_PERMISSIONS); - - if (pInfo != null && pInfo.requestedPermissions != null) { + if (Arrays.binarySearch(VpnPrefs.BYPASS_VPN_PACKAGES, aInfo.packageName) >= 0) { + app.setUsesInternet(false); + } else if (pInfo != null && pInfo.requestedPermissions != null) { for (String permInfo : pInfo.requestedPermissions) { if (permInfo.equals(Manifest.permission.INTERNET)) { app.setUsesInternet(true); - } } - } @@ -117,8 +116,6 @@ public class TorifiedApp implements Comparable { } else { app.setTorified(false); } - - appIdx++; } Collections.sort(apps); diff --git a/orbotservice/src/main/java/org/torproject/android/service/vpn/VpnPrefs.java b/orbotservice/src/main/java/org/torproject/android/service/vpn/VpnPrefs.java index 4945241a..4ac17c91 100644 --- a/orbotservice/src/main/java/org/torproject/android/service/vpn/VpnPrefs.java +++ b/orbotservice/src/main/java/org/torproject/android/service/vpn/VpnPrefs.java @@ -5,4 +5,14 @@ public interface VpnPrefs { String PREFS_DNS_PORT = "PREFS_DNS_PORT"; String PREFS_KEY_TORIFIED = "PrefTord"; + + /** + * Include packages here to make the VPNService ignore these apps (On Lollipop+). This is to + * prevent tor over tor scenarios... + */ + String[] BYPASS_VPN_PACKAGES = new String[] { + "org.torproject.torbrowser_alpha", + "org.torproject.torbrowser", + "org.briarproject.briar.android" // https://github.com/guardianproject/orbot/issues/474 + }; }

1 0

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

22 Dec '21

commit 9376d450e5caa5fae5432a3b6f23d4eae2f6e918 Merge: c75f5305 e6c9d985 Author: Nathan Freitas <nathan(a)guardianproject.info> Date: Mon Aug 9 12:52:19 2021 -0400 Merge pull request #497 from weblate/weblate-guardianproject-orbot Translations update from Weblate app/src/main/res/values-bn/strings.xml | 22 +++ app/src/main/res/values-is/strings.xml | 7 +- app/src/main/res/values-iw/strings.xml | 1 + app/src/main/res/values-lt-rLT/strings.xml | 220 +++++++++++++++++++++ app/src/main/res/values-pl/strings.xml | 6 +- app/src/main/res/values-pt-rBR/strings.xml | 3 +- app/src/main/res/values-ro-rRO/strings.xml | 190 +++++++++++++++++- app/src/main/res/values-ru/strings.xml | 63 +++++- app/src/main/res/values-tr/strings.xml | 3 +- app/src/main/res/values-uk/strings.xml | 3 +- app/src/main/res/values-zh-rCN/strings.xml | 1 + .../metadata/android/lt/changelogs/15500000.txt | 9 + .../metadata/android/lt/changelogs/15500001.txt | 9 + .../metadata/android/lt/changelogs/16000008.txt | 8 + .../metadata/android/lt/changelogs/16000009.txt | 8 + .../metadata/android/lt/changelogs/16000010.txt | 8 + .../metadata/android/lt/changelogs/16000011.txt | 8 + .../metadata/android/lt/changelogs/16020041.txt | 9 + .../metadata/android/lt/changelogs/16020042.txt | 9 + .../metadata/android/lt/changelogs/16020043.txt | 9 + .../metadata/android/lt/changelogs/16050100.txt | 4 + .../metadata/android/lt/changelogs/16050200.txt | 1 + .../metadata/android/lt/changelogs/16108000.txt | 4 + .../metadata/android/lt/changelogs/16123000.txt | 2 + .../metadata/android/lt/changelogs/1640300200.txt | 4 + .../metadata/android/lt/changelogs/1641200200.txt | 4 + .../metadata/android/lt/changelogs/1641300100.txt | 3 + fastlane/metadata/android/lt/full_description.txt | 30 ++- fastlane/metadata/android/lt/short_description.txt | 2 +- fastlane/metadata/android/lt/title.txt | 2 +- .../metadata/android/nl-NL/changelogs/16000008.txt | 8 + .../metadata/android/nl-NL/changelogs/16000009.txt | 8 + .../metadata/android/nl-NL/changelogs/16000010.txt | 8 + .../metadata/android/nl-NL/changelogs/16000011.txt | 8 + .../metadata/android/nl-NL/changelogs/16050100.txt | 4 + .../metadata/android/nl-NL/changelogs/16050200.txt | 1 + .../metadata/android/nl-NL/changelogs/16108000.txt | 4 + .../metadata/android/nl-NL/changelogs/16123000.txt | 2 + .../android/nl-NL/changelogs/1640300200.txt | 4 + .../android/nl-NL/changelogs/1641200200.txt | 4 + .../android/nl-NL/changelogs/1641300100.txt | 3 + .../metadata/android/nl-NL/full_description.txt | 28 ++- .../metadata/android/ro/changelogs/15500000.txt | 10 + .../metadata/android/ro/changelogs/15500001.txt | 10 + .../metadata/android/ro/changelogs/16000008.txt | 8 + .../metadata/android/ro/changelogs/16000009.txt | 8 + .../metadata/android/ro/changelogs/16000010.txt | 8 + .../metadata/android/ro/changelogs/16000011.txt | 8 + .../metadata/android/ro/changelogs/16020041.txt | 9 + .../metadata/android/ro/changelogs/16020042.txt | 9 + .../metadata/android/ro/changelogs/16020043.txt | 9 + .../metadata/android/ro/changelogs/16050100.txt | 4 + .../metadata/android/ro/changelogs/16050200.txt | 1 + .../metadata/android/ro/changelogs/16108000.txt | 4 + .../metadata/android/ro/changelogs/16123000.txt | 2 + .../metadata/android/ro/changelogs/1640300200.txt | 4 + .../metadata/android/ro/changelogs/1641200200.txt | 4 + .../metadata/android/ro/changelogs/1641300100.txt | 3 + fastlane/metadata/android/ro/full_description.txt | 28 ++- 59 files changed, 790 insertions(+), 73 deletions(-)

1 0

[orbot/master] Package name is saved for torified apps instead of "username". This is much more performant
by n8fr8＠torproject.org 22 Dec '21

22 Dec '21

commit c1fdff654b82d76c2abac479e7fa35542123ba2a Author: bim <dsnake(a)protonmail.com> Date: Sat Aug 7 20:47:07 2021 -0400 Package name is saved for torified apps instead of "username". This is much more performant than the last commit, but the UI will not immediately be updated if the user had older Orbot data saved (No "torification" is actually compromised though...) --- .../org/torproject/android/OrbotMainActivity.java | 30 ++++++++++++---------- .../torproject/android/ui/AppManagerActivity.java | 6 ++--- .../android/service/vpn/TorifiedApp.java | 2 +- 3 files changed, 21 insertions(+), 17 deletions(-) diff --git a/app/src/main/java/org/torproject/android/OrbotMainActivity.java b/app/src/main/java/org/torproject/android/OrbotMainActivity.java index 0869d140..a54cbe0f 100644 --- a/app/src/main/java/org/torproject/android/OrbotMainActivity.java +++ b/app/src/main/java/org/torproject/android/OrbotMainActivity.java @@ -87,9 +87,12 @@ import java.net.URLDecoder; import java.text.NumberFormat; import java.util.ArrayList; import java.util.Date; +import java.util.HashMap; import java.util.List; import java.util.Locale; +import java.util.Map; import java.util.StringTokenizer; +import java.util.TreeMap; import java.util.stream.Collectors; import pl.bclogic.pulsator4droid.library.PulsatorLayout; @@ -1115,35 +1118,36 @@ public class OrbotMainActivity extends AppCompatActivity implements OrbotConstan drawFullDeviceVpn(); } else { PackageManager packageManager = getPackageManager(); + String[] tordApps = tordAppString.split("\\|"); + LinearLayout container = (LinearLayout) llBoxShortcuts.getChildAt(0); tvVpnAppStatus.setVisibility(View.GONE); llBoxShortcuts.setVisibility(View.VISIBLE); - LinearLayout container = (LinearLayout) llBoxShortcuts.getChildAt(0); container.removeAllViews(); - List<TorifiedApp> apps = TorifiedApp.getApps(this, mPrefs); - TorifiedApp.sortAppsForTorifiedAndAbc(apps); - int appsAdded = 0; - - for (TorifiedApp app : apps) { - if (!app.isTorified()) break; + Map<String, ImageView> icons = new TreeMap<>(); + for (String tordApp : tordApps) { try { - String pkgId = app.getPackageName(); + packageManager.getPackageInfo(tordApp, 0); ImageView iv = new ImageView(this); + ApplicationInfo applicationInfo = packageManager.getApplicationInfo(tordApp, 0); + iv.setImageDrawable(packageManager.getApplicationIcon(tordApp)); LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(LinearLayout.LayoutParams.WRAP_CONTENT, LinearLayout.LayoutParams.WRAP_CONTENT); params.setMargins(3, 3, 3, 3); iv.setLayoutParams(params); - iv.setImageDrawable(packageManager.getApplicationIcon(pkgId)); - iv.setOnClickListener(v -> openBrowser(URL_TOR_CHECK, false, pkgId)); - container.addView(iv); - appsAdded++; + iv.setOnClickListener(v -> openBrowser(URL_TOR_CHECK, false, tordApp)); + icons.put(packageManager.getApplicationLabel(applicationInfo).toString(), iv); + } catch (PackageManager.NameNotFoundException e) { e.printStackTrace(); } } - if (appsAdded == 0) { + if (icons.size() == 0) { /* if a user uninstalled or disabled all apps that were set on the device then we want to have the no apps added view appear even though the tordAppString variable is not empty */ drawFullDeviceVpn(); + } else { + TreeMap<String, ImageView> sorted = new TreeMap<>(icons); + for (ImageView iv : sorted.values()) container.addView(iv); } } 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 ccc6aa97..156ccfce 100644 --- a/app/src/main/java/org/torproject/android/ui/AppManagerActivity.java +++ b/app/src/main/java/org/torproject/android/ui/AppManagerActivity.java @@ -248,7 +248,7 @@ public class AppManagerActivity extends AppCompatActivity implements OnClickList // check if this application is allowed - if (Arrays.binarySearch(tordApps, app.getUsername()) >= 0) { + if (Arrays.binarySearch(tordApps, app.getPackageName()) >= 0) { app.setTorified(true); } else { app.setTorified(false); @@ -268,9 +268,9 @@ public class AppManagerActivity extends AppCompatActivity implements OnClickList for (TorifiedApp tApp : mApps) { if (tApp.isTorified()) { - tordApps.append(tApp.getUsername()); + tordApps.append(tApp.getPackageName()); tordApps.append("|"); - response.putExtra(tApp.getUsername(), true); + response.putExtra(tApp.getPackageName(), true); } } diff --git a/orbotservice/src/main/java/org/torproject/android/service/vpn/TorifiedApp.java b/orbotservice/src/main/java/org/torproject/android/service/vpn/TorifiedApp.java index dedf743e..2eabaa76 100644 --- a/orbotservice/src/main/java/org/torproject/android/service/vpn/TorifiedApp.java +++ b/orbotservice/src/main/java/org/torproject/android/service/vpn/TorifiedApp.java @@ -112,7 +112,7 @@ public class TorifiedApp implements Comparable { //app.setIcon(pMgr.getApplicationIcon(aInfo)); // check if this application is allowed - if (Arrays.binarySearch(tordApps, app.getUsername()) >= 0) { + if (Arrays.binarySearch(tordApps, app.getPackageName()) >= 0) { app.setTorified(true); } else { app.setTorified(false);

1 0

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

22 Dec '21

commit 822d3582fa462a243d4f11d20206c87c281a4f9b Merge: 9376a33f 91f0fc4c Author: n8fr8 <nathan(a)guardianproject.info> Date: Mon Aug 9 14:09:20 2021 -0400 Merge branch 'bitmold-missing_vpn_icons' .../org/torproject/android/OrbotMainActivity.java | 118 ++++++++++----------- .../torproject/android/ui/AppManagerActivity.java | 30 ++---- app/src/main/res/layout/layout_main.xml | 38 ++++++- .../android/service/vpn/OrbotVpnManager.java | 1 - .../android/service/vpn/TorifiedApp.java | 15 ++- 5 files changed, 111 insertions(+), 91 deletions(-)

1 0

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

22 Dec '21

commit 9376a33f7178e269e3ccb8d63cdccee5fcfe7602 Merge: f3a83d6e 3943b9d9 Author: n8fr8 <nathan(a)guardianproject.info> Date: Mon Aug 9 14:02:29 2021 -0400 Merge branch 'sisbell-505' .../android/ui/onboarding/CustomBridgesActivity.java | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-)

1 0

[orbot/master] Implements #509: Use Gradle Version Catalog
by n8fr8＠torproject.org 22 Dec '21

22 Dec '21

commit 4727db2dc054f58ef756891f07719270e9cce616 Author: sisbell <shane.isbell(a)gmail.com> Date: Mon Aug 2 21:35:52 2021 -0700 Implements #509: Use Gradle Version Catalog --- app-mini/build.gradle | 30 ++++++------ app-tv/build.gradle | 27 +++++------ app/build.gradle | 34 +++++++------ appcore/build.gradle | 10 +--- .../android/core/ExampleInstrumentedTest.kt | 24 ---------- .../org/torproject/android/core/ExampleUnitTest.kt | 17 ------- build.gradle | 1 - commons-device.gradle | 1 - gradle/libs.versions.toml | 55 ++++++++++++++++++++++ gradle/wrapper/gradle-wrapper.properties | 4 +- intentintegrator/build.gradle | 2 +- orbotservice/build.gradle | 19 ++++---- settings.gradle | 9 ++++ 13 files changed, 123 insertions(+), 110 deletions(-) diff --git a/app-mini/build.gradle b/app-mini/build.gradle index 22067c39..e861fb41 100644 --- a/app-mini/build.gradle +++ b/app-mini/build.gradle @@ -28,19 +28,19 @@ android { exclude 'lib/armeabi-v7a/libgojni.so' exclude 'lib/armeabi/libgojni.so' } -} - -dependencies { - implementation( - project(path: ':appcore'), - project(path: ':intentintegrator'), - project(':orbotservice'), - 'androidx.constraintlayout:constraintlayout:2.1.0', - 'androidx.coordinatorlayout:coordinatorlayout:1.1.0', - 'androidx.recyclerview:recyclerview:1.2.1', - 'androidx.palette:palette:1.0.0', - 'com.github.apl-devs:appintro:v4.2.2', - 'com.google.android.material:material:1.4.0' - ) - androidTestImplementation "tools.fastlane:screengrab:1.2.0" + dependencies { + implementation( + project(path: ':appcore'), + project(path: ':intentintegrator'), + project(':orbotservice'), + libs.android.material, + libs.androidx.coordinator.layout, + libs.androidx.localbroadcast, + libs.androidx.palette, + libs.androidx.recyclerview, + libs.apl.appintro, + libs.guardian.jtorctl + ) + androidTestImplementation libs.fastlane.screengrab + } } diff --git a/app-tv/build.gradle b/app-tv/build.gradle index 36baec67..259ae0e5 100644 --- a/app-tv/build.gradle +++ b/app-tv/build.gradle @@ -36,21 +36,18 @@ android { dependencies { implementation( - project(path: ':appcore'), - project(path: ':intentintegrator'), + project(':appcore'), + project(':intentintegrator'), project(':orbotservice'), - 'androidx.constraintlayout:constraintlayout:2.1.0', - 'androidx.coordinatorlayout:coordinatorlayout:1.1.0', - "androidx.leanback:leanback:1.2.0-alpha01", - "androidx.leanback:leanback-paging:1.1.0-alpha08", - "androidx.leanback:leanback-preference:1.2.0-alpha01", - "androidx.leanback:leanback-tab:1.1.0-beta01", - 'androidx.palette:palette:1.0.0', - 'androidx.recyclerview:recyclerview:1.2.1', - 'com.github.apl-devs:appintro:v4.2.2', - 'com.github.jetradarmobile:android-snowfall:1.2.1', - 'com.google.android.material:material:1.4.0' + libs.android.material, + libs.android.snowfall, + libs.androidx.coordinator.layout, + libs.androidx.localbroadcast, + libs.androidx.palette, + libs.androidx.recyclerview, + libs.apl.appintro, + libs.guardian.jtorctl, + libs.bundles.leanback ) - androidTestImplementation "tools.fastlane:screengrab:1.2.0" - + androidTestImplementation libs.fastlane.screengrab } \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index aa9af8e9..a2d4345f 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -51,20 +51,24 @@ android { universalApk true } } -} -dependencies { - implementation( - project(path: ':appcore'), - project(path: ':intentintegrator'), - project(':orbotservice'), - 'androidx.localbroadcastmanager:localbroadcastmanager:1.0.0', - 'com.android.volley:volley:1.2.0', - 'com.github.apl-devs:appintro:v4.2.2', - 'com.github.jetradarmobile:android-snowfall:1.2.1', - 'com.github.tladesignz:IPtProxy:1.0.0', - 'com.google.android.material:material:1.4.0', - 'pl.bclogic:pulsator4droid:1.0.3' - ) - androidTestImplementation "tools.fastlane:screengrab:1.2.0" + dependencies { + implementation( + project(':appcore'), + project(':intentintegrator'), + project(':orbotservice'), + libs.apl.appintro, + libs.android.snowfall, + libs.android.volley, + libs.androidx.core, + libs.androidx.localbroadcast, + libs.androidx.palette, + libs.android.material, + libs.bclogic.pulsator, + libs.guardian.jtorctl, + libs.ipt.proxy\ + + ) + androidTestImplementation libs.fastlane.screengrab + } } \ No newline at end of file diff --git a/appcore/build.gradle b/appcore/build.gradle index 5c424106..39950482 100644 --- a/appcore/build.gradle +++ b/appcore/build.gradle @@ -24,14 +24,8 @@ android { dependencies { implementation( - project(path: ':orbotservice'), + project(':orbotservice'), "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version", - 'androidx.core:core-ktx:1.6.0', - 'androidx.appcompat:appcompat:1.3.1' + libs.androidx.appcompat ) - androidTestImplementation ( - 'androidx.test.ext:junit:1.1.3', - 'androidx.test.espresso:espresso-core:3.4.0' - ) - testImplementation 'junit:junit:4.13.2' } \ No newline at end of file diff --git a/appcore/src/androidTest/java/org/torproject/android/core/ExampleInstrumentedTest.kt b/appcore/src/androidTest/java/org/torproject/android/core/ExampleInstrumentedTest.kt deleted file mode 100644 index b7e9cad1..00000000 --- a/appcore/src/androidTest/java/org/torproject/android/core/ExampleInstrumentedTest.kt +++ /dev/null @@ -1,24 +0,0 @@ -package org.torproject.android.core - -import androidx.test.platform.app.InstrumentationRegistry -import androidx.test.ext.junit.runners.AndroidJUnit4 - -import org.junit.Test -import org.junit.runner.RunWith - -import org.junit.Assert.* - -/** - * Instrumented test, which will execute on an Android device. - * - * See [testing documentation](http://d.android.com/tools/testing). - */ -@RunWith(AndroidJUnit4::class) -class ExampleInstrumentedTest { - @Test - fun useAppContext() { - // Context of the app under test. - val appContext = InstrumentationRegistry.getInstrumentation().targetContext - assertEquals("org.torproject.android.core.test", appContext.packageName) - } -} \ No newline at end of file diff --git a/appcore/src/test/java/org/torproject/android/core/ExampleUnitTest.kt b/appcore/src/test/java/org/torproject/android/core/ExampleUnitTest.kt deleted file mode 100644 index 9b2de166..00000000 --- a/appcore/src/test/java/org/torproject/android/core/ExampleUnitTest.kt +++ /dev/null @@ -1,17 +0,0 @@ -package org.torproject.android.core - -import org.junit.Test - -import org.junit.Assert.* - -/** - * Example local unit test, which will execute on the development machine (host). - * - * See [testing documentation](http://d.android.com/tools/testing). - */ -class ExampleUnitTest { - @Test - fun addition_isCorrect() { - assertEquals(4, 2 + 2) - } -} \ No newline at end of file diff --git a/build.gradle b/build.gradle index b088404e..ecb8ab1f 100644 --- a/build.gradle +++ b/build.gradle @@ -2,7 +2,6 @@ buildscript { ext { kotlin_version = '1.5.20' - palette_version = "1.0.0" } repositories { mavenCentral() diff --git a/commons-device.gradle b/commons-device.gradle index 3a9a0faa..0fd02b1a 100644 --- a/commons-device.gradle +++ b/commons-device.gradle @@ -67,4 +67,3 @@ repositories { } } - diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml new file mode 100644 index 00000000..bcf9ea29 --- /dev/null +++ b/gradle/libs.versions.toml @@ -0,0 +1,55 @@ +[versions] +android-material-version = "1.4.0" +android-shell-version = "1.0.0" +android-snowfall-version = "1.2.1" +android-volley-version = "1.2.0" + +androidx-appcompat-version = "1.3.1" +androidx-constraint-layout-version = "2.1.0" +androidx-coordinator-layout-version = "1.1.0" +androidx-core-version = "1.6.0" +androidx-leanback-version = "1.2.0-alpha01" +androidx-leanback-paging-version = "1.1.0-alpha08" +androidx-leanback-tab-version = "1.1.0-beta01" +androidx-localbroadcast-version = "1.0.0" +androidx-palette-version= "1.0.0" +androidx-recyclerview-version = "1.2.1" + +apl-appintro-version = "v4.2.2" +bclogic-pulsator-version = "1.0.3" +fastlane-screengrab-version = "1.2.0" +guardian-jsocks-version = "1.0.4" +guardian-jtorctl-version = "0.4.5.7" +ipt-proxy-version = "1.0.0" +portmapper-version = "2.0.5" +tor-android-version = "0.4.5.9" + +[libraries] +android-material = { module = "com.google.android.material:material", version.ref = "android-material-version" } +android-shell = { module = "com.jaredrummler:android-shell", version.ref = "android-shell-version" } +android-snowfall = { module = "com.github.jetradarmobile:android-snowfall", version.ref = "android-snowfall-version" } +android-volley = { module = "com.android.volley:volley", version.ref = "android-volley-version" } + +androidx-appcompat = { module = "androidx.appcompat:appcompat", version.ref = "androidx-appcompat-version" } +androidx-constraint-layout = { module = "androidx.constraintlayout:constraintlayout", version.ref = "androidx-constraint-layout-version" } +androidx-coordinator-layout = { module = "androidx.coordinatorlayout:coordinatorlayout", version.ref = "androidx-coordinator-layout-version" } +androidx-core = { module = "androidx.core:core", version.ref = "androidx-core-version" } +androidx-leanback-core = { module = "androidx.leanback:leanback", version.ref = "androidx-leanback-version" } +androidx-leanback-paging = { module = "androidx.leanback:leanback-paging", version.ref = "androidx-leanback-paging-version" } +androidx-leanback-preferences = { module = "androidx.leanback:leanback-preference", version.ref = "androidx-leanback-version" } +androidx-leanback-tab = { module = "androidx.leanback:leanback-tab", version.ref = "androidx-leanback-tab-version" } +androidx-localbroadcast = { module = "androidx.localbroadcastmanager:localbroadcastmanager", version.ref = "androidx-localbroadcast-version" } +androidx-palette = { module = "androidx.palette:palette", version.ref = "androidx-palette-version" } +androidx-recyclerview = { module = "androidx.recyclerview:recyclerview", version.ref = "androidx-recyclerview-version" } + +apl-appintro = { module = "com.github.apl-devs:appintro", version.ref = "apl-appintro-version" } +bclogic-pulsator = { module = "pl.bclogic:pulsator4droid", version.ref = "bclogic-pulsator-version" } +fastlane-screengrab = { module = "tools.fastlane:screengrab", version.ref = "fastlane-screengrab-version" } +guardian-jsocks = { module = "com.gitlab.guardianproject:jsocksandroid", version.ref = "guardian-jsocks-version" } +guardian-jtorctl = { module = "info.guardianproject:jtorctl", version.ref = "guardian-jtorctl-version" } +ipt-proxy = { module = "com.github.tladesignz:IPtProxy", version.ref = "ipt-proxy-version" } +portmapper = { module = "com.offbynull.portmapper:portmapper", version.ref = "portmapper-version" } +tor-android = { module = "info.guardianproject:tor-android", version.ref = "tor-android-version" } + +[bundles] +leanback= ["androidx-leanback-core", "androidx-leanback-paging", "androidx-leanback-preferences", "androidx-leanback-tab"] \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index e1e2fd2c..6879d9ec 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionSha256Sum=13bf8d3cf8eeeb5770d19741a59bde9bd966dd78d17f1bbad787a05ef19d1c2d -distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-all.zip +distributionSha256Sum=9bb8bc05f562f2d42bdf1ba8db62f6b6fa1c3bf6c392228802cc7cb0578fe7e0 +distributionUrl=https://services.gradle.org/distributions/gradle-7.1.1-all.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/intentintegrator/build.gradle b/intentintegrator/build.gradle index 624b09e1..ad612112 100644 --- a/intentintegrator/build.gradle +++ b/intentintegrator/build.gradle @@ -18,5 +18,5 @@ android { dependencies { implementation fileTree(dir: "libs", include: ["*.jar"]) - implementation 'androidx.appcompat:appcompat:1.3.1' + libs.androidx.appcompat } \ No newline at end of file diff --git a/orbotservice/build.gradle b/orbotservice/build.gradle index 3543593b..2f7080c9 100644 --- a/orbotservice/build.gradle +++ b/orbotservice/build.gradle @@ -38,17 +38,14 @@ android { } dependencies { - api 'info.guardianproject:jtorctl:0.4.5.7' + api libs.guardian.jtorctl implementation( - 'androidx.core:core:1.6.0', - 'androidx.localbroadcastmanager:localbroadcastmanager:1.0.0', - 'com.github.tladesignz:IPtProxy:1.0.0', - 'com.gitlab.guardianproject:jsocksandroid:1.0.4', - 'com.jaredrummler:android-shell:1.0.0', - 'com.offbynull.portmapper:portmapper:2.0.5', - 'info.guardianproject:geoip:20191217', - 'info.guardianproject:tor-android:0.4.5.9', - + libs.android.shell, + libs.androidx.core, + libs.androidx.localbroadcast, + libs.ipt.proxy, + libs.guardian.jsocks, + libs.portmapper, + libs.tor.android ) - testImplementation 'junit:junit:4.13.2' } diff --git a/settings.gradle b/settings.gradle index 2decf04b..67697f75 100644 --- a/settings.gradle +++ b/settings.gradle @@ -2,3 +2,12 @@ include ':intentintegrator' include ':appcore' include ':orbotservice' include ':app',':app-mini', ':app-tv' + +enableFeaturePreview("VERSION_CATALOGS") +dependencyResolutionManagement { + versionCatalogs { + lib { + from(files("./gradle/libs.versions.toml")) + } + } +} \ No newline at end of file

1 0

[orbot/master] Remove typo
by n8fr8＠torproject.org 22 Dec '21

22 Dec '21

commit 8ed64e611519de74100a65cddfff0aab5293f1d9 Author: sisbell <shane.isbell(a)gmail.com> Date: Mon Aug 2 21:46:53 2021 -0700 Remove typo --- app/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/build.gradle b/app/build.gradle index a2d4345f..c57707c8 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -66,7 +66,7 @@ android { libs.android.material, libs.bclogic.pulsator, libs.guardian.jtorctl, - libs.ipt.proxy\ + libs.ipt.proxy ) androidTestImplementation libs.fastlane.screengrab

1 0

[orbot/master] Merge branch 'vpn_blocklist' of https://github.com/bitmold/orbot into bitmold-vpn_blocklist
by n8fr8＠torproject.org 22 Dec '21

22 Dec '21

commit a85658355877a3c97f403ed56d36e5191fccad08 Merge: 81d25780 9759e94f Author: n8fr8 <nathan(a)guardianproject.info> Date: Wed Aug 11 16:30:05 2021 -0400 Merge branch 'vpn_blocklist' of https://github.com/bitmold/orbot into bitmold-vpn_blocklist .../java/org/torproject/android/ui/AppManagerActivity.java | 9 +++++++-- .../org/torproject/android/service/vpn/OrbotVpnManager.java | 5 +++-- .../org/torproject/android/service/vpn/TorifiedApp.java | 13 +++++-------- .../java/org/torproject/android/service/vpn/VpnPrefs.java | 10 ++++++++++ 4 files changed, 25 insertions(+), 12 deletions(-)

1 0

[orbot/master] remove debug commandline for pdnsd (doesn't work)
by n8fr8＠torproject.org 22 Dec '21

22 Dec '21

commit 2697c93cda336eaf08801616f147c4d428490b12 Author: n8fr8 <nathan(a)guardianproject.info> Date: Wed Aug 11 16:28:11 2021 -0400 remove debug commandline for pdnsd (doesn't work) --- .../main/java/org/torproject/android/service/vpn/OrbotVpnManager.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/orbotservice/src/main/java/org/torproject/android/service/vpn/OrbotVpnManager.java b/orbotservice/src/main/java/org/torproject/android/service/vpn/OrbotVpnManager.java index 0ef9acfa..1009da30 100644 --- a/orbotservice/src/main/java/org/torproject/android/service/vpn/OrbotVpnManager.java +++ b/orbotservice/src/main/java/org/torproject/android/service/vpn/OrbotVpnManager.java @@ -360,10 +360,8 @@ public class OrbotVpnManager implements Handler.Callback { } private void startDNS(String pdnsPath, String torDnsHost, int torDnsPort, String pdnsdHost, int pdnsdPort) throws IOException, TimeoutException { - // String debugEnabledCmd = ""; String debugEnabledConf = "off"; if (Prefs.useDebugLogging()) { - // debugEnabledCmd = "-g"; debugEnabledConf = "on"; }

1 0

[orbot/master] remove command line debug commands (don't work, cause failed pdnsd startup)
by n8fr8＠torproject.org 22 Dec '21

22 Dec '21

commit e8a6e14f09991e2c9a908c66367cfc315023f282 Author: n8fr8 <nathan(a)guardianproject.info> Date: Wed Aug 11 15:47:08 2021 -0400 remove command line debug commands (don't work, cause failed pdnsd startup) --- .../org/torproject/android/service/vpn/OrbotVpnManager.java | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/orbotservice/src/main/java/org/torproject/android/service/vpn/OrbotVpnManager.java b/orbotservice/src/main/java/org/torproject/android/service/vpn/OrbotVpnManager.java index 0f20b1c6..0ef9acfa 100644 --- a/orbotservice/src/main/java/org/torproject/android/service/vpn/OrbotVpnManager.java +++ b/orbotservice/src/main/java/org/torproject/android/service/vpn/OrbotVpnManager.java @@ -360,16 +360,16 @@ public class OrbotVpnManager implements Handler.Callback { } private void startDNS(String pdnsPath, String torDnsHost, int torDnsPort, String pdnsdHost, int pdnsdPort) throws IOException, TimeoutException { - String debugEnabledCmd = ""; + // String debugEnabledCmd = ""; String debugEnabledConf = "off"; if (Prefs.useDebugLogging()) { - debugEnabledCmd = "-g"; + // debugEnabledCmd = "-g"; debugEnabledConf = "on"; } File fileConf = makePdnsdConf(mService, mService.getFilesDir(), torDnsHost, torDnsPort, pdnsdHost, pdnsdPort, debugEnabledConf); - String[] cmdString = {pdnsPath, "-c", fileConf.toString(), debugEnabledCmd, "-v2"}; + String[] cmdString = {pdnsPath, "-c", fileConf.toString(), "-v2"}; ProcessBuilder pb = new ProcessBuilder(cmdString); pb.redirectErrorStream(true); Process proc = pb.start(); @@ -387,6 +387,11 @@ public class OrbotVpnManager implements Handler.Callback { while ((line = br.readLine()) != null) { Log.d(TAG, "pdnsd: " + line); } + + br = new BufferedReader(new InputStreamReader(proc.getErrorStream())); + while ((line = br.readLine()) != null) { + Log.d(TAG, "pdnsd ERROR: " + line); + } }

1 0