Updated rules for storing preferences

ooni · Nov 3, 2023 · 5fbc024 · 5fbc024
1 parent 20a3160
commit 5fbc024
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 10 deletions.
diff --git a/app/src/main/java/org/openobservatory/ooniprobe/activity/runtests/RunTestsViewModel.kt b/app/src/main/java/org/openobservatory/ooniprobe/activity/runtests/RunTestsViewModel.kt
@@ -58,15 +58,11 @@ class RunTestsViewModel() : ViewModel() {
 	}
 
 	fun disableTest(name: String) {
-		if (!ExperimentalSuite().getTestList(preferenceManager).map { it.name }.contains(name)) {
-			preferenceManager.disableTest(name)
-		}
+		preferenceManager.disableTest(name)
 	}
 
 	fun enableTest(name: String) {
-		if (!ExperimentalSuite().getTestList(preferenceManager).map { it.name }.contains(name)) {
-			preferenceManager.enableTest(name)
-		}
+		preferenceManager.enableTest(name)
 	}
 
 	companion object {

diff --git a/.../openobservatory/ooniprobe/activity/runtests/adapter/RunTestsExpandableListViewAdapter.kt b/.../openobservatory/ooniprobe/activity/runtests/adapter/RunTestsExpandableListViewAdapter.kt
@@ -74,9 +74,15 @@ class RunTestsExpandableListViewAdapter(
 				}
 			} else {
 				groupSelectionIndicator.setImageResource(R.drawable.check_box_outline_blank)
+				if (groupItem.name == ExperimentalSuite.NAME) {
+					mViewModel.disableTest(ExperimentalSuite.NAME)
+				}
 			}
 		} else {
 			groupSelectionIndicator.setImageResource(R.drawable.check_box_outline_blank)
+			if (groupItem.name == ExperimentalSuite.NAME) {
+				mViewModel.disableTest(ExperimentalSuite.NAME)
+			}
 		}
 		groupSelectionIndicator.setOnClickListener {
 			if (groupItem.selected && isSelectAllChildItems(groupItem.nettests)) {

diff --git a/app/src/main/java/org/openobservatory/ooniprobe/common/PreferenceManagerExtension.kt b/app/src/main/java/org/openobservatory/ooniprobe/common/PreferenceManagerExtension.kt
@@ -5,12 +5,31 @@ import org.openobservatory.ooniprobe.test.suite.ExperimentalSuite
 import org.openobservatory.ooniprobe.test.test.*
 
 
-fun PreferenceManager.enableTest(name: String) {
-	this.setValue(name, true)
+private fun PreferenceManager.exclusionList(): MutableList<String> {
+	val exclusionList = mutableListOf<String>()
+	ExperimentalSuite().run {
+		exclusionList.addAll(getTestList(this@exclusionList).map { it.name })
+		exclusionList.addAll(longRunningTests().map { it.name })
+	}
+
+	return exclusionList
+
 }
 
-fun PreferenceManager.disableTest(name: String) {
-	this.setValue(name, false)
+fun PreferenceManager.enableTest(name: String): Boolean {
+	if (!exclusionList().contains(name)) {
+		this.setValue(name, true)
+		return true
+	}
+	return false
+}
+
+fun PreferenceManager.disableTest(name: String): Boolean {
+	if (!exclusionList().contains(name)) {
+		this.setValue(name, false)
+		return true
+	}
+	return false
 }
 
 fun PreferenceManager.setValue(name: String, value: Boolean) {