Merge branch '5528-e_16.4.1-RC-2-tor-app-installed' into 'e_16.4.1-RC-2' (e1cc6aef) · Commits · e / os / orbotservice

src/main/java/org/torproject/android/service/OrbotService.java

+0 −20

Original line number	Diff line number	Diff line
		@@ -824,20 +824,6 @@ public class OrbotService extends VpnService implements TorServiceConstants, Orb
		}

		boolean success = runTorShellCmd();

		if (success) {
		try {
		updateLegacyV2OnionNames();
		} catch (SecurityException se) {
		logNotice("unable to upload legacy v2 onion names");
		}
		try {
		updateV3OnionNames();
		} catch (SecurityException se) {
		logNotice("unable to upload v3 onion names");
		}
		}

		} catch (Exception e) {
		logException("Unable to start Tor: " + e.toString(), e);
		stopTorAsync();
		@@ -1388,12 +1374,6 @@ public class OrbotService extends VpnService implements TorServiceConstants, Orb
		showToolbarNotification(getString(R.string.your_relay_settings_caused_an_exception_), ERROR_NOTIFY_ID, R.drawable.ic_stat_notifyerr);
		return null;
		}

		ContentResolver contentResolver = getApplicationContext().getContentResolver();
		addV3OnionServicesToTorrc(extraLines, contentResolver);
		addV3ClientAuthToTorrc(extraLines, contentResolver);
		addV2HiddenServicesToTorrc(extraLines, contentResolver);
		addV2ClientCookiesToTorrc(extraLines, contentResolver);
		return extraLines;
		}