From 65b6891872e577eeeda793db30eb439cd7716d6c Mon Sep 17 00:00:00 2001 From: AlexeyBarabash Date: Fri, 8 Jul 2022 21:10:26 +0300 Subject: [PATCH] Fix sync error text on Android Now errors produced by join via QR and via sync words are the similar fixes brave/brave-browser#23948 --- .../browser/settings/BraveSyncScreensPreference.java | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/android/java/org/chromium/chrome/browser/settings/BraveSyncScreensPreference.java b/android/java/org/chromium/chrome/browser/settings/BraveSyncScreensPreference.java index bd9d62f3ca0..d072c11f517 100644 --- a/android/java/org/chromium/chrome/browser/settings/BraveSyncScreensPreference.java +++ b/android/java/org/chromium/chrome/browser/settings/BraveSyncScreensPreference.java @@ -246,16 +246,13 @@ public class BraveSyncScreensPreference extends BravePreferenceFragment if (null == getActivity()) { return; } - if (null != message && !message.isEmpty()) { - message = " [" + message + "]"; - } - final String messageFinal = (null == message) ? "" : message; + final String messageFinal = (null == message || message.isEmpty()) + ? getResources().getString(R.string.sync_device_failure) + : message; getActivity().runOnUiThread(new Runnable() { @Override public void run() { - showEndDialog( - getResources().getString(R.string.sync_device_failure) + messageFinal, - () -> {}); + showEndDialog(messageFinal, () -> {}); } }); } catch (Exception exc) {