Changing language will now happen without needing to restart

markwinter · Sep 23, 2014 · 8acee73 · 8acee73
1 parent 797b467
commit 8acee73
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -37,7 +37,7 @@
 
         <activity
             android:name=".activities.MainActivity"
-            android:configChanges="locale|orientation|screenSize"
+            android:configChanges="orientation|screenSize"
             android:windowSoftInputMode="stateAlwaysHidden" >
         </activity>
         <activity

diff --git a/app/src/main/java/im/tox/antox/fragments/ContactsFragment.java b/app/src/main/java/im/tox/antox/fragments/ContactsFragment.java
@@ -319,7 +319,7 @@ public void beforeTextChanged(CharSequence charSequence, int i, int i2, int i3)
 
             @Override
             public void onTextChanged(CharSequence charSequence, int i, int i2, int i3) {
-                if(charSequence != null)
+                if(leftPaneAdapter != null)
                     leftPaneAdapter.getFilter().filter(charSequence);
             }
 

diff --git a/app/src/main/java/im/tox/antox/fragments/SettingsFragment.java b/app/src/main/java/im/tox/antox/fragments/SettingsFragment.java
@@ -278,5 +278,11 @@ public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, Strin
 
             }
         }
+
+        if(key.equals("language")) {
+            Intent intent = getActivity().getIntent();
+            getActivity().finish();
+            startActivity(intent);
+        }
     }
 }