diff options
author | steckbrief <steckbrief@chefmail.de> | 2015-10-22 00:19:44 +0200 |
---|---|---|
committer | steckbrief <steckbrief@chefmail.de> | 2015-10-22 00:19:44 +0200 |
commit | 01bfe0c59a5bc3eba1db111d3bc687aac9be7847 (patch) | |
tree | e7d6d63eeed8514b9f3992dd09e1abd84932e9a5 /src/main/java/eu/siacs/conversations/ui/ContactDetailsActivity.java | |
parent | 0a5a985cbe582e6f7ece37ec257fe53ccee4bb42 (diff) | |
parent | 85a25984f4bf4dfa2432fbc2c92f8117cf927fcf (diff) |
Merge trz/rename into trz/rebase
Diffstat (limited to 'src/main/java/eu/siacs/conversations/ui/ContactDetailsActivity.java')
-rw-r--r-- | src/main/java/eu/siacs/conversations/ui/ContactDetailsActivity.java | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/main/java/eu/siacs/conversations/ui/ContactDetailsActivity.java b/src/main/java/eu/siacs/conversations/ui/ContactDetailsActivity.java index 40d5bc92..4ee7c5ca 100644 --- a/src/main/java/eu/siacs/conversations/ui/ContactDetailsActivity.java +++ b/src/main/java/eu/siacs/conversations/ui/ContactDetailsActivity.java @@ -6,10 +6,8 @@ import android.content.Context; import android.content.DialogInterface; import android.content.Intent; import android.content.IntentSender.SendIntentException; -import android.content.SharedPreferences; import android.net.Uri; import android.os.Bundle; -import android.preference.PreferenceManager; import android.provider.ContactsContract; import android.provider.ContactsContract.CommonDataKinds; import android.provider.ContactsContract.Contacts; @@ -32,6 +30,7 @@ import org.openintents.openpgp.util.OpenPgpUtils; import java.util.List; +import de.thedevstack.conversationsplus.ConversationsPlusPreferences; import de.thedevstack.conversationsplus.ui.listeners.ShowResourcesListDialogListener; import eu.siacs.conversations.R; import eu.siacs.conversations.crypto.PgpEngine; @@ -208,8 +207,7 @@ public class ContactDetailsActivity extends XmppActivity implements OnAccountUpd getActionBar().setDisplayHomeAsUpEnabled(true); } - final SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(this); - this.showDynamicTags = preferences.getBoolean("show_dynamic_tags",false); + this.showDynamicTags = ConversationsPlusPreferences.showDynamicTags(); } @Override |