Fix status not updating for users using non-English translations

markwinter · Apr 5, 2014 · 3df5af8 · 3df5af8
1 parent 1e0fa75
commit 3df5af8
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/app/src/main/java/im/tox/antox/activities/MainActivity.java b/app/src/main/java/im/tox/antox/activities/MainActivity.java
@@ -556,7 +556,7 @@ private void addFriendToGroup() {
         Log.v("Add friend to group method", "To implement");
     }
 
-    
+
     @Override
     public boolean onCreateOptionsMenu(Menu menu) {
 

diff --git a/app/src/main/java/im/tox/antox/activities/ProfileActivity.java b/app/src/main/java/im/tox/antox/activities/ProfileActivity.java
@@ -202,11 +202,11 @@ public void updateSettings(View view) {
             UserDetails.note = noteHintText.getText().toString();
         }
         editor.putString("saved_status_hint", statusSpinner.getSelectedItem().toString());
-        if (statusSpinner.getSelectedItem().toString().equals("Online"))
+        if (statusSpinner.getSelectedItem().toString().equals(getString(R.string.status_online)))
             UserDetails.status = ToxUserStatus.TOX_USERSTATUS_NONE;
-        if (statusSpinner.getSelectedItem().toString().equals("Away"))
+        if (statusSpinner.getSelectedItem().toString().equals(getString(R.string.status_away)))
             UserDetails.status = ToxUserStatus.TOX_USERSTATUS_AWAY;
-        if (statusSpinner.getSelectedItem().toString().equals("Busy"))
+        if (statusSpinner.getSelectedItem().toString().equals(R.string.status_busy))
             UserDetails.status = ToxUserStatus.TOX_USERSTATUS_BUSY;
 
         editor.commit();

diff --git a/app/src/main/java/im/tox/antox/tox/ToxDoService.java b/app/src/main/java/im/tox/antox/tox/ToxDoService.java
@@ -13,6 +13,7 @@
 import java.util.concurrent.ScheduledThreadPoolExecutor;
 import java.util.concurrent.TimeUnit;
 
+import im.tox.antox.R;
 import im.tox.antox.callbacks.AntoxOnTypingChangeCallback;
 import im.tox.antox.data.AntoxDB;
 import im.tox.antox.utils.AntoxFriend;
@@ -140,9 +141,9 @@ protected void onHandleIntent(Intent intent) {
 
                         /* Load user details */
                         UserDetails.username = settingsPref.getString("saved_name_hint", "");
-                        if (settingsPref.getString("saved_status_hint", "").equals("Away"))
+                        if (settingsPref.getString("saved_status_hint", "").equals(getString(R.string.status_away)))
                             UserDetails.status = ToxUserStatus.TOX_USERSTATUS_AWAY;
-                        else if (settingsPref.getString("saved_status_hint", "").equals("Busy"))
+                        else if (settingsPref.getString("saved_status_hint", "").equals(getString(R.string.status_busy)))
                             UserDetails.status = ToxUserStatus.TOX_USERSTATUS_BUSY;
                         else
                             UserDetails.status = ToxUserStatus.TOX_USERSTATUS_NONE;