Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix Language Change and Login Data Retention Issues #204

Draft
wants to merge 2 commits into
base: chromium
Choose a base branch
from
Draft

Fix Language Change and Login Data Retention Issues #204

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dadbaf5
Fixed the Language Change issue upto Android 12
itskartike910 Jan 2, 2025
0255103
Language issue in Android 13+
itskartike910 Jan 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
86 changes: 84 additions & 2 deletions src/chrome/android/java/src/org/chromium/chrome/browser/BrowserRestartActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,17 @@
import android.app.Activity;
import android.content.Context;
import android.content.Intent;
import android.content.res.Configuration;
import android.os.Bundle;
import android.os.Process;
import android.util.Log;

import org.chromium.base.ContextUtils;
import org.chromium.base.IntentUtils;
import org.chromium.chrome.browser.language.AppLocaleUtils;
import org.chromium.chrome.browser.preferences.ChromePreferenceKeys;

import java.util.Locale;

/**
* Kills and (optionally) restarts the main Chrome process, then immediately kills itself.
Expand All @@ -30,6 +36,8 @@ public class BrowserRestartActivity extends Activity {
public static final String EXTRA_RESTART =
"org.chromium.chrome.browser.BrowserRestartActivity.restart";

private static final String TAG = "BrowserRestartActivity";

/**
* Creates an Intent to start the {@link BrowserRestartActivity}. Must only be called by the
* {@link org.chromium.chrome.browser.init.ChromeLifetimeController}.
Expand All @@ -50,27 +58,101 @@ public static Intent createIntent(Context context, boolean restartChrome) {
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);

Log.i(TAG, "BrowserRestartActivity onCreate");

// Kill the main Chrome process.
Intent intent = getIntent();
int mainBrowserPid =
IntentUtils.safeGetIntExtra(intent, BrowserRestartActivity.EXTRA_MAIN_PID, -1);
assert mainBrowserPid != -1;
assert mainBrowserPid != Process.myPid();

Log.i(TAG, "Killing main browser process: " + mainBrowserPid);
Process.killProcess(mainBrowserPid);

// Fire an Intent to restart Chrome, if necessary.
boolean restart =
IntentUtils.safeGetBooleanExtra(
intent, BrowserRestartActivity.EXTRA_RESTART, false);

Log.i(TAG, "Should restart: " + restart);

if (restart) {
Context context = ContextUtils.getApplicationContext();
Intent restartIntent = new Intent(Intent.ACTION_MAIN);
restartIntent.setPackage(context.getPackageName());
restartIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
context.startActivity(restartIntent);
restartIntent.addCategory(Intent.CATEGORY_LAUNCHER);
restartIntent.setFlags(
Intent.FLAG_ACTIVITY_NEW_TASK |
Intent.FLAG_ACTIVITY_CLEAR_TASK |
Intent.FLAG_ACTIVITY_RESET_TASK_IF_NEEDED |
Intent.FLAG_ACTIVITY_CLEAR_TOP);

// Preserve locale information in restart intent
try {
String currentLocale = AppLocaleUtils.getAppLanguagePref();
Log.i(TAG, "Current locale before restart: " + currentLocale);
if (currentLocale != null) {
// Add locale to intent
restartIntent.putExtra(ChromePreferenceKeys.APPLICATION_OVERRIDE_LANGUAGE, currentLocale);

// Update configuration before restart
try {
Configuration config = new Configuration(context.getResources().getConfiguration());
Locale newLocale = Locale.forLanguageTag(currentLocale);
Locale.setDefault(newLocale);
config.setLocale(newLocale);
context.getResources().updateConfiguration(
config, context.getResources().getDisplayMetrics());
Log.i(TAG, "Updated configuration before restart with locale: " + newLocale);
} catch (Exception e) {
Log.e(TAG, "Error updating configuration before restart", e);
}

// For Android 13+, ensure system locale is set
if (AppLocaleUtils.shouldUseSystemManagedLocale()) {
try {
AppLocaleUtils.setSystemManagedAppLanguage(currentLocale);
Log.i(TAG, "Updated system managed locale before restart");
} catch (Exception e) {
Log.e(TAG, "Error updating system managed locale before restart", e);
}
}

Log.i(TAG, "Preserved locale in restart intent: " + currentLocale);
}
} catch (Exception e) {
Log.e(TAG, "Error preserving locale for restart", e);
}

try {
Log.i(TAG, "Starting new Chrome process with preserved locale");
context.startActivity(restartIntent);
} catch (Exception e) {
Log.e(TAG, "Error starting new Chrome process", e);
// Try fallback restart with preserved locale
try {
restartIntent = context.getPackageManager()
.getLaunchIntentForPackage(context.getPackageName());
if (restartIntent != null) {
Log.i(TAG, "Attempting fallback restart");
// Preserve locale in fallback intent
String currentLocale = AppLocaleUtils.getAppLanguagePref();
if (currentLocale != null) {
restartIntent.putExtra(ChromePreferenceKeys.APPLICATION_OVERRIDE_LANGUAGE, currentLocale);
}
restartIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK |
Intent.FLAG_ACTIVITY_CLEAR_TASK);
context.startActivity(restartIntent);
}
} catch (Exception ex) {
Log.e(TAG, "Error during fallback restart", ex);
}
}
}

// Kill this process.
Log.i(TAG, "Finishing BrowserRestartActivity");
finish();
Process.killProcess(Process.myPid());
}
Expand Down
Loading
Loading