Localization error fix

Author: yunusemrecetin

app/src/main/java/com/akexorcist/localizationapp/MainActivity.java

@@ -19,11 +19,7 @@ public class MainActivity extends LocalizationActivity {
     @Override
     public void onCreate(Bundle savedInstanceState) {
         // You can set default language when first time running. Must to setup before onCreate was called.
-<<<<<<< HEAD
-        setDefaultLanguage("en");
-=======
         setDefaultLanguage(Locale.getDefault());
->>>>>>> develop
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_main);
 

localizationActivity/src/main/java/com/akexorcist/localizationactivity/core/LocalizationActivityDelegate.java

@@ -23,16 +23,13 @@
 
 public class LocalizationActivityDelegate {
     private static final String KEY_ACTIVITY_LOCALE_CHANGED = "activity_locale_changed";
-
+    private final Activity activity;
+    private final List<OnLocaleChangedListener> localeChangedListeners = new ArrayList<>();
     // Boolean flag to check that activity was recreated from locale changed.
     private boolean isLocalizationChanged = false;
-
     // Prepare default language.
     private Locale currentLanguage = LanguageSetting.getDefaultLanguage();
 
-    private final Activity activity;
-    private final List<OnLocaleChangedListener> localeChangedListeners = new ArrayList<>();
-
     public LocalizationActivityDelegate(Activity activity) {
         this.activity = activity;
     }
@@ -83,14 +80,7 @@ public Context getApplicationContext(Context applicationContext) {
     }
 
     public Resources getResources(Resources resources) {
-        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.N) {
-            Configuration config = resources.getConfiguration();
-            config.locale = LanguageSetting.getLanguage(activity);
-            DisplayMetrics metrics = resources.getDisplayMetrics();
-            return new Resources(activity.getAssets(), metrics, config);
-        } else {
-            return resources;
-        }
+        return resources;
     }
 
     // Provide method to set application language by country name.

localizationActivity/src/main/java/com/akexorcist/localizationactivity/core/LocalizationContext.java

@@ -17,9 +17,13 @@ public LocalizationContext(Context base) {
 
     @Override
     public Resources getResources() {
-        Configuration conf = super.getResources().getConfiguration();
-        conf.locale = LanguageSetting.getLanguage(this);
-        DisplayMetrics metrics = super.getResources().getDisplayMetrics();
-        return new Resources(getAssets(), metrics, conf);
+        try {
+            Configuration conf = super.getResources().getConfiguration();
+            conf.locale = LanguageSetting.getLanguage(this);
+            DisplayMetrics metrics = super.getResources().getDisplayMetrics();
+            return new Resources(getAssets(), metrics, conf);
+        } catch (Exception e) {
+            return getResources();
+        }
     }
 }