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

…07-revisited
ooni · Oct 6, 2023 · a2033a0 · a2033a0
2 parents db3db7b + 1972bf1
commit a2033a0
Show file tree

Hide file tree

Showing 84 changed files with 857 additions and 1,436 deletions.
diff --git a/NOTICE b/NOTICE
@@ -19,7 +19,6 @@ Terms: https://firebase.google.com/terms/
 
 - easypermissions
 - LocalhostToolkit
-- butterknife
 - DBFlow
 - LocalhostToolkit
 - MarkdownView
diff --git a/app/build.gradle b/app/build.gradle
@@ -14,6 +14,7 @@ android {
 		testInstrumentationRunner "org.openobservatory.ooniprobe.TestAndroidJUnitRunner"
 		buildConfigField 'String', 'OONI_API_BASE_URL', '"https://api.ooni.io/"'
 		buildConfigField 'String', 'NOTIFICATION_SERVER', '"https://countly.ooni.io"'
+        resValue "string", "APP_ID", 'org.openobservatory.ooniprobe'
 		resValue "string", "APP_NAME", "OONI Probe"
 		buildConfigField 'String', 'SOFTWARE_NAME', 'BASE_SOFTWARE_NAME+IS_DEBUG'
 		buildConfigField 'String', 'COUNTLY_KEY', '"146836f41172f9e3287cab6f2cc347de3f5ddf3b"'
@@ -41,18 +42,6 @@ android {
         }
     }
 
-    // Shared test code between Unit and Instrumented tests
-    sourceSets {
-        androidTest {
-            java.srcDirs += "src/sharedTest/java"
-            resources.srcDirs += "src/sharedTest/resources"
-        }
-        test {
-            java.srcDirs += "src/sharedTest/java"
-            resources.srcDirs += "src/sharedTest/resources"
-        }
-    }
-
     flavorDimensions 'testing', 'license'
     productFlavors {
         stable {
@@ -65,6 +54,7 @@ android {
             versionNameSuffix "-beta.1"
             versionCode versionCodeDate()
             buildConfigField 'String', 'BASE_SOFTWARE_NAME', '"ooniprobe-android-dev"'
+            resValue "string", "APP_ID", 'org.openobservatory.ooniprobe.dev'
             resValue "string", "APP_NAME", "OONI Dev"
             buildConfigField 'String', 'COUNTLY_KEY', '"e6c2cfe53e85951d50567467cef3f9fa2eab32c3"'
         }
@@ -74,6 +64,7 @@ android {
             versionNameSuffix "-experimental.1"
             versionCode versionCodeDate()
             buildConfigField 'String', 'BASE_SOFTWARE_NAME', '"ooniprobe-android-experimental"'
+            resValue "string", "APP_ID", 'org.openobservatory.ooniprobe.experimental'
             resValue "string", "APP_NAME", "OONI Exp"
             buildConfigField 'String', 'COUNTLY_KEY', '"e6c2cfe53e85951d50567467cef3f9fa2eab32c3"'
         }
@@ -123,9 +114,6 @@ dependencies {
 	implementation 'com.squareup.okhttp3:logging-interceptor:4.9.1'
 
 
-	implementation 'com.jakewharton:butterknife:10.2.3'
-	annotationProcessor 'com.jakewharton:butterknife-compiler:10.2.3'
-
 	implementation 'com.github.xanscale.LocalhostToolkit:app:19.05.01'
 	implementation 'com.airbnb.android:lottie:3.0.7'
 	implementation 'com.google.code.gson:gson:2.8.9'
@@ -150,36 +138,31 @@ dependencies {
 
 // Testing
 	// Unit Testing
+    testImplementation project(':shared-test')
 	testImplementation 'junit:junit:4.13.2'
-	testImplementation 'androidx.test:core:1.4.0'
-	testImplementation 'androidx.test:runner:1.4.0'
-	testImplementation 'androidx.test:rules:1.4.0'
-	testImplementation 'org.mockito:mockito-core:4.6.1'
+	testImplementation 'androidx.test:core:1.5.0'
+	testImplementation 'androidx.test:runner:1.5.2'
+	testImplementation 'androidx.test:rules:1.5.0'
+	testImplementation 'org.mockito:mockito-core:5.3.1'
 	testImplementation 'org.mockito:mockito-inline:4.6.1'
-	testImplementation 'org.robolectric:robolectric:4.5.1'
+	testImplementation 'org.robolectric:robolectric:4.10.3'
 	testImplementation 'com.github.blocoio:faker:1.2.8'
 	testImplementation 'org.ooni:oonimkall:2023.07.18-162729'
 	testAnnotationProcessor 'com.google.dagger:dagger-compiler:2.36'
 
 	// Instrumentation Testing
+    androidTestImplementation project(':shared-test')
 	androidTestImplementation 'tools.fastlane:screengrab:2.0.0'
 	androidTestImplementation 'com.github.blocoio:faker:1.2.8'
-	androidTestImplementation 'androidx.test:runner:1.4.0'
-	androidTestImplementation 'androidx.test:rules:1.4.0'
-	androidTestImplementation 'androidx.test.ext:junit:1.1.3'
-	androidTestImplementation 'androidx.test.espresso:espresso-intents:3.4.0'
-	androidTestImplementation('androidx.test.espresso:espresso-contrib:3.4.0') {
-		exclude group: 'com.android.support', module: 'appcompat'
-		exclude group: 'com.android.support', module: 'support-v4'
-		exclude module: 'recyclerview-v7'
-	}
-	androidTestImplementation('androidx.test.espresso:espresso-core:3.4.0') {
-		exclude group: 'com.android.support', module: 'appcompat'
-		exclude group: 'com.android.support', module: 'support-v4'
-		exclude module: 'recyclerview-v7'
-	}
-	androidTestImplementation('com.schibsted.spain:barista:3.9.0')
+	androidTestImplementation 'androidx.test:runner:1.5.2'
+	androidTestImplementation 'androidx.test:rules:1.5.0'
+	androidTestImplementation 'androidx.test.ext:junit:1.1.5'
+	androidTestImplementation 'androidx.test.espresso:espresso-intents:3.5.1'
+	androidTestImplementation 'androidx.test.espresso:espresso-contrib:3.5.1'
+	androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
+	androidTestImplementation 'com.schibsted.spain:barista:3.9.0'
 	androidTestAnnotationProcessor "com.google.dagger:dagger-compiler:2.36"
+
 }
 
 static def versionCodeDate() {

diff --git a/app/src/dev/res/values/untranslatable.xml b/app/src/dev/res/values/untranslatable.xml
diff --git a/app/src/experimental/res/values/untranslatable.xml b/app/src/experimental/res/values/untranslatable.xml
diff --git a/app/src/fdroid/res/xml/preferences_global.xml b/app/src/fdroid/res/xml/preferences_global.xml
@@ -355,7 +355,9 @@
 			app:iconSpaceReserved="false"
 			android:key="logs"
 			android:title="@string/Settings_Advanced_RecentLogs">
-			<intent android:action="@string/preference_intent_log_activity" />
+			<intent
+				android:targetPackage="@string/APP_ID"
+				android:targetClass="@string/preference_intent_log_activity"/>
 		</PreferenceScreen>
 		<SwitchPreferenceCompat
 			android:defaultValue="false"
@@ -378,7 +380,9 @@
 		android:icon="@drawable/proxy"
 		android:key="@string/ooni_backend_proxy"
 		android:title="@string/Settings_Proxy_Label">
-		<intent	android:action="@string/preference_intent_proxy_activity" />
+		<intent
+			android:targetPackage="@string/APP_ID"
+			android:targetClass="@string/preference_intent_proxy_activity"/>
 	</PreferenceScreen>
 	<PreferenceScreen
 		android:icon="@drawable/send_email"
@@ -388,6 +392,8 @@
 		android:icon="@drawable/about_ooni"
 		android:key="@string/about_ooni"
 		android:title="@string/Settings_About_Label">
-		<intent android:action="@string/preference_intent_about_ooni" />
+		<intent
+			android:targetPackage="@string/APP_ID"
+			android:targetClass="@string/preference_intent_about_ooni" />
 	</PreferenceScreen>
 </PreferenceScreen>
diff --git a/app/src/main/java/org/openobservatory/ooniprobe/activity/CustomWebsiteActivity.java b/app/src/main/java/org/openobservatory/ooniprobe/activity/CustomWebsiteActivity.java
@@ -1,55 +1,42 @@
 package org.openobservatory.ooniprobe.activity;
 
 import android.content.DialogInterface;
-import android.content.Intent;
 import android.os.Bundle;
 import android.util.Patterns;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.EditText;
 import android.widget.ImageButton;
-import android.widget.LinearLayout;
-
 import androidx.annotation.Nullable;
-import androidx.appcompat.widget.Toolbar;
-import androidx.core.app.ActivityCompat;
-
+import localhost.toolkit.app.fragment.ConfirmDialogFragment;
 import org.openobservatory.ooniprobe.R;
 import org.openobservatory.ooniprobe.common.PreferenceManager;
+import org.openobservatory.ooniprobe.databinding.ActivityCustomwebsiteBinding;
 import org.openobservatory.ooniprobe.model.database.Url;
 import org.openobservatory.ooniprobe.test.suite.WebsitesSuite;
 
+import javax.inject.Inject;
 import java.io.Serializable;
 import java.util.ArrayList;
 
-import javax.inject.Inject;
-
-import butterknife.BindView;
-import butterknife.ButterKnife;
-import butterknife.OnClick;
-import localhost.toolkit.app.fragment.ConfirmDialogFragment;
-
 public class CustomWebsiteActivity extends AbstractActivity implements ConfirmDialogFragment.OnConfirmedListener {
-    @BindView(R.id.urlContainer)
-    LinearLayout urlContainer;
-    @BindView(R.id.bottomBar)
-    Toolbar bottomBar;
     private ArrayList<EditText> editTexts;
     private ArrayList<ImageButton> deletes;
 
     @Inject
     PreferenceManager preferenceManager;
+    private ActivityCustomwebsiteBinding binding;
 
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         getActivityComponent().inject(this);
-        setContentView(R.layout.activity_customwebsite);
-        ButterKnife.bind(this);
+        binding = ActivityCustomwebsiteBinding.inflate(getLayoutInflater());
+        setContentView(binding.getRoot());
         editTexts = new ArrayList<>();
         deletes = new ArrayList<>();
-        bottomBar.inflateMenu(R.menu.run);
-        bottomBar.setOnMenuItemClickListener(item -> {
+        binding.bottomBar.inflateMenu(R.menu.run);
+        binding.bottomBar.setOnMenuItemClickListener(item -> {
             if (!checkPrefix())
                 return false;
             ArrayList<String> urls = new ArrayList<>(editTexts.size());
@@ -66,6 +53,7 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
             RunningActivity.runAsForegroundService(CustomWebsiteActivity.this, suite.asArray(), this::finish, preferenceManager);
             return true;
         });
+        binding.add.setOnClickListener(v -> add());
         add();
     }
 
@@ -103,12 +91,11 @@ public boolean onSupportNavigateUp() {
         return true;
     }
 
-    @OnClick(R.id.add)
     void add() {
-        ViewGroup urlBox = (ViewGroup) getLayoutInflater().inflate(R.layout.edittext_url, urlContainer, false);
+        ViewGroup urlBox = (ViewGroup) getLayoutInflater().inflate(R.layout.edittext_url, binding.urlContainer, false);
         EditText editText = urlBox.findViewById(R.id.editText);
         editTexts.add(editText);
-        urlContainer.addView(urlBox);
+        binding.urlContainer.addView(urlBox);
         ImageButton delete = urlBox.findViewById(R.id.delete);
         deletes.add(delete);
         delete.setTag(editText);
@@ -117,11 +104,11 @@ void add() {
             ((View) v.getParent()).setVisibility(View.GONE);
             editTexts.remove(tag);
             deletes.remove(v);
-            bottomBar.setTitle(getString(R.string.OONIRun_URLs, Integer.toString(editTexts.size())));
+            binding.bottomBar.setTitle(getString(R.string.OONIRun_URLs, Integer.toString(editTexts.size())));
             setVisibilityDelete();
         });
         setVisibilityDelete();
-        bottomBar.setTitle(getString(R.string.OONIRun_URLs, Integer.toString(editTexts.size())));
+        binding.bottomBar.setTitle(getString(R.string.OONIRun_URLs, Integer.toString(editTexts.size())));
     }
 
     private void setVisibilityDelete() {

diff --git a/app/src/main/java/org/openobservatory/ooniprobe/activity/InfoActivity.java b/app/src/main/java/org/openobservatory/ooniprobe/activity/InfoActivity.java
@@ -3,44 +3,40 @@
 import android.content.Intent;
 import android.net.Uri;
 import android.os.Bundle;
-import android.widget.TextView;
-
 import androidx.annotation.Nullable;
-import androidx.appcompat.widget.Toolbar;
-
 import org.openobservatory.ooniprobe.BuildConfig;
 import org.openobservatory.ooniprobe.R;
-
-import butterknife.BindView;
-import butterknife.ButterKnife;
-import butterknife.OnClick;
+import org.openobservatory.ooniprobe.databinding.ActivityInfoBinding;
 
 public class InfoActivity extends AbstractActivity {
-	@BindView(R.id.toolbar) Toolbar toolbar;
-	@BindView(R.id.version) TextView version;
 
 	@Override protected void onCreate(@Nullable Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
-		setContentView(R.layout.activity_info);
-		ButterKnife.bind(this);
-		setSupportActionBar(toolbar);
+		ActivityInfoBinding binding = ActivityInfoBinding.inflate(getLayoutInflater());
+		setContentView(binding.getRoot());
+		setSupportActionBar(binding.toolbar);
 		getSupportActionBar().setDisplayHomeAsUpEnabled(true);
-		version.setText(getString(R.string.version, BuildConfig.SOFTWARE_NAME, BuildConfig.VERSION_NAME));
+		binding.version.setText(getString(R.string.version, BuildConfig.SOFTWARE_NAME, BuildConfig.VERSION_NAME));
+
+		binding.blog.setOnClickListener(v -> onBlogClick());
+		binding.reports.setOnClickListener(v -> onReportsClick());
+		binding.learnMore.setOnClickListener(v -> onLearnMoreClick());
+		binding.dataPolicy.setOnClickListener(v -> onDataPolicyClick());
 	}
 
-	@OnClick(R.id.blog) void onBlogClick() {
+	void onBlogClick() {
 		startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse("https://ooni.org/blog/")));
 	}
 
-	@OnClick(R.id.reports) void onReportsClick() {
+	void onReportsClick() {
 		startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse("https://ooni.org/reports/")));
 	}
 
-	@OnClick(R.id.learnMore) void onLearnMoreClick() {
+	void onLearnMoreClick() {
 		startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse("https://ooni.org/")));
 	}
 
-	@OnClick(R.id.dataPolicy) void onDataPolicyClick() {
+	void onDataPolicyClick() {
 		startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse("https://ooni.org/about/data-policy/")));
 	}
 }
diff --git a/app/src/main/java/org/openobservatory/ooniprobe/activity/MainActivity.java b/app/src/main/java/org/openobservatory/ooniprobe/activity/MainActivity.java
@@ -12,6 +12,9 @@
 import androidx.activity.result.contract.ActivityResultContracts;
 import androidx.annotation.Nullable;
 import androidx.appcompat.app.AppCompatDelegate;
+import androidx.core.content.ContextCompat;
+
+import com.google.android.material.snackbar.Snackbar;
 
 import org.openobservatory.ooniprobe.R;
 import org.openobservatory.ooniprobe.common.PreferenceManager;