diff --git a/android/BUILD.gn b/android/BUILD.gn index 117250e02569..f9e2a20b3064 100644 --- a/android/BUILD.gn +++ b/android/BUILD.gn @@ -3,6 +3,7 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this file, # You can obtain one at https://mozilla.org/MPL/2.0/. +import("//brave/browser/brave_stats/buildflags.gni") import("//brave/components/ai_chat/core/common/buildflags/buildflags.gni") import("//brave/components/p3a/buildflags.gni") import("//brave/components/webcompat_reporter/buildflags/buildflags.gni") @@ -26,5 +27,6 @@ java_cpp_template("brave_config_java") { "BRAVE_ANDROID_P3A_ENABLED=$brave_p3a_enabled", "BRAVE_ANDROID_WEBCOMPAT_REPORT_ENDPOINT=\"$webcompat_report_api_endpoint\"", "BRAVE_ANDROID_AI_CHAT_ENABLED=$enable_ai_chat", + "BRAVE_ANDROID_FEEDBACK_REPORT_ENDPOINT=\"$android_feedback_report_api_endpoint\"", ] } diff --git a/android/java/org/chromium/chrome/browser/rate/RateFeedbackUtils.java b/android/java/org/chromium/chrome/browser/rate/RateFeedbackUtils.java index 4f672c48b848..e628459ff264 100644 --- a/android/java/org/chromium/chrome/browser/rate/RateFeedbackUtils.java +++ b/android/java/org/chromium/chrome/browser/rate/RateFeedbackUtils.java @@ -16,6 +16,7 @@ import org.chromium.base.Log; import org.chromium.base.ThreadUtils; import org.chromium.base.task.AsyncTask; +import org.chromium.chrome.browser.BraveConfig; import org.chromium.chrome.browser.about_settings.AboutChromeSettings; import org.chromium.chrome.browser.about_settings.AboutSettingsBridge; import org.chromium.chrome.browser.ntp_background_images.NTPBackgroundImagesBridge; @@ -35,7 +36,6 @@ public class RateFeedbackUtils { private static final String TAG = "Rate_Brave"; - private static final String RATE_URL = "https://laptop-updates.brave.com/1/feedback"; public interface RateFeedbackCallback { void rateFeedbackSubmitted(); @@ -69,8 +69,9 @@ protected void onPostExecute(Void result) { private static void sendRateFeedback(String userSelection, String userFeedback) { Context context = ContextUtils.getApplicationContext(); - String appVersion = AboutChromeSettings.getApplicationVersion( - context, AboutSettingsBridge.getApplicationVersion()); + String appVersion = + AboutChromeSettings.getApplicationVersion( + context, AboutSettingsBridge.getApplicationVersion()); StringBuilder sb = new StringBuilder(); Profile mProfile = ProfileManager.getLastUsedRegularProfile(); @@ -79,9 +80,11 @@ private static void sendRateFeedback(String userSelection, String userFeedback) HttpURLConnection urlConnection = null; try { - URL url = new URL(RATE_URL); - urlConnection = (HttpURLConnection) ChromiumNetworkAdapter.openConnection( - url, NetworkTrafficAnnotationTag.MISSING_TRAFFIC_ANNOTATION); + URL url = new URL(BraveConfig.FEEDBACK_REPORT_ENDPOINT); + urlConnection = + (HttpURLConnection) + ChromiumNetworkAdapter.openConnection( + url, NetworkTrafficAnnotationTag.MISSING_TRAFFIC_ANNOTATION); urlConnection.setDoOutput(true); urlConnection.setRequestMethod("POST"); urlConnection.setUseCaches(false); diff --git a/browser/brave_stats/BUILD.gn b/browser/brave_stats/BUILD.gn index af6bfdf296ab..80a6a55d5ec8 100644 --- a/browser/brave_stats/BUILD.gn +++ b/browser/brave_stats/BUILD.gn @@ -3,16 +3,9 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this file, # You can obtain one at http://mozilla.org/MPL/2.0/. */ +import("//brave/browser/brave_stats/buildflags.gni") import("//build/buildflag_header.gni") -declare_args() { - brave_stats_updater_url = "" -} - -if (is_official_build) { - assert(brave_stats_updater_url != "") -} - buildflag_header("buildflags") { header = "buildflags.h" flags = [ "BRAVE_USAGE_SERVER=\"$brave_stats_updater_url\"" ] diff --git a/browser/brave_stats/buildflags.gni b/browser/brave_stats/buildflags.gni new file mode 100644 index 000000000000..db28d42acecf --- /dev/null +++ b/browser/brave_stats/buildflags.gni @@ -0,0 +1,14 @@ +# Copyright (c) 2024 The Brave Authors. All rights reserved. +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this file, +# You can obtain one at https://mozilla.org/MPL/2.0/. + +declare_args() { + brave_stats_updater_url = "" + android_feedback_report_api_endpoint = "" +} + +if (is_official_build) { + assert(brave_stats_updater_url != "") + assert(android_feedback_report_api_endpoint != "") +} diff --git a/build/android/java/templates/BraveConfig.template b/build/android/java/templates/BraveConfig.template index 025d376ef274..c62790f4b1aa 100644 --- a/build/android/java/templates/BraveConfig.template +++ b/build/android/java/templates/BraveConfig.template @@ -13,4 +13,5 @@ public class BraveConfig { public static final boolean P3A_ENABLED = BRAVE_ANDROID_P3A_ENABLED; public static final boolean AI_CHAT_ENABLED = BRAVE_ANDROID_AI_CHAT_ENABLED; public static final String WEBCOMPAT_REPORT_ENDPOINT = BRAVE_ANDROID_WEBCOMPAT_REPORT_ENDPOINT; + public static final String FEEDBACK_REPORT_ENDPOINT = BRAVE_ANDROID_FEEDBACK_REPORT_ENDPOINT; } diff --git a/build/commands/lib/config.js b/build/commands/lib/config.js index c7de4a339a63..d0c4a36ae4f8 100644 --- a/build/commands/lib/config.js +++ b/build/commands/lib/config.js @@ -227,6 +227,7 @@ const Config = function () { this.realRewrapperDir = process.env.RBE_DIR || path.join(this.srcDir, 'buildtools', 'reclient') this.braveStatsApiKey = getEnvConfig(['brave_stats_api_key']) || '' this.braveStatsUpdaterUrl = getEnvConfig(['brave_stats_updater_url']) || '' + this.androidFeedbackReportAPIEndpoint = getEnvConfig(['android_feedback_report_api_endpoint']) || '' this.ignore_compile_failure = false this.enable_hangout_services_extension = false this.enable_pseudolocales = false @@ -411,6 +412,7 @@ Config.prototype.buildArgs = function () { rewards_grant_prod_endpoint: this.rewardsGrantProdEndpoint, brave_stats_api_key: this.braveStatsApiKey, brave_stats_updater_url: this.braveStatsUpdaterUrl, + android_feedback_report_api_endpoint: this.androidFeedbackReportAPIEndpoint, enable_hangout_services_extension: this.enable_hangout_services_extension, enable_cdm_host_verification: this.enableCDMHostVerification(), enable_pseudolocales: this.enable_pseudolocales, @@ -710,6 +712,7 @@ Config.prototype.buildArgs = function () { delete args.brave_google_api_endpoint delete args.brave_google_api_key delete args.brave_stats_updater_url + delete args.android_feedback_report_api_endpoint delete args.bitflyer_production_client_id delete args.bitflyer_production_client_secret delete args.bitflyer_production_fee_address diff --git a/components/brave_referrals/browser/BUILD.gn b/components/brave_referrals/browser/BUILD.gn index 4900d2964713..0192e6cfce3b 100644 --- a/components/brave_referrals/browser/BUILD.gn +++ b/components/brave_referrals/browser/BUILD.gn @@ -20,6 +20,7 @@ static_library("browser") { deps = [ "//base", + "//brave/brave_domains", "//brave/components/brave_stats/browser", "//brave/components/constants", "//brave/vendor/brave_base", diff --git a/components/brave_referrals/browser/brave_referrals_service.cc b/components/brave_referrals/browser/brave_referrals_service.cc index 04511a889824..c2cc17a57ff2 100644 --- a/components/brave_referrals/browser/brave_referrals_service.cc +++ b/components/brave_referrals/browser/brave_referrals_service.cc @@ -19,6 +19,7 @@ #include "base/strings/stringprintf.h" #include "base/task/thread_pool.h" #include "base/values.h" +#include "brave/brave_domains/service_domains.h" #include "brave/components/brave_referrals/common/pref_names.h" #include "brave/components/constants/network_constants.h" #include "brave/components/constants/pref_names.h" @@ -129,15 +130,14 @@ std::string ReadPromoCode(const base::FilePath& promo_code_file) { std::string BuildReferralEndpoint(const std::string& path) { std::unique_ptr env(base::Environment::Create()); std::string referral_server; - std::string proto = "https"; env->GetVar("BRAVE_REFERRALS_SERVER", &referral_server); - if (referral_server.empty()) - referral_server = kBraveReferralsServer; - if (env->HasVar("BRAVE_REFERRALS_LOCAL")) - proto = "http"; + if (referral_server.empty()) { + auto referral_domain = brave_domains::GetServicesDomain("usage-ping"); + referral_server = base::StrCat( + {url::kHttpsScheme, url::kStandardSchemeSeparator, referral_domain}); + } - return base::StringPrintf("%s://%s%s", proto.c_str(), referral_server.c_str(), - path.c_str()); + return referral_server + path; } } // namespace diff --git a/components/constants/network_constants.h b/components/constants/network_constants.h index 87b1260f2794..4ed589545cbc 100644 --- a/components/constants/network_constants.h +++ b/components/constants/network_constants.h @@ -14,7 +14,6 @@ inline constexpr char kBraveSoftwareProxyPattern[] = inline constexpr char kBraveUsageStandardPath[] = "/1/usage/brave-core"; -inline constexpr char kBraveReferralsServer[] = "laptop-updates.brave.com"; inline constexpr char kBraveReferralsInitPath[] = "/promo/initialize/nonua"; inline constexpr char kBraveReferralsActivityPath[] = "/promo/activity"; diff --git a/ios/brave-ios/Sources/Growth/DAU.swift b/ios/brave-ios/Sources/Growth/DAU.swift index f2db248b1579..c0a782eff959 100644 --- a/ios/brave-ios/Sources/Growth/DAU.swift +++ b/ios/brave-ios/Sources/Growth/DAU.swift @@ -20,8 +20,8 @@ public class DAU { // TODO: Handle via brave-stats-updater-server switch and get URL from brave_stats_updater_url let domain = AppConstants.isOfficialBuild - ? "https://laptop-updates.brave.com/" - : "https://laptop-updates.bravesoftware.com/" + ? "https://usage-ping.brave.com/" + : "https://usage-ping.bravesoftware.com/" return "\(domain)\(apiVersion)/usage/ios?platform=ios" } diff --git a/ios/brave-ios/Sources/Growth/URP/UserReferralProgram.swift b/ios/brave-ios/Sources/Growth/URP/UserReferralProgram.swift index 6368df3467bb..9a0b22bf50b9 100644 --- a/ios/brave-ios/Sources/Growth/URP/UserReferralProgram.swift +++ b/ios/brave-ios/Sources/Growth/URP/UserReferralProgram.swift @@ -18,8 +18,8 @@ public class UserReferralProgram { public static let shared = UserReferralProgram() struct HostUrl { - static let staging = "https://laptop-updates.bravesoftware.com" - static let prod = "https://laptop-updates.brave.com" + static let staging = "https://usage-ping.bravesoftware.com" + static let prod = "https://usage-ping.brave.com" } let adServicesURLString = "https://api-adservices.apple.com/api/v1/"