tor-commits April 2020

tor-commits@lists.torproject.org

25 participants
2156 discussions

[orbot/master] also build universal APK to allow for users who don't know which to use
by n8fr8＠torproject.org 28 Apr '20

28 Apr '20

commit aaa8df42a8a9fa0b9fbc168ce0d59c93ed8462ac Author: n8fr8 <nathan(a)guardianproject.info> Date: Tue Feb 4 13:23:03 2020 -0500 also build universal APK to allow for users who don't know which to use --- app/build.gradle | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 0b725341..20707251 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -73,19 +73,20 @@ android { minSdkVersion 16 applicationId 'org.torproject.android' targetSdkVersion 28 - versionCode 16132000 + versionCode 16141000 versionName getVersionName() archivesBaseName = "Orbot-$versionName" } + /** appmax { dimension "free" minSdkVersion 16 applicationId 'org.torproject.android.max' targetSdkVersion 28 - versionCode 16132000 + versionCode 16141000 versionName getVersionName() archivesBaseName = "orbotMAX-$versionName" - } + }**/ } splits { @@ -106,7 +107,7 @@ android { include "x86", "armeabi-v7a", "x86_64", "arm64-v8a" // Specifies that we do not want to also generate a universal APK that includes all ABIs. - universalApk false + universalApk true }

1 0

[orbot/master] Merge branch 'master' of gitlab.com:guardianproject/orbot
by n8fr8＠torproject.org 28 Apr '20

28 Apr '20

commit ea556bb9e3b08dcf99dc1c607814c65ae9aaf781 Merge: d38e9e1a 57e3ee1b Author: n8fr8 <nathan(a)guardianproject.info> Date: Tue Jan 28 15:48:48 2020 -0500 Merge branch 'master' of gitlab.com:guardianproject/orbot .../java/org/torproject/android/service/util/ExternalIPFetcher.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --cc orbotservice/src/main/java/org/torproject/android/service/util/ExternalIPFetcher.java index 080ed961,e9a9b575..698f02af --- a/orbotservice/src/main/java/org/torproject/android/service/util/ExternalIPFetcher.java +++ b/orbotservice/src/main/java/org/torproject/android/service/util/ExternalIPFetcher.java @@@ -2,8 -2,8 +2,9 @@@ package org.torproject.android.service. import org.json.JSONArray; import org.json.JSONObject; +import org.torproject.android.service.OrbotService; import org.torproject.android.service.TorEventHandler; + import org.torproject.android.service.OrbotService; import java.io.BufferedReader; import java.io.InputStream; @@@ -92,4 -92,4 +93,4 @@@ public class ExternalIPFetcher implemen } --} ++}

1 0

[orbot/master] improve killing of orphaned tor process
by n8fr8＠torproject.org 28 Apr '20

28 Apr '20

commit d38e9e1a819f39fcef9b7ff7ca217f006cd722f9 Author: n8fr8 <nathan(a)guardianproject.info> Date: Tue Jan 28 14:30:29 2020 -0500 improve killing of orphaned tor process --- .../torproject/android/service/OrbotService.java | 21 +++++- .../android/service/TorEventHandler.java | 2 +- .../android/service/TorServiceConstants.java | 1 + .../android/service/util/ExternalIPFetcher.java | 6 +- .../torproject/android/service/vpn/VpnUtils.java | 74 +++++++++++++--------- 5 files changed, 69 insertions(+), 35 deletions(-) diff --git a/orbotservice/src/main/java/org/torproject/android/service/OrbotService.java b/orbotservice/src/main/java/org/torproject/android/service/OrbotService.java index afe8b008..f806e42a 100644 --- a/orbotservice/src/main/java/org/torproject/android/service/OrbotService.java +++ b/orbotservice/src/main/java/org/torproject/android/service/OrbotService.java @@ -44,6 +44,7 @@ import com.jaredrummler.android.shell.CommandResult; import net.freehaven.tor.control.ConfigEntry; import net.freehaven.tor.control.TorControlConnection; +import org.apache.commons.io.IOUtils; import org.torproject.android.service.util.CustomShell; import org.torproject.android.service.util.CustomTorResourceInstaller; import org.torproject.android.service.util.DummyActivity; @@ -109,7 +110,7 @@ public class OrbotService extends Service implements TorServiceConstants, OrbotC private ArrayList<String> configBuffer = null; private ArrayList<String> resetBuffer = null; - private File fileControlPort; + private File fileControlPort, filePid; private boolean mConnectivity = true; @@ -456,6 +457,7 @@ public class OrbotService extends Service implements TorServiceConstants, OrbotC private void killAllDaemons() throws Exception { + if (conn != null) { logNotice("Using control port to shutdown Tor"); @@ -470,6 +472,18 @@ public class OrbotService extends Service implements TorServiceConstants, OrbotC conn = null; } + if (mLastProcessId != -1) + killProcess(mLastProcessId + "", "-9"); + + if (filePid != null && filePid.exists()) + { + List<String> lines = IOUtils.readLines(new FileReader(filePid)); + String torPid = lines.get(0); + killProcess(torPid,"-9"); + + } + + // if that fails, try again using native utils try { killProcess(fileTor, "-9"); // this is -HUP @@ -523,6 +537,7 @@ public class OrbotService extends Service implements TorServiceConstants, OrbotC fileTorRc = new File(appBinHome, TORRC_ASSET_KEY); fileControlPort = new File(getFilesDir(), TOR_CONTROL_PORT_FILE); + filePid = new File(getFilesDir(), TOR_PID_FILE); mHSBasePath = new File( getFilesDir().getAbsolutePath(), @@ -646,6 +661,8 @@ public class OrbotService extends Service implements TorServiceConstants, OrbotC extraLines.append("\n"); extraLines.append("ControlPortWriteToFile").append(' ').append(fileControlPort.getCanonicalPath()).append('\n'); + extraLines.append("PidFile").append(' ').append(filePid.getCanonicalPath()).append('\n'); + // extraLines.append("RunAsDaemon 1").append('\n'); // extraLines.append("AvoidDiskWrites 1").append('\n'); @@ -689,7 +706,7 @@ public class OrbotService extends Service implements TorServiceConstants, OrbotC extraLines.append("SocksListenAddress 0.0.0.0").append('\n'); - extraLines.append("HTTPTunnelPort ").append(checkPortOrAuto(HTTP_PROXY_PORT_DEFAULT)).append('\n'); + extraLines.append("HTTPTunnelPort ").append(httpPortPref).append('\n'); if(prefs.getBoolean(OrbotConstants.PREF_CONNECTION_PADDING, false)) { diff --git a/orbotservice/src/main/java/org/torproject/android/service/TorEventHandler.java b/orbotservice/src/main/java/org/torproject/android/service/TorEventHandler.java index 466c4323..def94fcf 100644 --- a/orbotservice/src/main/java/org/torproject/android/service/TorEventHandler.java +++ b/orbotservice/src/main/java/org/torproject/android/service/TorEventHandler.java @@ -215,7 +215,7 @@ public class TorEventHandler implements EventHandler, TorServiceConstants { if (node.ipAddress == null && (!node.isFetchingInfo) && Prefs.useDebugLogging()) { node.isFetchingInfo = true; - mService.exec(new ExternalIPFetcher(mService, node, TorService.mPortHTTP)); + mService.exec(new ExternalIPFetcher(mService, node, OrbotService.mPortHTTP)); } isFirstNode = false; 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 4962ac29..5776abe9 100644 --- a/orbotservice/src/main/java/org/torproject/android/service/TorServiceConstants.java +++ b/orbotservice/src/main/java/org/torproject/android/service/TorServiceConstants.java @@ -11,6 +11,7 @@ public interface TorServiceConstants { String DIRECTORY_TOR_DATA = "data"; String TOR_CONTROL_PORT_FILE = "control.txt"; + String TOR_PID_FILE = "torpid"; //torrc (tor config file) String TORRC_ASSET_KEY = "torrc"; diff --git a/orbotservice/src/main/java/org/torproject/android/service/util/ExternalIPFetcher.java b/orbotservice/src/main/java/org/torproject/android/service/util/ExternalIPFetcher.java index ae99e7de..080ed961 100644 --- a/orbotservice/src/main/java/org/torproject/android/service/util/ExternalIPFetcher.java +++ b/orbotservice/src/main/java/org/torproject/android/service/util/ExternalIPFetcher.java @@ -2,8 +2,8 @@ package org.torproject.android.service.util; import org.json.JSONArray; import org.json.JSONObject; +import org.torproject.android.service.OrbotService; import org.torproject.android.service.TorEventHandler; -import org.torproject.android.service.TorService; import java.io.BufferedReader; import java.io.InputStream; @@ -15,12 +15,12 @@ import java.net.URLConnection; public class ExternalIPFetcher implements Runnable { - private TorService mService; + private OrbotService mService; private TorEventHandler.Node mNode; private final static String ONIONOO_BASE_URL = "https://onionoo.torproject.org/details?fields=country_name,as_name,or_addre…"; private int mLocalHttpProxyPort = 8118; - public ExternalIPFetcher (TorService service, TorEventHandler.Node node, int localProxyPort ) + public ExternalIPFetcher (OrbotService service, TorEventHandler.Node node, int localProxyPort ) { mService = service; mNode = node; diff --git a/orbotservice/src/main/java/org/torproject/android/service/vpn/VpnUtils.java b/orbotservice/src/main/java/org/torproject/android/service/vpn/VpnUtils.java index 5a9901ff..acc15316 100644 --- a/orbotservice/src/main/java/org/torproject/android/service/vpn/VpnUtils.java +++ b/orbotservice/src/main/java/org/torproject/android/service/vpn/VpnUtils.java @@ -1,5 +1,6 @@ package org.torproject.android.service.vpn; +import android.app.ActivityManager; import android.content.Context; import android.content.SharedPreferences; @@ -7,7 +8,9 @@ import java.io.BufferedReader; import java.io.File; import java.io.IOException; import java.io.InputStreamReader; +import java.util.List; +import static android.content.Context.ACTIVITY_SERVICE; import static java.lang.Runtime.getRuntime; import static org.torproject.android.service.vpn.VpnConstants.SHELL_CMD_PS; import static org.torproject.android.service.vpn.VpnPrefs.PREF_TOR_SHARED_PREFS; @@ -20,25 +23,32 @@ public class VpnUtils { } public static int findProcessId(String command) throws IOException { - Process procPs = getRuntime().exec(SHELL_CMD_PS); - BufferedReader reader = new BufferedReader(new InputStreamReader(procPs.getInputStream())); - String line; - while ((line = reader.readLine()) != null) { - if (!line.contains("PID") && line.contains(command)) { - String[] lineParts = line.split("\\s+"); - try { - return Integer.parseInt(lineParts[1]); //for most devices it is the second - } catch (NumberFormatException e) { - return Integer.parseInt(lineParts[0]); //but for samsungs it is the first - } finally { + String[] cmds = {"ps -ef","ps -A","toolbox ps","busybox ps"}; + + for (int i = 0; i < cmds.length;i++) { + Process procPs = getRuntime().exec(cmds[i]); + + BufferedReader reader = new BufferedReader(new InputStreamReader(procPs.getInputStream())); + + String line; + while ((line = reader.readLine()) != null) { + if (!line.contains("PID") && line.contains(command)) { + String[] lineParts = line.split("\\s+"); try { - procPs.destroy(); - } catch (Exception e) { + return Integer.parseInt(lineParts[1]); //for most devices it is the second + } catch (NumberFormatException e) { + return Integer.parseInt(lineParts[0]); //but for samsungs it is the first + } finally { + try { + procPs.destroy(); + } catch (Exception e) { + } } } } } + return -1; } @@ -46,18 +56,29 @@ public class VpnUtils { killProcess(fileProcBin, "-9"); // this is -KILL } - public static void killProcess(File fileProcBin, String signal) throws Exception { + public static int killProcess(File fileProcBin, String signal) throws Exception { + int procId = -1; int killAttempts = 0; - while ((procId = findProcessId(fileProcBin.getCanonicalPath())) != -1) { + while ((procId = findProcessId(fileProcBin.getName())) != -1) { killAttempts++; String pidString = String.valueOf(procId); - try { - getRuntime().exec("busybox killall " + signal + " " + fileProcBin.getName - ()); - } catch (IOException ioe) { + + String[] cmds = {"","busybox ","toolbox "}; + + for (int i = 0; i < cmds.length;i++) { + try { + getRuntime().exec(cmds[i] + "killall " + signal + " " + fileProcBin.getName + ()); + } catch (IOException ioe) { + } + try { + getRuntime().exec(cmds[i] + "killall " + signal + " " + fileProcBin.getCanonicalPath()); + } catch (IOException ioe) { + } } + killProcess(pidString, signal); try { @@ -69,25 +90,20 @@ public class VpnUtils { if (killAttempts > 4) throw new Exception("Cannot kill: " + fileProcBin.getAbsolutePath()); } + + return procId; } public static void killProcess(String pidString, String signal) throws Exception { + String[] cmds = {"","busybox ","toolbox "}; + for (int i = 0; i < cmds.length;i++) { try { getRuntime().exec("toolbox kill " + signal + " " + pidString); } catch (IOException ioe) { } - try { - getRuntime().exec("busybox kill " + signal + " " + pidString); - } catch (IOException ioe) { - } - try { - getRuntime().exec("kill " + signal + " " + pidString); - } catch (IOException ioe) { - } - - + } }

1 0

[orbot/master] update build tools and versionCode to 16141100
by n8fr8＠torproject.org 28 Apr '20

28 Apr '20

commit c95502046e88f960899bc615f629d75f3aab4ad1 Author: n8fr8 <nathan(a)guardianproject.info> Date: Tue Feb 4 13:25:44 2020 -0500 update build tools and versionCode to 16141100 --- app/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 20707251..0eae2209 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -36,7 +36,7 @@ android { } compileSdkVersion 29 - buildToolsVersion '29.0.0' + buildToolsVersion '29.0.2' defaultConfig { applicationId "org.torproject.android" versionName getVersionName() @@ -73,7 +73,7 @@ android { minSdkVersion 16 applicationId 'org.torproject.android' targetSdkVersion 28 - versionCode 16141000 + versionCode 16141100 versionName getVersionName() archivesBaseName = "Orbot-$versionName" }

1 0

[orbot/master] handle service restarts with null intents
by n8fr8＠torproject.org 28 Apr '20

28 Apr '20

commit 1d2fa53f8e14bbeead395ea4fbb9f3dfd8c29eb3 Author: n8fr8 <nathan(a)guardianproject.info> Date: Tue Jan 28 16:23:40 2020 -0500 handle service restarts with null intents --- .../android/service/vpn/TorVpnService.java | 53 ++++++++++++---------- 1 file changed, 29 insertions(+), 24 deletions(-) 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 a6666474..688a8610 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 @@ -58,19 +58,38 @@ public class TorVpnService extends VpnService { */ public int onStartCommand(Intent intent, int flags, int startId) { - if (ACTION_START.equals(intent.getAction())) - { - LocalBroadcastManager lbm = LocalBroadcastManager.getInstance(this); - lbm.registerReceiver(mLocalBroadcastReceiver, - new IntentFilter(TorServiceConstants.LOCAL_ACTION_PORTS)); - } - else if (ACTION_STOP.equals(intent.getAction())) - { + String action = ACTION_START; + if (intent != null && intent.getAction() != null) + action = intent.getAction(); + + if (ACTION_START.equals(action)) { + + if (mLocalBroadcastReceiver == null) { + mLocalBroadcastReceiver = new BroadcastReceiver() { + + @Override + public void onReceive(Context context, Intent intent) { + String action = intent.getAction(); + if (action == null) + return; + + if (action.equals(TorServiceConstants.LOCAL_ACTION_PORTS)) { + + mVpnManager.handleIntent(new Builder(), intent); + } + } + }; + LocalBroadcastManager lbm = LocalBroadcastManager.getInstance(this); + lbm.registerReceiver(mLocalBroadcastReceiver, + new IntentFilter(TorServiceConstants.LOCAL_ACTION_PORTS)); + } + + } else if (ACTION_STOP.equals(action)) { Log.d(TAG, "clearing VPN Proxy"); Prefs.putUseVpn(false); - LocalBroadcastManager lbm = LocalBroadcastManager.getInstance(this); lbm.unregisterReceiver(mLocalBroadcastReceiver); + mLocalBroadcastReceiver = null; } mVpnManager.handleIntent(new Builder(), intent); @@ -82,7 +101,6 @@ public class TorVpnService extends VpnService { public void onDestroy() { super.onDestroy(); - } /** @@ -91,20 +109,7 @@ public class TorVpnService extends VpnService { * so local ones are used here so other apps cannot interfere with Orbot's * operation. */ - private BroadcastReceiver mLocalBroadcastReceiver = new BroadcastReceiver() { - - @Override - public void onReceive(Context context, Intent intent) { - String action = intent.getAction(); - if (action == null) - return; - - if (action.equals(TorServiceConstants.LOCAL_ACTION_PORTS)) { - - mVpnManager.handleIntent(new Builder(),intent); - } - } - }; + private BroadcastReceiver mLocalBroadcastReceiver = null; }

1 0

[orbot/master] Merge branch 'eighthave-rename-to-OrbotService'
by n8fr8＠torproject.org 28 Apr '20

28 Apr '20

commit ca7394f2f409df2ce9f6072d153a432f3b530de6 Merge: 200c4045 b3d747e4 Author: n8fr8 <nathan(a)guardianproject.info> Date: Tue Dec 17 16:16:42 2019 -0500 Merge branch 'eighthave-rename-to-OrbotService' app-mini/src/debug/AndroidManifest.xml | 2 +- app-mini/src/main/AndroidManifest.xml | 2 +- .../torproject/android/mini/MiniMainActivity.java | 54 +++++++++++----------- .../torproject/android/mini/OnBootReceiver.java | 12 ++--- .../android/mini/vpn/VPNEnableActivity.java | 12 ++--- app/src/main/AndroidManifest.xml | 2 +- .../org/torproject/android/OnBootReceiver.java | 12 ++--- .../org/torproject/android/OrbotMainActivity.java | 50 ++++++++++---------- .../torproject/android/ui/VPNEnableActivity.java | 12 ++--- .../service/{TorService.java => OrbotService.java} | 10 ++-- .../android/service/StartTorReceiver.java | 6 +-- .../android/service/TorEventHandler.java | 4 +- .../android/service/vpn/OrbotVpnManager.java | 6 +-- .../android/service/vpn/TorVpnService.java | 4 +- 14 files changed, 94 insertions(+), 94 deletions(-)

1 0

[orbot/master] update gradle builds
by n8fr8＠torproject.org 28 Apr '20

28 Apr '20

commit 2b97df381107aece0227b940f8fea6be5d17bc9c Author: n8fr8 <nathan(a)guardianproject.info> Date: Tue Oct 29 09:38:12 2019 -0400 update gradle builds --- app/build.gradle | 9 +++++++++ build.gradle | 2 +- orbotservice/build.gradle | 3 +-- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index d2e485fb..73426289 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -62,6 +62,15 @@ android { versionName '16.1.2-RC-2-tor-0.4.1.5-rc' archivesBaseName = "Orbot-$versionName" } + appmax { + dimension "free" + minSdkVersion 16 + applicationId 'org.torproject.android.max' + targetSdkVersion 28 + versionCode 16123000 + versionName '16.1.2-RC-2-tor-0.4.1.5-rc' + archivesBaseName = "orbotMAX-$versionName" + } } splits { diff --git a/build.gradle b/build.gradle index e75c784c..2d5b3312 100644 --- a/build.gradle +++ b/build.gradle @@ -5,7 +5,7 @@ buildscript { google() } dependencies { - classpath 'com.android.tools.build:gradle:3.5.0' + classpath 'com.android.tools.build:gradle:3.5.1' } } diff --git a/orbotservice/build.gradle b/orbotservice/build.gradle index b2e3418c..a3167d4d 100644 --- a/orbotservice/build.gradle +++ b/orbotservice/build.gradle @@ -37,12 +37,11 @@ android { dependencies { - implementation 'org.torproject:tor-android-binary:0.4.1.5-rc' + implementation 'org.torproject:tor-android-binary:0.4.0.4-rc' 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' - implementation 'com.android.support:appcompat-v7:28.0.0' implementation 'com.jaredrummler:android-shell:1.0.0' implementation fileTree(dir: 'libs', include: ['.so']) testImplementation 'junit:junit:4.12'

1 0

[orbot/master] update to tor 0.4.2.5
by n8fr8＠torproject.org 28 Apr '20

28 Apr '20

commit 61359395a1e51904869851c4d2fbbaa801d34f78 Author: n8fr8 <nathan(a)guardianproject.info> Date: Tue Jan 28 14:30:13 2020 -0500 update to tor 0.4.2.5 --- orbotservice/build.gradle | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/orbotservice/build.gradle b/orbotservice/build.gradle index 5f8cadba..1b3f308f 100644 --- a/orbotservice/build.gradle +++ b/orbotservice/build.gradle @@ -13,8 +13,8 @@ android { defaultConfig { minSdkVersion 16 targetSdkVersion 29 - versionCode 16111000 - versionName '16.1.1-BETA-2-tor-0.4.1-5-rc-orbotservice' + versionCode 16121000 + versionName '16.1.2-BETA-1-tor-0.4.2-5-rc-orbotservice' archivesBaseName = "OrbotService-$versionName" } @@ -43,14 +43,14 @@ dependencies { implementation 'androidx.legacy:legacy-support-v4:1.0.0' - implementation 'org.torproject:tor-android-binary:0.4.1.6-dev' + implementation 'org.torproject:tor-android-binary:0.4.2.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' implementation 'com.jaredrummler:android-shell:1.0.0' implementation fileTree(dir: 'libs', include: ['.so']) - testImplementation 'junit:junit:4.12' + testImplementation 'junit:junit:4.13' implementation 'com.offbynull.portmapper:portmapper:2.0.5'

1 0

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

28 Apr '20

commit 888f836a5e62eb6bd3ca7c3a4fd8917843d0096b Merge: 2b97df38 dbf13dcc Author: n8fr8 <nathan(a)guardianproject.info> Date: Tue Oct 29 09:39:10 2019 -0400 Merge branch 'master' of github.com:guardianproject/orbot app-mini/build.gradle | 2 +- app-mini/src/main/ic_launcher-web.png | Bin 18915 -> 20211 bytes .../torproject/android/mini/MiniMainActivity.java | 14 ----- .../torproject/android/mini/OnBootReceiver.java | 5 +- .../org/torproject/android/mini/OrbotMiniApp.java | 7 +-- .../android/mini/settings/LocaleHelper.java | 1 - .../android/mini/settings/SettingsPreferences.java | 1 - .../android/mini/ui/AppConfigActivity.java | 6 -- .../android/mini/ui/AppManagerActivity.java | 25 ++++---- .../mini/ui/onboarding/CustomSlideBigText.java | 1 - .../mini/ui/onboarding/OnboardingActivity.java | 2 - .../android/mini/vpn/VPNEnableActivity.java | 7 +-- .../res/drawable-hdpi-v11/ic_stat_notifyerr.png | Bin 480 -> 359 bytes .../main/res/drawable-hdpi-v11/ic_stat_tor_off.png | Bin 744 -> 944 bytes .../res/drawable-hdpi-v9/ic_stat_notifyerr.png | Bin 616 -> 508 bytes .../main/res/drawable-hdpi/ic_action_settings.png | Bin 553 -> 329 bytes .../res/drawable-hdpi/ic_settings_white_24dp.png | Bin 460 -> 816 bytes .../main/res/drawable-hdpi/ic_stat_notifyerr.png | Bin 1312 -> 901 bytes .../src/main/res/drawable-hdpi/ic_stat_tor.png | Bin 606 -> 912 bytes .../res/drawable-ldpi-v11/ic_stat_notifyerr.png | Bin 294 -> 262 bytes .../res/drawable-ldpi-v9/ic_stat_notifyerr.png | Bin 342 -> 326 bytes .../main/res/drawable-ldpi/ic_action_settings.png | Bin 319 -> 250 bytes .../main/res/drawable-ldpi/ic_stat_notifyerr.png | Bin 647 -> 443 bytes .../res/drawable-mdpi-v11/ic_stat_notifyerr.png | Bin 357 -> 317 bytes .../res/drawable-mdpi-v9/ic_stat_notifyerr.png | Bin 458 -> 417 bytes .../res/drawable-mdpi/ic_settings_white_24dp.png | Bin 326 -> 598 bytes .../src/main/res/drawable-mdpi/ic_stat_tor.png | Bin 389 -> 576 bytes .../res/drawable-xhdpi-v11/ic_stat_notifyerr.png | Bin 618 -> 406 bytes .../res/drawable-xhdpi-v9/ic_stat_notifyerr.png | Bin 747 -> 580 bytes .../res/drawable-xhdpi/ic_settings_white_24dp.png | Bin 562 -> 982 bytes .../src/main/res/drawable-xhdpi/ic_stat_tor.png | Bin 773 -> 1115 bytes .../res/drawable-xxhdpi/ic_settings_white_24dp.png | Bin 843 -> 1455 bytes .../src/main/res/drawable-xxhdpi/ic_stat_tor.png | Bin 1131 -> 1496 bytes .../drawable-xxxhdpi/ic_settings_white_24dp.png | Bin 1074 -> 1764 bytes .../src/main/res/drawable-xxxhdpi/ic_stat_tor.png | Bin 1564 -> 1899 bytes app-mini/src/main/res/drawable/ic_menu_about.png | Bin 1771 -> 1479 bytes app-mini/src/main/res/drawable/ic_menu_exit.png | Bin 2693 -> 1031 bytes app-mini/src/main/res/drawable/ic_stat_tor_off.png | Bin 744 -> 944 bytes app-mini/src/main/res/drawable/onion32.png | Bin 1599 -> 1402 bytes app-mini/src/main/res/drawable/toroff.png | Bin 19187 -> 19161 bytes app-mini/src/main/res/drawable/toron.png | Bin 19057 -> 19035 bytes app-mini/src/main/res/drawable/torstarting.png | Bin 18052 -> 18019 bytes app-mini/src/main/res/mipmap-hdpi/ic_launcher.png | Bin 2019 -> 2579 bytes .../res/mipmap-hdpi/ic_launcher_foreground.png | Bin 1815 -> 2048 bytes .../src/main/res/mipmap-hdpi/ic_launcher_round.png | Bin 4055 -> 5226 bytes app-mini/src/main/res/mipmap-mdpi/ic_launcher.png | Bin 1456 -> 1473 bytes .../res/mipmap-mdpi/ic_launcher_foreground.png | Bin 1174 -> 1536 bytes .../src/main/res/mipmap-mdpi/ic_launcher_round.png | Bin 2620 -> 3414 bytes app-mini/src/main/res/mipmap-xhdpi/ic_launcher.png | Bin 2761 -> 3479 bytes .../res/mipmap-xhdpi/ic_launcher_foreground.png | Bin 2495 -> 2543 bytes .../main/res/mipmap-xhdpi/ic_launcher_round.png | Bin 5714 -> 7313 bytes .../src/main/res/mipmap-xxhdpi/ic_launcher.png | Bin 4143 -> 5120 bytes .../res/mipmap-xxhdpi/ic_launcher_foreground.png | Bin 3922 -> 3468 bytes .../main/res/mipmap-xxhdpi/ic_launcher_round.png | Bin 8706 -> 10885 bytes .../src/main/res/mipmap-xxxhdpi/ic_launcher.png | Bin 5726 -> 6935 bytes .../res/mipmap-xxxhdpi/ic_launcher_foreground.png | Bin 5467 -> 4466 bytes .../main/res/mipmap-xxxhdpi/ic_launcher_round.png | Bin 12555 -> 15090 bytes app-mini/src/main/res/values/strings.xml | 4 ++ app-mini/src/main/res/xml/preferences.xml | 14 ++++- app/build.gradle | 19 +++++- .../org/torproject/android/OnBootReceiver.java | 3 +- .../main/java/org/torproject/android/OrbotApp.java | 3 - .../org/torproject/android/OrbotMainActivity.java | 69 ++++++++++----------- .../torproject/android/settings/LocaleHelper.java | 1 - .../android/settings/SettingsPreferences.java | 1 - .../torproject/android/ui/AppManagerActivity.java | 25 ++++---- .../torproject/android/ui/VPNEnableActivity.java | 7 +-- .../ui/hiddenservices/ClientCookiesActivity.java | 2 - .../ui/hiddenservices/HiddenServicesActivity.java | 1 - .../ui/hiddenservices/adapters/BackupAdapter.java | 1 - .../adapters/ClientCookiesAdapter.java | 1 - .../hiddenservices/adapters/OnionListAdapter.java | 1 - .../ui/hiddenservices/backup/BackupUtils.java | 1 - .../ui/hiddenservices/dialogs/AddCookieDialog.java | 1 - .../dialogs/CookieActionsDialog.java | 1 - .../hiddenservices/dialogs/CookieDeleteDialog.java | 1 - .../ui/hiddenservices/dialogs/HSActionsDialog.java | 1 - .../ui/hiddenservices/dialogs/HSCookieDialog.java | 2 - .../ui/hiddenservices/dialogs/HSDataDialog.java | 1 - .../ui/hiddenservices/dialogs/HSDeleteDialog.java | 1 - .../dialogs/SelectCookieBackupDialog.java | 1 - .../dialogs/SelectHSBackupDialog.java | 1 - .../permissions/PermissionManager.java | 1 - .../providers/CookieContentProvider.java | 1 - .../providers/HSContentProvider.java | 1 - .../ui/onboarding/BridgeWizardActivity.java | 1 - .../android/ui/onboarding/CustomSlideBigText.java | 1 - .../android/ui/onboarding/OnboardingActivity.java | 4 +- .../res/drawable-hdpi-v11/ic_stat_notifyerr.png | Bin 480 -> 359 bytes app/src/main/res/drawable-hdpi-v11/ic_stat_tor.png | Bin 802 -> 660 bytes .../main/res/drawable-hdpi-v11/ic_stat_tor_off.png | Bin 744 -> 944 bytes .../res/drawable-hdpi-v11/ic_stat_tor_xfer.png | Bin 967 -> 1073 bytes .../res/drawable-hdpi-v9/ic_stat_notifyerr.png | Bin 616 -> 508 bytes app/src/main/res/drawable-hdpi-v9/ic_stat_tor.png | Bin 713 -> 640 bytes .../main/res/drawable-hdpi/ic_action_settings.png | Bin 553 -> 329 bytes app/src/main/res/drawable-hdpi/ic_launcher.png | Bin 4194 -> 3616 bytes .../res/drawable-hdpi/ic_settings_white_24dp.png | Bin 460 -> 816 bytes .../main/res/drawable-hdpi/ic_stat_notifyerr.png | Bin 1312 -> 901 bytes app/src/main/res/drawable-hdpi/ic_stat_tor.png | Bin 852 -> 715 bytes .../main/res/drawable-hdpi/ic_stat_tor_xfer.png | Bin 990 -> 969 bytes .../res/drawable-ldpi-v11/ic_stat_notifyerr.png | Bin 294 -> 262 bytes app/src/main/res/drawable-ldpi-v11/ic_stat_tor.png | Bin 390 -> 420 bytes .../res/drawable-ldpi-v9/ic_stat_notifyerr.png | Bin 342 -> 326 bytes app/src/main/res/drawable-ldpi-v9/ic_stat_tor.png | Bin 358 -> 365 bytes .../main/res/drawable-ldpi/ic_action_settings.png | Bin 319 -> 250 bytes app/src/main/res/drawable-ldpi/ic_launcher.png | Bin 2394 -> 2004 bytes .../main/res/drawable-ldpi/ic_stat_notifyerr.png | Bin 647 -> 443 bytes app/src/main/res/drawable-ldpi/ic_stat_tor.png | Bin 606 -> 494 bytes .../res/drawable-mdpi-v11/ic_stat_notifyerr.png | Bin 357 -> 317 bytes app/src/main/res/drawable-mdpi-v11/ic_stat_tor.png | Bin 517 -> 441 bytes .../res/drawable-mdpi-v11/ic_stat_tor_xfer.png | Bin 607 -> 741 bytes .../res/drawable-mdpi-v9/ic_stat_notifyerr.png | Bin 458 -> 417 bytes app/src/main/res/drawable-mdpi-v9/ic_stat_tor.png | Bin 475 -> 464 bytes .../res/drawable-mdpi/ic_settings_white_24dp.png | Bin 326 -> 598 bytes .../res/drawable-xhdpi-v11/ic_stat_notifyerr.png | Bin 618 -> 406 bytes .../main/res/drawable-xhdpi-v11/ic_stat_tor.png | Bin 1165 -> 887 bytes .../res/drawable-xhdpi-v11/ic_stat_tor_xfer.png | Bin 1337 -> 1348 bytes .../res/drawable-xhdpi-v9/ic_stat_notifyerr.png | Bin 747 -> 580 bytes app/src/main/res/drawable-xhdpi-v9/ic_stat_tor.png | Bin 970 -> 864 bytes .../res/drawable-xhdpi/ic_settings_white_24dp.png | Bin 562 -> 982 bytes .../main/res/drawable-xxhdpi-v11/ic_stat_tor.png | Bin 1903 -> 1307 bytes .../res/drawable-xxhdpi-v11/ic_stat_tor_xfer.png | Bin 2019 -> 1734 bytes .../res/drawable-xxhdpi/ic_settings_white_24dp.png | Bin 843 -> 1455 bytes .../main/res/drawable-xxxhdpi-v11/ic_stat_tor.png | Bin 2661 -> 1734 bytes .../res/drawable-xxxhdpi-v11/ic_stat_tor_xfer.png | Bin 3156 -> 2424 bytes .../drawable-xxxhdpi/ic_settings_white_24dp.png | Bin 1074 -> 1764 bytes app/src/main/res/drawable/ic_launcher.png | Bin 6055 -> 5111 bytes app/src/main/res/drawable/ic_menu_about.png | Bin 1771 -> 1479 bytes app/src/main/res/drawable/ic_menu_exit.png | Bin 2693 -> 1031 bytes app/src/main/res/drawable/ic_stat_tor_off.png | Bin 744 -> 944 bytes app/src/main/res/drawable/ic_stat_tor_xfer.png | Bin 600 -> 628 bytes app/src/main/res/drawable/onion32.png | Bin 1599 -> 1402 bytes app/src/main/res/drawable/toroff.png | Bin 19187 -> 19161 bytes app/src/main/res/drawable/toron.png | Bin 19057 -> 19035 bytes app/src/main/res/drawable/torstarting.png | Bin 18052 -> 18019 bytes app/src/main/res/values/strings.xml | 4 ++ app/src/main/res/xml/preferences.xml | 14 ++++- .../android/en-US/images/featureGraphic.png | Bin 299999 -> 224893 bytes fastlane/metadata/android/en-US/images/icon.png | Bin 46595 -> 31345 bytes .../phoneScreenshots/device-2018-01-05-122015.png | Bin 337474 -> 254422 bytes .../phoneScreenshots/device-2018-01-05-122035.png | Bin 119904 -> 96898 bytes .../phoneScreenshots/device-2018-01-05-122111.png | Bin 472163 -> 358410 bytes .../phoneScreenshots/device-2018-01-05-122301.png | Bin 65793 -> 52269 bytes .../phoneScreenshots/device-2018-01-05-122310.png | Bin 65793 -> 52269 bytes .../phoneScreenshots/device-2018-01-05-122314.png | Bin 65793 -> 52269 bytes .../phoneScreenshots/device-2018-01-05-122344.png | Bin 236020 -> 193597 bytes .../phoneScreenshots/device-2018-01-05-123814.png | Bin 282081 -> 222617 bytes .../phoneScreenshots/device-2018-01-05-123828.png | Bin 148480 -> 120576 bytes .../phoneScreenshots/device-2018-01-05-123836.png | Bin 161380 -> 130945 bytes .../phoneScreenshots/device-2018-01-05-123908.png | Bin 344849 -> 259920 bytes .../phoneScreenshots/device-2018-01-05-124039.png | Bin 49019 -> 39303 bytes .../phoneScreenshots/device-2018-01-05-124045.png | Bin 73495 -> 58218 bytes .../phoneScreenshots/device-2018-01-05-124052.png | Bin 80358 -> 64827 bytes .../phoneScreenshots/device-2018-01-05-124059.png | Bin 120833 -> 96786 bytes make-release-build | 30 +++------ orbotservice/build.gradle | 6 +- .../android/control/TorControlConnection.java | 2 - .../torproject/android/service/OrbotConstants.java | 2 + .../android/service/StartTorReceiver.java | 1 - .../android/service/TorEventHandler.java | 16 +---- .../org/torproject/android/service/TorService.java | 20 ++++-- .../android/service/util/CustomShell.java | 3 - .../service/util/CustomTorResourceInstaller.java | 1 - .../android/service/util/NativeLoader.java | 2 - .../android/service/util/PortForwarder.java | 1 - .../android/service/util/TCPSourceApp.java | 13 ++-- .../android/service/util/TorServiceUtils.java | 1 - .../android/service/vpn/OrbotVpnManager.java | 5 -- .../android/service/vpn/TorVpnService.java | 1 - .../torproject/android/service/vpn/Tun2Socks.java | 2 - .../res/drawable-hdpi-v11/ic_stat_notifyerr.png | Bin 480 -> 359 bytes .../main/res/drawable-hdpi-v11/ic_stat_tor_off.png | Bin 744 -> 944 bytes .../res/drawable-hdpi-v9/ic_stat_notifyerr.png | Bin 616 -> 508 bytes .../res/drawable-hdpi/ic_refresh_white_24dp.png | Bin 387 -> 675 bytes .../main/res/drawable-hdpi/ic_stat_notifyerr.png | Bin 1312 -> 901 bytes .../src/main/res/drawable-hdpi/ic_stat_tor.png | Bin 1136 -> 1519 bytes .../res/drawable-ldpi-v11/ic_stat_notifyerr.png | Bin 294 -> 262 bytes .../res/drawable-ldpi-v9/ic_stat_notifyerr.png | Bin 342 -> 326 bytes .../main/res/drawable-ldpi/ic_stat_notifyerr.png | Bin 647 -> 443 bytes .../res/drawable-mdpi-v11/ic_stat_notifyerr.png | Bin 357 -> 317 bytes .../res/drawable-mdpi-v9/ic_stat_notifyerr.png | Bin 458 -> 417 bytes .../drawable-mdpi/ic_action_settings.png | Bin 364 -> 251 bytes .../drawable-mdpi/ic_autorenew_black_36dp.png | Bin 369 -> 578 bytes .../drawable-mdpi/ic_filter_none_black_36dp.png | Bin 198 -> 251 bytes .../drawable-mdpi/drawable-mdpi/ic_launcher.png | Bin 2677 -> 2319 bytes .../ic_playlist_add_check_black_36dp.png | Bin 163 -> 202 bytes .../drawable-mdpi/ic_stat_notifyerr.png | Bin 883 -> 617 bytes .../drawable-mdpi/drawable-mdpi/ic_stat_tor.png | Bin 535 -> 479 bytes .../drawable-mdpi/ic_stat_tor_xfer.png | Bin 600 -> 628 bytes .../res/drawable-mdpi/drawable-mdpi/inverse.png | Bin 1027 -> 1231 bytes .../res/drawable-mdpi/ic_refresh_white_24dp.png | Bin 254 -> 426 bytes .../main/res/drawable-mdpi/ic_stat_notifyerr.png | Bin 883 -> 617 bytes .../src/main/res/drawable-mdpi/ic_stat_tor.png | Bin 622 -> 943 bytes .../res/drawable-xhdpi-v11/ic_stat_notifyerr.png | Bin 618 -> 406 bytes .../res/drawable-xhdpi-v9/ic_stat_notifyerr.png | Bin 747 -> 580 bytes .../res/drawable-xhdpi/ic_refresh_white_24dp.png | Bin 509 -> 895 bytes .../main/res/drawable-xhdpi/ic_stat_notifyerr.png | Bin 1796 -> 1370 bytes .../src/main/res/drawable-xhdpi/ic_stat_tor.png | Bin 1774 -> 2148 bytes .../drawable-xxhdpi/ic_autorenew_black_36dp.png | Bin 1000 -> 1440 bytes .../drawable-xxhdpi/ic_filter_none_black_36dp.png | Bin 415 -> 518 bytes .../drawable-xxhdpi/ic_launcher.png | Bin 9556 -> 7975 bytes .../ic_playlist_add_check_black_36dp.png | Bin 325 -> 413 bytes .../drawable-xxhdpi/ic_stat_tor.png | Bin 1872 -> 1430 bytes .../drawable-xxhdpi/ic_stat_tor_xfer.png | Bin 2216 -> 1295 bytes .../drawable-xxhdpi/drawable-xxhdpi/inverse.png | Bin 1027 -> 1231 bytes .../res/drawable-xxhdpi/ic_refresh_white_24dp.png | Bin 734 -> 1231 bytes .../src/main/res/drawable-xxhdpi/ic_stat_tor.png | Bin 3241 -> 3296 bytes .../drawable-xxxhdpi/ic_autorenew_black_36dp.png | Bin 1362 -> 1953 bytes .../drawable-xxxhdpi/ic_filter_none_black_36dp.png | Bin 505 -> 577 bytes .../drawable-xxxhdpi/ic_launcher.png | Bin 13297 -> 11077 bytes .../ic_playlist_add_check_black_36dp.png | Bin 379 -> 440 bytes .../drawable-xxxhdpi/ic_stat_tor.png | Bin 2631 -> 1998 bytes .../drawable-xxxhdpi/ic_stat_tor_xfer.png | Bin 2859 -> 1585 bytes .../drawable-xxxhdpi/drawable-xxxhdpi/inverse.png | Bin 1027 -> 1231 bytes .../res/drawable-xxxhdpi/ic_refresh_white_24dp.png | Bin 967 -> 1553 bytes .../src/main/res/drawable-xxxhdpi/ic_stat_tor.png | Bin 3188 -> 3580 bytes tools/png-pre-compress | 18 ++++++ 217 files changed, 178 insertions(+), 207 deletions(-) diff --cc app/build.gradle index 73426289,d7d8957c..1c89e568 --- a/app/build.gradle +++ b/app/build.gradle @@@ -59,18 -74,9 +74,18 @@@ android applicationId 'org.torproject.android' targetSdkVersion 28 versionCode 16123000 - versionName '16.1.2-RC-2-tor-0.4.1.5-rc' + versionName getVersionName() archivesBaseName = "Orbot-$versionName" } + appmax { + dimension "free" + minSdkVersion 16 + applicationId 'org.torproject.android.max' + targetSdkVersion 28 + versionCode 16123000 + versionName '16.1.2-RC-2-tor-0.4.1.5-rc' + archivesBaseName = "orbotMAX-$versionName" + } } splits { diff --cc orbotservice/src/main/java/org/torproject/android/service/TorService.java index 8c8330be,52e67248..ecad5fa9 --- a/orbotservice/src/main/java/org/torproject/android/service/TorService.java +++ b/orbotservice/src/main/java/org/torproject/android/service/TorService.java @@@ -1730,57 -1735,50 +1739,58 @@@ public class TorService extends Servic 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'); + extraLines.append("HiddenServiceVersion 2").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] rename TorService to OrbotService to prep for standalone TorService
by n8fr8＠torproject.org 28 Apr '20

28 Apr '20

commit a655beed19d31e879fe3e7656cbfca41daf0ff14 Author: Hans-Christoph Steiner <hans(a)eds.org> Date: Fri Dec 13 15:30:45 2019 +0100 rename TorService to OrbotService to prep for standalone TorService --- app-mini/src/debug/AndroidManifest.xml | 2 +- app-mini/src/main/AndroidManifest.xml | 2 +- .../torproject/android/mini/MiniMainActivity.java | 54 +++++++++++----------- .../torproject/android/mini/OnBootReceiver.java | 12 ++--- .../android/mini/vpn/VPNEnableActivity.java | 12 ++--- app/src/main/AndroidManifest.xml | 2 +- .../org/torproject/android/OnBootReceiver.java | 12 ++--- .../org/torproject/android/OrbotMainActivity.java | 50 ++++++++++---------- .../torproject/android/ui/VPNEnableActivity.java | 12 ++--- .../service/{TorService.java => OrbotService.java} | 10 ++-- .../android/service/StartTorReceiver.java | 6 +-- .../android/service/TorEventHandler.java | 4 +- .../android/service/vpn/OrbotVpnManager.java | 6 +-- .../android/service/vpn/TorVpnService.java | 4 +- 14 files changed, 94 insertions(+), 94 deletions(-) diff --git a/app-mini/src/debug/AndroidManifest.xml b/app-mini/src/debug/AndroidManifest.xml index 84b9c1b1..a04afa83 100644 --- a/app-mini/src/debug/AndroidManifest.xml +++ b/app-mini/src/debug/AndroidManifest.xml @@ -82,7 +82,7 @@ /> <service - android:name="org.torproject.android.service.TorService" + android:name="org.torproject.android.service.OrbotService" android:enabled="true" android:permission="android.permission.BIND_VPN_SERVICE" android:stopWithTask="false"></service> diff --git a/app-mini/src/main/AndroidManifest.xml b/app-mini/src/main/AndroidManifest.xml index e3a190a6..5da4d86e 100644 --- a/app-mini/src/main/AndroidManifest.xml +++ b/app-mini/src/main/AndroidManifest.xml @@ -87,7 +87,7 @@ </receiver> <service - android:name="org.torproject.android.service.TorService" + android:name="org.torproject.android.service.OrbotService" android:enabled="true" android:permission="android.permission.BIND_VPN_SERVICE" android:stopWithTask="false" /> 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 bc46b251..5be3d027 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 @@ -23,14 +23,6 @@ import android.net.Uri; import android.os.Bundle; import android.os.Handler; import android.os.Message; -import androidx.localbroadcastmanager.content.LocalBroadcastManager; -import androidx.drawerlayout.widget.DrawerLayout; -import androidx.appcompat.app.AppCompatActivity; -import androidx.palette.graphics.Palette; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; -import androidx.appcompat.widget.SwitchCompat; -import androidx.appcompat.widget.Toolbar; import android.text.Html; import android.text.TextUtils; import android.util.Log; @@ -46,6 +38,14 @@ import android.view.animation.AccelerateInterpolator; import android.widget.CompoundButton; import android.widget.ImageView; import android.widget.TextView; +import androidx.appcompat.app.AppCompatActivity; +import androidx.appcompat.widget.SwitchCompat; +import androidx.appcompat.widget.Toolbar; +import androidx.drawerlayout.widget.DrawerLayout; +import androidx.localbroadcastmanager.content.LocalBroadcastManager; +import androidx.palette.graphics.Palette; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; import com.google.zxing.integration.android.IntentIntegrator; import com.google.zxing.integration.android.IntentResult; import org.json.JSONArray; @@ -58,10 +58,10 @@ 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.OrbotService; 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.TorifiedApp; import org.torproject.android.service.vpn.VpnConstants; import org.torproject.android.service.vpn.VpnPrefs; @@ -163,25 +163,25 @@ public class MiniMainActivity extends AppCompatActivity } - private void sendIntentToService(final String action) { + private void sendIntentToService(final String action) { - Intent torService = new Intent(MiniMainActivity.this, TorService.class); - torService.setAction(action); - startService(torService); + Intent intent = new Intent(MiniMainActivity.this, OrbotService.class); + intent.setAction(action); + startService(intent); - } + } private void stopTor() { // requestTorStatus(); - Intent torService = new Intent(MiniMainActivity.this, TorService.class); - stopService(torService); + Intent intent = new Intent(MiniMainActivity.this, OrbotService.class); + stopService(intent); } /** - * The state and log info from {@link TorService} are sent to the UI here in + * 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, * so local ones are used here so other apps cannot interfere with Orbot's * operation. @@ -226,8 +226,8 @@ public class MiniMainActivity extends AppCompatActivity else if (action.equals(TorServiceConstants.LOCAL_ACTION_PORTS)) { Message msg = mStatusUpdateHandler.obtainMessage(MESSAGE_PORTS); - msg.getData().putInt("socks",intent.getIntExtra(TorService.EXTRA_SOCKS_PROXY_PORT,-1)); - msg.getData().putInt("http",intent.getIntExtra(TorService.EXTRA_HTTP_PROXY_PORT,-1)); + msg.getData().putInt("socks",intent.getIntExtra(OrbotService.EXTRA_SOCKS_PROXY_PORT,-1)); + msg.getData().putInt("http",intent.getIntExtra(OrbotService.EXTRA_HTTP_PROXY_PORT,-1)); mStatusUpdateHandler.sendMessage(msg); @@ -386,7 +386,7 @@ public class MiniMainActivity extends AppCompatActivity String version = ""; try { - version = getPackageManager().getPackageInfo(getPackageName(), 0).versionName + " (Tor " + TorService.BINARY_TOR_VERSION + ")"; + version = getPackageManager().getPackageInfo(getPackageName(), 0).versionName + " (Tor " + OrbotService.BINARY_TOR_VERSION + ")"; } catch (NameNotFoundException e) { version = "Version Not Found"; } @@ -428,7 +428,7 @@ public class MiniMainActivity extends AppCompatActivity /** * This is our attempt to REALLY exit Orbot, and stop the background service * However, Android doesn't like people "quitting" apps, and/or our code may - * not be quite right b/c no matter what we do, it seems like the TorService + * not be quite right b/c no matter what we do, it seems like the OrbotService * still exists **/ private void doExit() { @@ -781,7 +781,7 @@ public class MiniMainActivity extends AppCompatActivity } /** - * Update the layout_main UI based on the status of {@link TorService}. + * Update the layout_main UI based on the status of {@link OrbotService}. * {@code torServiceMsg} must never be {@code null} */ private void updateStatus(String torServiceMsg, String newTorStatus) { @@ -855,7 +855,7 @@ public class MiniMainActivity extends AppCompatActivity } else if (torStatus == TorServiceConstants.STATUS_OFF) { imgStatus.setImageResource(R.drawable.toroff); - // lblStatus.setText("Tor v" + TorService.BINARY_TOR_VERSION); + // lblStatus.setText("Tor v" + OrbotService.BINARY_TOR_VERSION); } @@ -866,7 +866,7 @@ public class MiniMainActivity extends AppCompatActivity /** * Starts tor and related daemons by sending an * {@link TorServiceConstants#ACTION_START} {@link Intent} to - * {@link TorService} + * {@link OrbotService} */ private void startTor() { sendIntentToService(TorServiceConstants.ACTION_START); @@ -876,7 +876,7 @@ public class MiniMainActivity extends AppCompatActivity /** * Request tor status without starting it * {@link TorServiceConstants#ACTION_START} {@link Intent} to - * {@link TorService} + * {@link OrbotService} */ private void requestTorStatus() { sendIntentToService(TorServiceConstants.ACTION_STATUS); @@ -885,7 +885,7 @@ public class MiniMainActivity extends AppCompatActivity private boolean isTorServiceRunning() { ActivityManager manager = (ActivityManager) getSystemService(Context.ACTIVITY_SERVICE); for (RunningServiceInfo service : manager.getRunningServices(Integer.MAX_VALUE)) { - if (TorService.class.getName().equals(service.service.getClassName())) { + if (OrbotService.class.getName().equals(service.service.getClassName())) { return true; } } diff --git a/app-mini/src/main/java/org/torproject/android/mini/OnBootReceiver.java b/app-mini/src/main/java/org/torproject/android/mini/OnBootReceiver.java index d2dab5d8..56d2b5e9 100644 --- a/app-mini/src/main/java/org/torproject/android/mini/OnBootReceiver.java +++ b/app-mini/src/main/java/org/torproject/android/mini/OnBootReceiver.java @@ -6,7 +6,7 @@ import android.content.Context; import android.content.Intent; import android.os.Build; import org.torproject.android.mini.vpn.VPNEnableActivity; -import org.torproject.android.service.TorService; +import org.torproject.android.service.OrbotService; import org.torproject.android.service.TorServiceConstants; import org.torproject.android.service.util.Prefs; @@ -38,15 +38,15 @@ public class OnBootReceiver extends BroadcastReceiver { private void startService (String action, Context context) { - - Intent torService = new Intent(context, TorService.class); - torService.setAction(action); + + Intent intent = new Intent(context, OrbotService.class); + intent.setAction(action); if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { - context.startForegroundService(torService); + context.startForegroundService(intent); } else { - context.startService(torService); + context.startService(intent); } } 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 d65913b5..153f5b57 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 @@ -5,10 +5,10 @@ import android.net.VpnService; import android.os.Build; import android.os.Bundle; import android.os.Handler; -import androidx.appcompat.app.AppCompatActivity; import android.util.Log; import android.view.Window; -import org.torproject.android.service.TorService; +import androidx.appcompat.app.AppCompatActivity; +import org.torproject.android.service.OrbotService; import org.torproject.android.service.TorServiceConstants; import org.torproject.android.service.util.Prefs; import org.torproject.android.service.vpn.TorVpnService; @@ -108,14 +108,14 @@ public class VPNEnableActivity extends AppCompatActivity { private void sendIntentToService(String action) { - Intent torService = new Intent(this, TorService.class); - torService.setAction(action); + Intent intent = new Intent(this, OrbotService.class); + intent.setAction(action); if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { - startForegroundService(torService); + startForegroundService(intent); } else { - startService(torService); + startService(intent); } } } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 184dbdd9..1d7a9f16 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -82,7 +82,7 @@ android:theme="@style/Theme.AppCompat" /> <service - android:name=".service.TorService" + android:name=".service.OrbotService" android:enabled="true" android:permission="android.permission.BIND_VPN_SERVICE" android:stopWithTask="false"></service> diff --git a/app/src/main/java/org/torproject/android/OnBootReceiver.java b/app/src/main/java/org/torproject/android/OnBootReceiver.java index 6a3cc6fa..5c7ae504 100644 --- a/app/src/main/java/org/torproject/android/OnBootReceiver.java +++ b/app/src/main/java/org/torproject/android/OnBootReceiver.java @@ -5,7 +5,7 @@ import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; import android.os.Build; -import org.torproject.android.service.TorService; +import org.torproject.android.service.OrbotService; import org.torproject.android.service.TorServiceConstants; import org.torproject.android.service.util.Prefs; import org.torproject.android.ui.VPNEnableActivity; @@ -38,15 +38,15 @@ public class OnBootReceiver extends BroadcastReceiver { private void startService (String action, Context context) { - - Intent torService = new Intent(context, TorService.class); - torService.setAction(action); + + Intent intent = new Intent(context, OrbotService.class); + intent.setAction(action); if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { - context.startForegroundService(torService); + context.startForegroundService(intent); } else { - context.startService(torService); + context.startService(intent); } } diff --git a/app/src/main/java/org/torproject/android/OrbotMainActivity.java b/app/src/main/java/org/torproject/android/OrbotMainActivity.java index 64f1ee42..f6e548b0 100644 --- a/app/src/main/java/org/torproject/android/OrbotMainActivity.java +++ b/app/src/main/java/org/torproject/android/OrbotMainActivity.java @@ -24,11 +24,6 @@ import android.os.Bundle; import android.os.Handler; import android.os.Message; import android.os.RemoteException; -import androidx.localbroadcastmanager.content.LocalBroadcastManager; -import androidx.drawerlayout.widget.DrawerLayout; -import androidx.appcompat.app.AppCompatActivity; -import androidx.appcompat.widget.SwitchCompat; -import androidx.appcompat.widget.Toolbar; import android.text.Html; import android.text.TextUtils; import android.util.Log; @@ -50,11 +45,16 @@ import android.widget.LinearLayout; import android.widget.Spinner; import android.widget.TextView; import android.widget.Toast; +import androidx.appcompat.app.AppCompatActivity; +import androidx.appcompat.widget.SwitchCompat; +import androidx.appcompat.widget.Toolbar; +import androidx.drawerlayout.widget.DrawerLayout; +import androidx.localbroadcastmanager.content.LocalBroadcastManager; import com.google.zxing.integration.android.IntentIntegrator; import com.google.zxing.integration.android.IntentResult; import org.json.JSONArray; import org.torproject.android.service.OrbotConstants; -import org.torproject.android.service.TorService; +import org.torproject.android.service.OrbotService; import org.torproject.android.service.TorServiceConstants; import org.torproject.android.service.util.Prefs; import org.torproject.android.service.vpn.TorVpnService; @@ -210,9 +210,9 @@ public class OrbotMainActivity extends AppCompatActivity private void sendIntentToService(final String action) { - Intent torService = new Intent(OrbotMainActivity.this, TorService.class); - torService.setAction(action); - startService(torService); + Intent intent = new Intent(OrbotMainActivity.this, OrbotService.class); + intent.setAction(action); + startService(intent); } @@ -220,13 +220,13 @@ public class OrbotMainActivity extends AppCompatActivity // requestTorStatus(); - Intent torService = new Intent(OrbotMainActivity.this, TorService.class); - stopService(torService); + Intent intent = new Intent(OrbotMainActivity.this, OrbotService.class); + stopService(intent); } /** - * The state and log info from {@link TorService} are sent to the UI here in + * 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, * so local ones are used here so other apps cannot interfere with Orbot's * operation. @@ -271,8 +271,8 @@ public class OrbotMainActivity extends AppCompatActivity else if (action.equals(TorServiceConstants.LOCAL_ACTION_PORTS)) { Message msg = mStatusUpdateHandler.obtainMessage(MESSAGE_PORTS); - msg.getData().putInt("socks",intent.getIntExtra(TorService.EXTRA_SOCKS_PROXY_PORT,-1)); - msg.getData().putInt("http",intent.getIntExtra(TorService.EXTRA_HTTP_PROXY_PORT,-1)); + msg.getData().putInt("socks",intent.getIntExtra(OrbotService.EXTRA_SOCKS_PROXY_PORT,-1)); + msg.getData().putInt("http",intent.getIntExtra(OrbotService.EXTRA_HTTP_PROXY_PORT,-1)); mStatusUpdateHandler.sendMessage(msg); @@ -419,10 +419,10 @@ public class OrbotMainActivity extends AppCompatActivity else country = '{' + COUNTRY_CODES[position - 1] + '}'; - Intent torService = new Intent(OrbotMainActivity.this, TorService.class); - torService.setAction(TorServiceConstants.CMD_SET_EXIT); - torService.putExtra("exit", country); - startService(torService); + Intent intent = new Intent(OrbotMainActivity.this, OrbotService.class); + intent.setAction(TorServiceConstants.CMD_SET_EXIT); + intent.putExtra("exit", country); + startService(intent); } @@ -520,7 +520,7 @@ public class OrbotMainActivity extends AppCompatActivity String version = ""; try { - version = getPackageManager().getPackageInfo(getPackageName(), 0).versionName + " (Tor " + TorService.BINARY_TOR_VERSION + ")"; + version = getPackageManager().getPackageInfo(getPackageName(), 0).versionName + " (Tor " + OrbotService.BINARY_TOR_VERSION + ")"; } catch (NameNotFoundException e) { version = "Version Not Found"; } @@ -562,7 +562,7 @@ public class OrbotMainActivity extends AppCompatActivity /** * This is our attempt to REALLY exit Orbot, and stop the background service * However, Android doesn't like people "quitting" apps, and/or our code may - * not be quite right b/c no matter what we do, it seems like the TorService + * not be quite right b/c no matter what we do, it seems like the OrbotService * still exists **/ private void doExit() { @@ -1059,7 +1059,7 @@ public class OrbotMainActivity extends AppCompatActivity } /** - * Update the layout_main UI based on the status of {@link TorService}. + * Update the layout_main UI based on the status of {@link OrbotService}. * {@code torServiceMsg} must never be {@code null} */ private synchronized void updateStatus(String torServiceMsg, String newTorStatus) { @@ -1136,7 +1136,7 @@ public class OrbotMainActivity extends AppCompatActivity } else if (torStatus == TorServiceConstants.STATUS_OFF) { imgStatus.setImageResource(R.drawable.toroff); - lblStatus.setText("Tor v" + TorService.BINARY_TOR_VERSION); + lblStatus.setText("Tor v" + OrbotService.BINARY_TOR_VERSION); mBtnStart.setText(R.string.menu_start); mPulsator.start(); @@ -1148,7 +1148,7 @@ public class OrbotMainActivity extends AppCompatActivity /** * Starts tor and related daemons by sending an * {@link TorServiceConstants#ACTION_START} {@link Intent} to - * {@link TorService} + * {@link OrbotService} */ private void startTor() { sendIntentToService(TorServiceConstants.ACTION_START); @@ -1158,7 +1158,7 @@ public class OrbotMainActivity extends AppCompatActivity /** * Request tor status without starting it * {@link TorServiceConstants#ACTION_START} {@link Intent} to - * {@link TorService} + * {@link OrbotService} */ private void requestTorStatus() { sendIntentToService(TorServiceConstants.ACTION_STATUS); @@ -1167,7 +1167,7 @@ public class OrbotMainActivity extends AppCompatActivity private boolean isTorServiceRunning() { ActivityManager manager = (ActivityManager) getSystemService(Context.ACTIVITY_SERVICE); for (RunningServiceInfo service : manager.getRunningServices(Integer.MAX_VALUE)) { - if (TorService.class.getName().equals(service.service.getClassName())) { + if (OrbotService.class.getName().equals(service.service.getClassName())) { return true; } } 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 be26e315..ba12ebe5 100644 --- a/app/src/main/java/org/torproject/android/ui/VPNEnableActivity.java +++ b/app/src/main/java/org/torproject/android/ui/VPNEnableActivity.java @@ -5,10 +5,10 @@ import android.net.VpnService; import android.os.Build; import android.os.Bundle; import android.os.Handler; -import androidx.appcompat.app.AppCompatActivity; import android.util.Log; import android.view.Window; -import org.torproject.android.service.TorService; +import androidx.appcompat.app.AppCompatActivity; +import org.torproject.android.service.OrbotService; import org.torproject.android.service.TorServiceConstants; import org.torproject.android.service.util.Prefs; import org.torproject.android.service.vpn.TorVpnService; @@ -107,14 +107,14 @@ public class VPNEnableActivity extends AppCompatActivity { private void sendIntentToService(String action) { - Intent torService = new Intent(this, TorService.class); - torService.setAction(action); + Intent intent = new Intent(this, OrbotService.class); + intent.setAction(action); if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { - startForegroundService(torService); + startForegroundService(intent); } else { - startService(torService); + startService(intent); } } } diff --git a/orbotservice/src/main/java/org/torproject/android/service/TorService.java b/orbotservice/src/main/java/org/torproject/android/service/OrbotService.java similarity index 99% rename from orbotservice/src/main/java/org/torproject/android/service/TorService.java rename to orbotservice/src/main/java/org/torproject/android/service/OrbotService.java index 5e9e9168..a25131d9 100644 --- a/orbotservice/src/main/java/org/torproject/android/service/TorService.java +++ b/orbotservice/src/main/java/org/torproject/android/service/OrbotService.java @@ -83,7 +83,7 @@ import java.util.concurrent.TimeoutException; import static org.torproject.android.service.vpn.VpnUtils.getSharedPrefs; import static org.torproject.android.service.vpn.VpnUtils.killProcess; -public class TorService extends Service implements TorServiceConstants, OrbotConstants +public class OrbotService extends Service implements TorServiceConstants, OrbotConstants { public final static String BINARY_TOR_VERSION = org.torproject.android.binary.TorServiceConstants.BINARY_TOR_VERSION; @@ -269,7 +269,7 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon //Reusable code. PackageManager pm = getPackageManager(); Intent intent = pm.getLaunchIntentForPackage(getPackageName()); - PendingIntent pendIntent = PendingIntent.getActivity(TorService.this, 0, intent, 0); + PendingIntent pendIntent = PendingIntent.getActivity(OrbotService.this, 0, intent, 0); if (mNotifyBuilder == null) { @@ -383,7 +383,7 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon setExitNode(mIntent.getStringExtra("exit")); } else { - Log.w(OrbotConstants.TAG, "unhandled TorService Intent: " + action); + Log.w(OrbotConstants.TAG, "unhandled OrbotService Intent: " + action); } } } @@ -428,7 +428,7 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon } private void stopTorAsync () { - Log.i("TorService", "stopTor"); + Log.i("OrbotService", "stopTor"); try { sendCallbackStatus(STATUS_STOPPING); sendCallbackLogMessage(getString(R.string.status_shutting_down)); @@ -569,7 +569,7 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon logNotice("There was an error installing Orbot binaries"); } - Log.i("TorService", "onCreate end"); + Log.i("OrbotService", "onCreate end"); } protected String getCurrentStatus () diff --git a/orbotservice/src/main/java/org/torproject/android/service/StartTorReceiver.java b/orbotservice/src/main/java/org/torproject/android/service/StartTorReceiver.java index b10c97b6..008caa1e 100644 --- a/orbotservice/src/main/java/org/torproject/android/service/StartTorReceiver.java +++ b/orbotservice/src/main/java/org/torproject/android/service/StartTorReceiver.java @@ -13,16 +13,16 @@ public class StartTorReceiver extends BroadcastReceiver implements TorServiceCon @Override public void onReceive(Context context, Intent intent) { - /* sanitize the Intent before forwarding it to TorService */ + /* sanitize the Intent before forwarding it to OrbotService */ Prefs.setContext(context); String action = intent.getAction(); if (TextUtils.equals(action, ACTION_START)) { String packageName = intent.getStringExtra(EXTRA_PACKAGE_NAME); if (Prefs.allowBackgroundStarts()) { - Intent startTorIntent = new Intent(context, TorService.class); + Intent startTorIntent = new Intent(context, OrbotService.class); startTorIntent.setAction(action); if (packageName != null) { - startTorIntent.putExtra(TorService.EXTRA_PACKAGE_NAME, packageName); + startTorIntent.putExtra(OrbotService.EXTRA_PACKAGE_NAME, packageName); } if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O && Prefs.persistNotifications()) { context.startForegroundService(startTorIntent); diff --git a/orbotservice/src/main/java/org/torproject/android/service/TorEventHandler.java b/orbotservice/src/main/java/org/torproject/android/service/TorEventHandler.java index c67afff4..96dc87cc 100644 --- a/orbotservice/src/main/java/org/torproject/android/service/TorEventHandler.java +++ b/orbotservice/src/main/java/org/torproject/android/service/TorEventHandler.java @@ -17,7 +17,7 @@ import java.util.StringTokenizer; */ public class TorEventHandler implements EventHandler, TorServiceConstants { - private TorService mService; + private OrbotService mService; private long lastRead = -1; @@ -45,7 +45,7 @@ public class TorEventHandler implements EventHandler, TorServiceConstants { return hmBuiltNodes; } - public TorEventHandler (TorService service) + public TorEventHandler (OrbotService service) { mService = service; mNumberFormat = NumberFormat.getInstance(Locale.getDefault()); //localized numbers! 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 b78c7a4f..b6d5f5fd 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 @@ -34,8 +34,8 @@ import android.widget.Toast; import com.runjva.sourceforge.jsocks.protocol.ProxyServer; import com.runjva.sourceforge.jsocks.server.ServerAuthenticatorNone; import org.torproject.android.service.OrbotConstants; +import org.torproject.android.service.OrbotService; import org.torproject.android.service.R; -import org.torproject.android.service.TorService; import org.torproject.android.service.TorServiceConstants; import org.torproject.android.service.util.CustomNativeLoader; @@ -139,8 +139,8 @@ public class OrbotVpnManager implements Handler.Callback { { Log.d(TAG,"starting OrbotVPNService service!"); - int torSocks = intent.getIntExtra(TorService.EXTRA_SOCKS_PROXY_PORT,-1); - int torDns = intent.getIntExtra(TorService.EXTRA_DNS_PORT,-1); + int torSocks = intent.getIntExtra(OrbotService.EXTRA_SOCKS_PROXY_PORT,-1); + int torDns = intent.getIntExtra(OrbotService.EXTRA_DNS_PORT,-1); //if running, we need to restart if ((torSocks != mTorSocks || torDns != mTorDns)) { 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 d394b5c8..f04a027b 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 @@ -8,7 +8,7 @@ import android.content.IntentFilter; import android.net.VpnService; import androidx.localbroadcastmanager.content.LocalBroadcastManager; import android.util.Log; -import org.torproject.android.service.TorService; +import org.torproject.android.service.OrbotService; import org.torproject.android.service.TorServiceConstants; import org.torproject.android.service.util.Prefs; @@ -86,7 +86,7 @@ public class TorVpnService extends VpnService { } /** - * The state and log info from {@link TorService} are sent to the UI here in + * 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, * so local ones are used here so other apps cannot interfere with Orbot's * operation.

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits April 2020