Merge trz/rename into trz/rebase

1 files changed, 6 insertions, 4 deletions

diff --git a/src/main/java/eu/siacs/conversations/ui/StartConversationActivity.java b/src/main/java/eu/siacs/conversations/ui/StartConversationActivity.java
index 68e77af4..41dd7a82 100644
--- a/src/main/java/eu/siacs/conversations/ui/StartConversationActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/StartConversationActivity.java
@@ -52,6 +52,7 @@ import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 
+import de.thedevstack.conversationsplus.ConversationsPlusPreferences;
 import eu.siacs.conversations.Config;
 import eu.siacs.conversations.R;
 import eu.siacs.conversations.entities.Account;
@@ -185,6 +186,7 @@ public class StartConversationActivity extends XmppActivity implements OnRosterU
 	public void onCreate(Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
 		setContentView(R.layout.activity_start_conversation);
+        this.mHideOfflineContacts = ConversationsPlusPreferences.hideOffline();
 		mViewPager = (ViewPager) findViewById(R.id.start_conversation_view_pager);
 		ActionBar actionBar = getActionBar();
 		actionBar.setNavigationMode(ActionBar.NAVIGATION_MODE_TABS);
@@ -241,7 +243,6 @@ public class StartConversationActivity extends XmppActivity implements OnRosterU
 				}
 			});
 
-		this.mHideOfflineContacts = getPreferences().getBoolean("hide_offline", false);
 
 	}
 
@@ -533,12 +534,13 @@ public class StartConversationActivity extends XmppActivity implements OnRosterU
 				new IntentIntegrator(this).initiateScan();
 				return true;
 			case R.id.action_hide_offline:
-				mHideOfflineContacts = !item.isChecked();
-				getPreferences().edit().putBoolean("hide_offline", mHideOfflineContacts).commit();
+				mHideOfflineContacts = !item.isChecked(); // the item is the menu item which is displayed, the inversion here calculates the new value
+				ConversationsPlusPreferences.commitHideOffline(mHideOfflineContacts);
 				if (mSearchEditText != null) {
 					filter(mSearchEditText.getText().toString());
 				}
-				invalidateOptionsMenu();
+				invalidateOptionsMenu(); // Since the selection of this item changed the checked value, the options menu is now invalid
+				return true;
 		}
 		return super.onOptionsItemSelected(item);
 	}