Discharge7443/brave-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Account: unblocks AuthenticationObserver usage in iOS Settings (#35925)

Browse Source
This commit is contained in:
Szilard Szaloki
2026-04-28 14:58:21 -06:00
committed by GitHub
parent a78dc42b6a
commit 4d70eeff99
26 changed files with 1038 additions and 772 deletions
Download Patch File Download Diff File Expand all files Collapse all files
android/java/org/chromium/chrome/browser/settings/BraveAccountSectionController.java
+22 -28
View File
@@ -21,8 +21,9 @@ import org.chromium.brave_account.mojom.AccountState;
import org.chromium.brave_account.mojom.Authentication;
import org.chromium.brave_account.mojom.AuthenticationObserver;
import org.chromium.brave_account.mojom.ResendConfirmationEmailError;
import org.chromium.brave_account.mojom.ResendConfirmationEmailErrorCode;
import org.chromium.brave_account.mojom.ResendConfirmationEmailResult;
import org.chromium.brave_account.mojom.ResendConfirmationEmailServerError;
import org.chromium.brave_account.mojom.ResendConfirmationEmailServerErrorCode;
import org.chromium.build.annotations.NullMarked;
import org.chromium.build.annotations.Nullable;
import org.chromium.chrome.R;
@@ -40,11 +41,11 @@ import java.util.Map;
@NullMarked
public class BraveAccountSectionController
implements AuthenticationObserver, ConnectionErrorHandler {
private static final Map<Integer, Integer> ERROR_STRINGS =
private static final Map<Integer, Integer> SERVER_ERROR_STRINGS =
Map.of(
ResendConfirmationEmailErrorCode.MAXIMUM_EMAIL_SEND_ATTEMPTS_EXCEEDED,
ResendConfirmationEmailServerErrorCode.MAXIMUM_EMAIL_SEND_ATTEMPTS_EXCEEDED,
R.string.brave_account_resend_confirmation_email_maximum_send_attempts_exceeded,
ResendConfirmationEmailErrorCode.EMAIL_ALREADY_VERIFIED,
ResendConfirmationEmailServerErrorCode.EMAIL_ALREADY_VERIFIED,
R.string.brave_account_resend_confirmation_email_already_verified);
private static final String PREF_BRAVE_ACCOUNT_SECTION = "brave_account_section";
@@ -242,27 +243,22 @@ public class BraveAccountSectionController
return mFragment.getString(R.string.brave_account_resend_confirmation_email_success);
}
if (error.netErrorOrHttpStatus == null) {
// client-side error
if (error.which() == ResendConfirmationEmailError.Tag.ClientError) {
return mFragment
.getString(R.string.brave_account_client_error)
.replace(
"$1",
error.errorCode != null
? String.format(
Locale.ROOT,
" (%s=%d)",
mFragment.getString(R.string.brave_account_error),
error.errorCode)
: "");
String.format(
Locale.ROOT,
" (%s=%d)",
mFragment.getString(R.string.brave_account_error),
error.getClientError().errorCode));
}
// server-side error
if (error.errorCode != null) {
Integer stringId = ERROR_STRINGS.get(error.errorCode);
if (stringId != null) {
return mFragment.getString(stringId);
}
ResendConfirmationEmailServerError serverError = error.getServerError();
Integer stringId = SERVER_ERROR_STRINGS.get(serverError.errorCode);
if (stringId != null) {
return mFragment.getString(stringId);
}
return mFragment
@@ -272,17 +268,15 @@ public class BraveAccountSectionController
String.format(
Locale.ROOT,
"%s=%d",
error.netErrorOrHttpStatus > 0 ? "HTTP" : "NET",
error.netErrorOrHttpStatus))
serverError.netErrorOrHttpStatus > 0 ? "HTTP" : "NET",
serverError.netErrorOrHttpStatus))
.replace(
"$2",
error.errorCode != null
? String.format(
Locale.ROOT,
", %s=%d",
mFragment.getString(R.string.brave_account_error),
error.errorCode)
: "");
String.format(
Locale.ROOT,
", %s=%d",
mFragment.getString(R.string.brave_account_error),
serverError.errorCode));
}
private void showAlertDialog(