Merge branch 'master' of github.com:ooni/probe-android into issues/25…

…24-release-3.8.4
ooni · Oct 20, 2023 · aedbc06 · aedbc06
2 parents 142e367 + a9d8054
commit aedbc06
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 8 deletions.
diff --git a/app/src/main/java/org/openobservatory/ooniprobe/test/suite/CircumventionSuite.java b/app/src/main/java/org/openobservatory/ooniprobe/test/suite/CircumventionSuite.java
@@ -8,7 +8,6 @@
 import org.openobservatory.ooniprobe.common.PreferenceManager;
 import org.openobservatory.ooniprobe.test.test.AbstractTest;
 import org.openobservatory.ooniprobe.test.test.Psiphon;
-import org.openobservatory.ooniprobe.test.test.RiseupVPN;
 import org.openobservatory.ooniprobe.test.test.Tor;
 
 import java.util.ArrayList;
@@ -44,8 +43,6 @@ public static CircumventionSuite initForAutoRun() {
                 list.add(new Psiphon());
             if (pm == null || pm.isTestTor())
                 list.add(new Tor());
-            if (pm == null || pm.isTestRiseupVPN())
-                list.add(new RiseupVPN());
             super.setTestList(Lists.transform(list, test -> {
                 if (getAutoRun()) test.setOrigin(AbstractTest.AUTORUN);
                 return test;

diff --git a/app/src/test/java/org/openobservatory/ooniprobe/test/suite/CircumventionSuiteTest.java b/app/src/test/java/org/openobservatory/ooniprobe/test/suite/CircumventionSuiteTest.java
@@ -4,7 +4,6 @@
 import org.openobservatory.ooniprobe.common.PreferenceManager;
 import org.openobservatory.ooniprobe.test.test.AbstractTest;
 import org.openobservatory.ooniprobe.test.test.Psiphon;
-import org.openobservatory.ooniprobe.test.test.RiseupVPN;
 import org.openobservatory.ooniprobe.test.test.Tor;
 
 import java.util.Arrays;
@@ -24,7 +23,6 @@ public class CircumventionSuiteTest {
     public void getTestList_empty() {
         when(pm.isTestPsiphon()).thenReturn(false);
         when(pm.isTestTor()).thenReturn(false);
-        when(pm.isTestRiseupVPN()).thenReturn(false);
 
         AbstractTest[] tests = suite.getTestList(pm);
 
@@ -39,10 +37,9 @@ public void getTestList_full() {
 
         List<AbstractTest> tests = Arrays.asList(suite.getTestList(pm));
 
-        assertEquals(3, tests.size());
+        assertEquals(2, tests.size());
         assertTrue(findTestClass(tests, Psiphon.class));
         assertTrue(findTestClass(tests, Tor.class));
-        assertTrue(findTestClass(tests, RiseupVPN.class));
     }
 
     private boolean findTestClass(List<AbstractTest> tests, Class<? extends AbstractTest> klass) {

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -40,7 +40,7 @@ markwon = "2.0.1"
 shapeofview = "1.3.2"
 targetSdk = "33"
 minSdk = "21"
-oonimkall = "2023.10.12-183140"
+oonimkall = "2023.10.20-093834"
 
 junit = "4.13.2"
 dbflow = "4.2.4"