Karl/BobStore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

remove unused arguments to Languages.setLanguage()

Browse Source
This commit is contained in:
Hans-Christoph Steiner 2017-05-12 23:11:34 +02:00
parent 064be9482d
commit 2d9e1ecd4f
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/org/fdroid/fdroid/FDroidApp.java
View File

@ -197,7 +197,7 @@ public class FDroidApp extends Application {
@Override @Override
public void onConfigurationChanged(Configuration newConfig) { public void onConfigurationChanged(Configuration newConfig) {
super.onConfigurationChanged(newConfig); super.onConfigurationChanged(newConfig);
Languages.setLanguage(this, Preferences.get().getLanguage(), false); Languages.setLanguage(this);
} }
@Override @Override
@ -215,7 +215,7 @@ public class FDroidApp extends Application {
} }
Preferences.setup(this); Preferences.setup(this);
Languages.setup(getClass(), R.string.pref_language_default); Languages.setup(getClass(), R.string.pref_language_default);
Languages.setLanguage(this, Preferences.get().getLanguage(), false); Languages.setLanguage(this);
ACRA.init(this); ACRA.init(this);
if (isAcraProcess()) { if (isAcraProcess()) {

5
app/src/main/java/org/fdroid/fdroid/Languages.java
View File

@ -124,16 +124,17 @@ public final class Languages {
* or different than the current system-wide locale. The preference is cleared * or different than the current system-wide locale. The preference is cleared
* if the language matches the system-wide locale or "System Default" is chosen. * if the language matches the system-wide locale or "System Default" is chosen.
*/ */
public static void setLanguage(final ContextWrapper contextWrapper, String language, boolean refresh) { public static void setLanguage(final ContextWrapper contextWrapper) {
if (Build.VERSION.SDK_INT >= 24) { if (Build.VERSION.SDK_INT >= 24) {
Utils.debugLog(TAG, "Languages.setLanguage() ignored on >= android-24"); Utils.debugLog(TAG, "Languages.setLanguage() ignored on >= android-24");
Preferences.get().clearLanguage(); Preferences.get().clearLanguage();
return; return;
} }
String language = Preferences.get().getLanguage();
if (TextUtils.equals(language, DEFAULT_LOCALE.getLanguage())) { if (TextUtils.equals(language, DEFAULT_LOCALE.getLanguage())) {
Preferences.get().clearLanguage(); Preferences.get().clearLanguage();
locale = DEFAULT_LOCALE; locale = DEFAULT_LOCALE;
} else if (locale != null && TextUtils.equals(locale.getLanguage(), language) && (!refresh)) { } else if (locale != null && TextUtils.equals(locale.getLanguage(), language)) {
return; // already configured return; // already configured
} else if (language == null || language.equals(USE_SYSTEM_DEFAULT)) { } else if (language == null || language.equals(USE_SYSTEM_DEFAULT)) {
Preferences.get().clearLanguage(); Preferences.get().clearLanguage();

2
app/src/main/java/org/fdroid/fdroid/views/fragments/PreferencesFragment.java
View File

@ -158,7 +158,7 @@ public class PreferencesFragment extends PreferenceFragment
entrySummary(key); entrySummary(key);
if (changing) { if (changing) {
Activity activity = getActivity(); Activity activity = getActivity();
Languages.setLanguage(activity, Preferences.get().getLanguage(), false); Languages.setLanguage(activity);
RepoProvider.Helper.clearEtags(getContext()); RepoProvider.Helper.clearEtags(getContext());
UpdateService.updateNow(getContext()); UpdateService.updateNow(getContext());