diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 9e1d3da..25b31ab 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,7 +1,6 @@ -#Mon Apr 04 20:11:17 CEST 2016 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-4.8-bin.zip +distributionSha256Sum=f3e29692a8faa94eb0b02ebf36fa263a642b3ae8694ef806c45c345b8683f1ba zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.4.1-bin.zip -distributionSha256Sum=e7cf7d1853dfc30c1c44f571d3919eeeedef002823b66b6a988d27e919686389 diff --git a/libnetcipher/src/info/guardianproject/netcipher/proxy/OrbotHelper.java b/libnetcipher/src/info/guardianproject/netcipher/proxy/OrbotHelper.java index 5487087..bfa02e3 100644 --- a/libnetcipher/src/info/guardianproject/netcipher/proxy/OrbotHelper.java +++ b/libnetcipher/src/info/guardianproject/netcipher/proxy/OrbotHelper.java @@ -113,19 +113,12 @@ public class OrbotHelper implements ProxyHelper { public final static String STATUS_STARTS_DISABLED = "STARTS_DISABLED"; public final static String ACTION_START_TOR = "org.torproject.android.START_TOR"; - /** - * Intent Action to request V2 Onion Services - * See {{@link #requestHiddenServiceOnPort(Activity, int)}} - */ - @Deprecated - public final static String ACTION_REQUEST_HS = "org.torproject.android.REQUEST_HS_PORT"; /** * Intent Action to request V3 Onion Services * See {{@link #requestV3OnionServiceOnPort(Activity, int, int, String)}} */ public final static String ACTION_REQUEST_V3_ONION_SERVICE = "org.torproject.android.REQUEST_V3_ONION_SERVICE"; public final static int START_TOR_RESULT = 0x9234; - public final static int HS_REQUEST_CODE = 9999; public final static int V3_ONION_SERVICE_REQUEST_CODE = 3333; @@ -160,7 +153,7 @@ public static boolean isOnionAddress(String urlString) { } /** - * Test whether a {@link Uri} is a Tor Hidden Service host name, also known + * Test whether a {@link Uri} is a Tor Onion Service host name, also known * as an ".onion address". * * @return whether the host name is a Tor .onion address @@ -196,20 +189,6 @@ private static boolean isAppInstalled(Context context, String uri) { } } - /** - * This method creates a V2 Onion Service which is being phased out by tor soon. - * Instead, you should use {{@link #requestV3OnionServiceOnPort(Activity, int, int, String)}} - * to create a V3 Onion Service. See https://blog.torproject.org/v2-deprecation-timeline - */ - @Deprecated - public static void requestHiddenServiceOnPort(Activity activity, int port) { - Intent intent = new Intent(ACTION_REQUEST_HS); - intent.setPackage(ORBOT_PACKAGE_NAME); - intent.putExtra("hs_port", port); - - activity.startActivityForResult(intent, HS_REQUEST_CODE); - } - /** * Tells Orbot to spin up a v3 Onion Service for your application * @param activity