From 2ec805f0296182f3b11bcf22dd4d581eee0b7854 Mon Sep 17 00:00:00 2001
From: Norbel AMBANUMBEN <aanorbel@gmail.com>
Date: Mon, 23 Sep 2024 19:59:32 +0100
Subject: [PATCH] chore: move to prod domain

---
 app/build.gradle                 | 12 ++++--------
 app/src/ooni/AndroidManifest.xml |  4 ++--
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index c535a80b9..a5f3a70f8 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -16,12 +16,12 @@ android {
         versionName '3.9.0-beta'
         versionCode 119
 		testInstrumentationRunner "org.openobservatory.ooniprobe.TestAndroidJUnitRunner"
-		buildConfigField 'String', 'OONI_API_BASE_URL', '"https://api.ooni.io/"'
+        buildConfigField 'String', 'OONI_API_BASE_URL', '"https://api.prod.ooni.io"'
 		buildConfigField 'String', 'NOTIFICATION_SERVER', '"https://countly.ooni.io"'
-        buildConfigField 'String', 'OONI_RUN_DASHBOARD_URL', '"https://run.test.ooni.org"'
+        buildConfigField 'String', 'OONI_RUN_DASHBOARD_URL', '"https://run.ooni.org"'
         resValue "string", "APP_ID", 'org.openobservatory.ooniprobe'
 		resValue "string", "APP_NAME", "OONI Probe"
-		resValue "string", "RUN_V2_DOMAIN", "run.test.ooni.org"
+		resValue "string", "RUN_V2_DOMAIN", "run.ooni.org"
 		buildConfigField 'String', 'SOFTWARE_NAME', 'BASE_SOFTWARE_NAME+IS_DEBUG'
 		buildConfigField 'String', 'COUNTLY_KEY', '"146836f41172f9e3287cab6f2cc347de3f5ddf3b"'
 		buildConfigField "boolean", "RUN_AUTOMATION", "false"
@@ -64,15 +64,13 @@ android {
             resValue "string", "APP_NAME", "News Media Scan"
             buildConfigField 'String', 'BASE_SOFTWARE_NAME', '"news-media-scan-android"'
             buildConfigField 'String', 'OONI_API_BASE_URL', '"https://api.prod.ooni.io"'
-            buildConfigField 'String', 'OONI_RUN_DASHBOARD_URL', '"https://run-v2.ooni.org"'
             buildConfigField "boolean", "SHOW_DISABLED_CARDS", "false"
         }
         stable {
             dimension 'testing'
             buildConfigField 'String', 'BASE_SOFTWARE_NAME', '"ooniprobe-android"'
             buildConfigField 'String', 'OONI_API_BASE_URL', '"https://api.prod.ooni.io"'
-            buildConfigField 'String', 'OONI_RUN_DASHBOARD_URL', '"https://run-v2.ooni.org"'
-            // resValue "string", "RUN_V2_DOMAIN", "run.ooni.org"
+            buildConfigField 'String', 'OONI_RUN_DASHBOARD_URL', '"https://run.ooni.org"'
         }
         dev {
             dimension 'testing'
@@ -81,7 +79,6 @@ android {
             versionCode resolveVersionCode()
             buildConfigField 'String', 'BASE_SOFTWARE_NAME', '"ooniprobe-android-dev"'
             resValue "string", "APP_NAME", "OONI Dev"
-            buildConfigField 'String', 'OONI_API_BASE_URL', '"https://api.dev.ooni.io"'
             buildConfigField 'String', 'COUNTLY_KEY', '"e6c2cfe53e85951d50567467cef3f9fa2eab32c3"'
         }
         experimental {
@@ -91,7 +88,6 @@ android {
             versionCode resolveVersionCode()
             buildConfigField 'String', 'BASE_SOFTWARE_NAME', '"ooniprobe-android-experimental"'
             resValue "string", "APP_NAME", "OONI Exp"
-            buildConfigField 'String', 'OONI_API_BASE_URL', '"https://api.dev.ooni.io"'
             buildConfigField 'String', 'COUNTLY_KEY', '"e6c2cfe53e85951d50567467cef3f9fa2eab32c3"'
         }
         fdroid {
diff --git a/app/src/ooni/AndroidManifest.xml b/app/src/ooni/AndroidManifest.xml
index 820b044ff..cebb1eb17 100644
--- a/app/src/ooni/AndroidManifest.xml
+++ b/app/src/ooni/AndroidManifest.xml
@@ -27,7 +27,7 @@
                     android:scheme="https" />
             </intent-filter>
 
-            <intent-filter android:autoVerify="true">
+            <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
 
                 <category android:name="android.intent.category.DEFAULT" />
@@ -80,7 +80,7 @@
                     android:pathPrefix="/nettest"
                     android:scheme="http" />
             </intent-filter>
-            <intent-filter android:autoVerify="true">
+            <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
 
                 <category android:name="android.intent.category.DEFAULT" />