- tor-commits - lists.torproject.org

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

22 Dec '21

commit e6c9d98556bf65a5932379f69e63ce996e01d159 Author: Nikita Epifanov <nikgreens(a)protonmail.com> Date: Thu Aug 5 19:34:07 2021 +0200 Translated using Weblate (Russian) Currently translated at 100.0% (222 of 222 strings) Co-authored-by: Nikita Epifanov <nikgreens(a)protonmail.com> Translate-URL: https://hosted.weblate.org/projects/guardianproject/orbot/ru/ Translation: Guardian Project/Orbot --- app/src/main/res/values-ru/strings.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index e2ff399f..fd97674d 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -229,4 +229,5 @@ <string name="kibibyte">KiB</string> <string name="deny">Отказать</string> <string name="allow">Разрешить</string> + <string name="snowflake_proxy_enabled">РЕЖИМ SNOWFLAKE PROXY ВКЛЮЧЕН</string> </resources> \ No newline at end of file

1 0

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

22 Dec '21

commit 3943b9d962652b298c028ea8061bd1b471ac501d Merge: f3a83d6e ef8a8f1d Author: n8fr8 <nathan(a)guardianproject.info> Date: Mon Aug 9 14:01:07 2021 -0400 Merge branch '505' of https://github.com/sisbell/orbot into sisbell-505 .../android/ui/onboarding/CustomBridgesActivity.java | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-)

1 0

[orbot/master] remove unsupported string locale
by n8fr8＠torproject.org 22 Dec '21

22 Dec '21

commit f3a83d6e529bf116668cb263d58e2181f12b6b21 Author: n8fr8 <nathan(a)guardianproject.info> Date: Mon Aug 9 13:59:01 2021 -0400 remove unsupported string locale --- app-tv/src/main/res/values-rs-rAR/strings.xml | 30 --------------------------- 1 file changed, 30 deletions(-) diff --git a/app-tv/src/main/res/values-rs-rAR/strings.xml b/app-tv/src/main/res/values-rs-rAR/strings.xml deleted file mode 100644 index 8926b94e..00000000 --- a/app-tv/src/main/res/values-rs-rAR/strings.xml +++ /dev/null @@ -1,30 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<resources> - <string name="app_name">Orbot</string> - <string name="status_starting_up">Orbot está iniciándose…</string> - <string name="status_activated">Conectado a la red Tor</string> - <string name="status_disabled">\"Orbot está Desactivado</string> - <string name="status_shutting_down">Orbot se está apagando</string> - <string name="menu_settings">Configuración</string> - <string name="menu_log">Registro</string> - <string name="menu_start">Iniciar</string> - <string name="menu_stop">Detener</string> - <string name="menu_about">Acerca de</string> - <string name="button_about">Acerca de</string> - <string name="menu_exit">Salir</string> -  -  - <string name="pref_general_group">General</string> -  -  -  -  -  - - - - -  -  -</resources>

1 0

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

22 Dec '21

commit 91f0fc4c5bb36528500e2c49db813ffcf6acd6f9 Merge: 9376a33f c1fdff65 Author: n8fr8 <nathan(a)guardianproject.info> Date: Mon Aug 9 14:07:39 2021 -0400 Merge branch 'missing_vpn_icons' of https://github.com/bitmold/orbot into 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] Fixes #498, Not performant because pref data isn't migrated
by n8fr8＠torproject.org 22 Dec '21

22 Dec '21

commit d8a446431b1548c923fe21779ffd585093905039 Author: bim <dsnake(a)protonmail.com> Date: Sat Aug 7 19:08:35 2021 -0400 Fixes #498, Not performant because pref data isn't migrated --- .../org/torproject/android/OrbotMainActivity.java | 114 ++++++++++----------- .../torproject/android/ui/AppManagerActivity.java | 24 +---- app/src/main/res/layout/layout_main.xml | 38 ++++++- .../android/service/vpn/OrbotVpnManager.java | 1 - .../android/service/vpn/TorifiedApp.java | 13 +++ 5 files changed, 103 insertions(+), 87 deletions(-) diff --git a/app/src/main/java/org/torproject/android/OrbotMainActivity.java b/app/src/main/java/org/torproject/android/OrbotMainActivity.java index df899d70..0869d140 100644 --- a/app/src/main/java/org/torproject/android/OrbotMainActivity.java +++ b/app/src/main/java/org/torproject/android/OrbotMainActivity.java @@ -15,6 +15,7 @@ import android.content.IntentFilter; import android.content.SharedPreferences; import android.content.SharedPreferences.Editor; import android.content.pm.ApplicationInfo; +import android.content.pm.PackageInfo; import android.content.pm.PackageManager; import android.database.Cursor; import android.net.Uri; @@ -35,8 +36,10 @@ import android.widget.AdapterView; import android.widget.AdapterView.OnItemSelectedListener; import android.widget.ArrayAdapter; import android.widget.Button; +import android.widget.HorizontalScrollView; import android.widget.ImageView; import android.widget.LinearLayout; +import android.widget.ScrollView; import android.widget.Spinner; import android.widget.TextView; import android.widget.Toast; @@ -62,6 +65,7 @@ import org.torproject.android.service.OrbotService; import org.torproject.android.service.TorServiceConstants; import org.torproject.android.service.util.Prefs; import org.torproject.android.service.util.Utils; +import org.torproject.android.service.vpn.TorifiedApp; import org.torproject.android.service.vpn.VpnPrefs; import org.torproject.android.ui.AppManagerActivity; import org.torproject.android.ui.dialog.AboutDialogFragment; @@ -83,8 +87,10 @@ import java.net.URLDecoder; import java.text.NumberFormat; import java.util.ArrayList; import java.util.Date; +import java.util.List; import java.util.Locale; import java.util.StringTokenizer; +import java.util.stream.Collectors; import pl.bclogic.pulsator4droid.library.PulsatorLayout; @@ -134,9 +140,11 @@ public class OrbotMainActivity extends AppCompatActivity implements OrbotConstan private SwitchCompat mBtnBridges; private Spinner spnCountries; private DrawerLayout mDrawer; + private TextView tvVpnAppStatus; /* Some tracking bits */ private String torStatus = null; //latest status reported from the tor service private Intent lastStatusIntent; // the last ACTION_STATUS Intent received + /** * The state and log info from {@link OrbotService} are sent to the UI here in * the form of a local broadcast. Regular broadcasts can be sent by any app, @@ -343,6 +351,8 @@ public class OrbotMainActivity extends AppCompatActivity implements OrbotConstan setCountrySpinner(); mPulsator = findViewById(R.id.pulsator); + tvVpnAppStatus = findViewById(R.id.tvVpnAppStatus); + findViewById(R.id.ivAppVpnSettings).setOnClickListener(v -> startActivityForResult(new Intent(OrbotMainActivity.this, AppManagerActivity.class), REQUEST_VPN_APPS_SELECT)); } private void resetBandwidthStatTextviews() { @@ -1088,79 +1098,61 @@ public class OrbotMainActivity extends AppCompatActivity implements OrbotConstan } } - private void drawAppShortcuts(boolean showSelectedApps) { + private void drawAppShortcuts(boolean vpnEnabled) { + HorizontalScrollView llBoxShortcuts = findViewById(R.id.llBoxShortcuts); if (!PermissionManager.isLollipopOrHigher()) { - findViewById(R.id.boxVpnStatus).setVisibility(View.GONE); + findViewById(R.id.llVpn).setVisibility(View.GONE); return; } - - LinearLayout llBoxShortcuts = findViewById(R.id.boxAppShortcuts); - - PackageManager pMgr = getPackageManager(); - - llBoxShortcuts.removeAllViews(); - - if (showSelectedApps) { - ArrayList<String> pkgIds = new ArrayList<>(); - String tordAppString = mPrefs.getString(PREFS_KEY_TORIFIED, ""); - - if (TextUtils.isEmpty(tordAppString)) { - addFullDeviceVpnView(llBoxShortcuts); - } else { - StringTokenizer st = new StringTokenizer(tordAppString, "|"); - while (st.hasMoreTokens() && pkgIds.size() < 4) - pkgIds.add(st.nextToken()); - int appsAdded = 0; - for (final String pkgId : pkgIds) { - try { - ApplicationInfo aInfo = getPackageManager().getApplicationInfo(pkgId, 0); - // skip disabled packages - if (!aInfo.enabled) continue; - ImageView iv = new ImageView(this); - 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(pMgr.getApplicationIcon(pkgId)); - iv.setOnClickListener(v -> openBrowser(URL_TOR_CHECK, false, pkgId)); - llBoxShortcuts.addView(iv); - appsAdded++; - } catch (Exception e) { - //package not installed? - } + if (!vpnEnabled) { + llBoxShortcuts.setVisibility(View.GONE); + tvVpnAppStatus.setText(R.string.vpn_disabled); + tvVpnAppStatus.setVisibility(View.VISIBLE); + return; + } + String tordAppString = mPrefs.getString(PREFS_KEY_TORIFIED, ""); + if (TextUtils.isEmpty(tordAppString)) { + drawFullDeviceVpn(); + } else { + PackageManager packageManager = getPackageManager(); + 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; + try { + String pkgId = app.getPackageName(); + ImageView iv = new ImageView(this); + 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++; + } catch (PackageManager.NameNotFoundException e) { + e.printStackTrace(); } - if (appsAdded == 0) { + } + if (appsAdded == 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 */ - addFullDeviceVpnView(llBoxShortcuts); - } + drawFullDeviceVpn(); } - } else { - TextView tv = new TextView(this); - LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(LinearLayout.LayoutParams.WRAP_CONTENT, LinearLayout.LayoutParams.WRAP_CONTENT); - params.setMargins(12, 3, 3, 3); - tv.setLayoutParams(params); - tv.setText(R.string.vpn_disabled); - llBoxShortcuts.addView(tv); } - //now add app edit/add shortcut - ImageView iv = new ImageView(this); - 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(ResourcesCompat.getDrawable(getResources(), R.drawable.ic_settings_white_24dp, null)); - llBoxShortcuts.addView(iv); - iv.setOnClickListener(v -> startActivityForResult(new Intent(OrbotMainActivity.this, AppManagerActivity.class), REQUEST_VPN_APPS_SELECT)); } - private void addFullDeviceVpnView(LinearLayout llBoxShortcuts) { - TextView tv = new TextView(this); - LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(LinearLayout.LayoutParams.WRAP_CONTENT, LinearLayout.LayoutParams.WRAP_CONTENT); - params.setMargins(12, 3, 3, 3); - tv.setLayoutParams(params); - tv.setText(R.string.full_device_vpn); - llBoxShortcuts.addView(tv); + private void drawFullDeviceVpn() { + findViewById(R.id.llBoxShortcuts).setVisibility(View.GONE); + tvVpnAppStatus.setText(R.string.full_device_vpn); + tvVpnAppStatus.setVisibility(View.VISIBLE); } @SuppressLint("SetWorldReadable") 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 6cb0e032..ccc6aa97 100644 --- a/app/src/main/java/org/torproject/android/ui/AppManagerActivity.java +++ b/app/src/main/java/org/torproject/android/ui/AppManagerActivity.java @@ -113,16 +113,7 @@ public class AppManagerActivity extends AppCompatActivity implements OnClickList if (mApps == null) mApps = getApps(mPrefs); - Collections.sort(mApps, (o1, o2) -> { - /* Some apps start with lowercase letters and without the sorting being case - insensitive they'd appear at the end of the grid of apps, a position where users - would likely not expect to find them. - */ - if (o1.isTorified() == o2.isTorified()) - return o1.getName().compareToIgnoreCase(o2.getName()); - if (o1.isTorified()) return -1; - return 1; - }); + TorifiedApp.sortAppsForTorifiedAndAbc(mApps); final LayoutInflater inflater = getLayoutInflater(); @@ -198,7 +189,6 @@ public class AppManagerActivity extends AppCompatActivity implements OnClickList } public ArrayList<TorifiedApp> getApps(SharedPreferences prefs) { - String tordAppString = prefs.getString(PREFS_KEY_TORIFIED, ""); String[] tordApps; @@ -210,22 +200,14 @@ public class AppManagerActivity extends AppCompatActivity implements OnClickList tordApps[tordIdx++] = st.nextToken(); } Arrays.sort(tordApps); - List<ApplicationInfo> lAppInfo = pMgr.getInstalledApplications(0); - Iterator<ApplicationInfo> itAppInfo = lAppInfo.iterator(); - ArrayList<TorifiedApp> apps = new ArrayList<>(); - ApplicationInfo aInfo; - - TorifiedApp app; - while (itAppInfo.hasNext()) { - aInfo = itAppInfo.next(); + ApplicationInfo aInfo = itAppInfo.next(); if (!includeAppInUi(aInfo)) continue; - app = new TorifiedApp(); - + TorifiedApp app = new TorifiedApp(); try { PackageInfo pInfo = pMgr.getPackageInfo(aInfo.packageName, PackageManager.GET_PERMISSIONS); diff --git a/app/src/main/res/layout/layout_main.xml b/app/src/main/res/layout/layout_main.xml index 5cba751e..ed72ee7e 100644 --- a/app/src/main/res/layout/layout_main.xml +++ b/app/src/main/res/layout/layout_main.xml @@ -283,13 +283,43 @@ android:text="@string/app_shortcuts" /> <LinearLayout - android:id="@+id/boxAppShortcuts" + android:orientation="horizontal" + android:id="@+id/llVpn" android:layout_width="wrap_content" - android:layout_height="wrap_content" android:gravity="center" - android:orientation="horizontal" + android:padding="3dp" android:minHeight="200dp" - android:padding="3dp" /> + android:weightSum="100" + android:layout_height="wrap_content"> + + <HorizontalScrollView + android:layout_weight="95" + android:layout_margin="3dp" + android:id="@+id/llBoxShortcuts" + android:layout_width="wrap_content" + android:layout_height="wrap_content"> + <LinearLayout + android:orientation="horizontal" + android:id="@+id/llBoxShortcutsInner" + android:layout_width="match_parent" + android:layout_height="match_parent"/> + </HorizontalScrollView> + + <TextView + android:layout_weight="95" + android:id="@+id/tvVpnAppStatus" + android:text="@string/full_device_vpn" + android:layout_margin="3dp" + android:layout_width="wrap_content" + android:layout_height="wrap_content"/> + <ImageView + android:layout_weight="5" + android:id="@+id/ivAppVpnSettings" + android:src="@drawable/ic_settings_white_24dp" + android:layout_margin="3dp" + android:layout_width="wrap_content" + android:layout_height="wrap_content"/> + </LinearLayout> </LinearLayout> 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 9ebc869d..0f20b1c6 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 @@ -27,7 +27,6 @@ import android.os.Build; import android.os.Handler; import android.os.Message; import android.os.ParcelFileDescriptor; -import android.text.TextUtils; import android.util.Log; import android.widget.Toast; 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 b7bc01e6..dedf743e 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 @@ -126,6 +126,19 @@ public class TorifiedApp implements Comparable { return apps; } + public static void sortAppsForTorifiedAndAbc(List<TorifiedApp> apps) { + Collections.sort(apps, (o1, o2) -> { + /* Some apps start with lowercase letters and without the sorting being case + insensitive they'd appear at the end of the grid of apps, a position where users + would likely not expect to find them. + */ + if (o1.isTorified() == o2.isTorified()) + return o1.getName().compareToIgnoreCase(o2.getName()); + if (o1.isTorified()) return -1; + return 1; + }); + } + public boolean usesInternet() { return usesInternet; }

1 0

[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