From b40ce24f612810850955a547a32e68ea111e0441 Mon Sep 17 00:00:00 2001 From: M66B Date: Tue, 18 Jun 2019 21:41:15 +0200 Subject: [PATCH] Fixed printing with forced English --- app/src/main/java/eu/faircode/email/ActivityBase.java | 6 ++++++ app/src/main/java/eu/faircode/email/ActivityView.java | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/eu/faircode/email/ActivityBase.java b/app/src/main/java/eu/faircode/email/ActivityBase.java index 0b5daeb05c..80174fd4e0 100644 --- a/app/src/main/java/eu/faircode/email/ActivityBase.java +++ b/app/src/main/java/eu/faircode/email/ActivityBase.java @@ -47,14 +47,20 @@ import java.util.List; import java.util.Map; abstract class ActivityBase extends AppCompatActivity implements SharedPreferences.OnSharedPreferenceChangeListener { + private Context originalContext; private boolean contacts; private List backPressedListeners = new ArrayList<>(); @Override protected void attachBaseContext(Context base) { + originalContext = base; super.attachBaseContext(ApplicationEx.getLocalizedContext(base)); } + Context getOriginalContext() { + return originalContext; + } + @Override protected void onCreate(Bundle savedInstanceState) { Log.i("Create " + this.getClass().getName() + " version=" + BuildConfig.VERSION_NAME); diff --git a/app/src/main/java/eu/faircode/email/ActivityView.java b/app/src/main/java/eu/faircode/email/ActivityView.java index 5fb312514c..274d555363 100644 --- a/app/src/main/java/eu/faircode/email/ActivityView.java +++ b/app/src/main/java/eu/faircode/email/ActivityView.java @@ -1277,7 +1277,7 @@ public class ActivityView extends ActivityBilling implements FragmentManager.OnB @Override public void onPageFinished(WebView view, String url) { try { - PrintManager printManager = (PrintManager) getSystemService(Context.PRINT_SERVICE); + PrintManager printManager = (PrintManager) getOriginalContext().getSystemService(Context.PRINT_SERVICE); String jobName = getString(R.string.app_name); if (!TextUtils.isEmpty(data[0])) jobName += " - " + data[0];