aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/de/pixart/messenger/ui/XmppActivity.java
diff options
context:
space:
mode:
authorChristian Schneppe <christian@pix-art.de>2017-11-29 21:50:33 +0100
committerChristian Schneppe <christian@pix-art.de>2017-11-29 21:50:33 +0100
commitb6052c82cb8463ee465226949953a7187f4096e4 (patch)
tree6347fb72ddb1928bfcaafbe914b9de795b76d633 /src/main/java/de/pixart/messenger/ui/XmppActivity.java
parentd03129f1301942ddc9808229c158b92f492e79f1 (diff)
add ability to use system emojis instead of integrated ones via expert settings
Diffstat (limited to '')
-rw-r--r--src/main/java/de/pixart/messenger/ui/XmppActivity.java3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/main/java/de/pixart/messenger/ui/XmppActivity.java b/src/main/java/de/pixart/messenger/ui/XmppActivity.java
index 6263c2e53..df6f6980d 100644
--- a/src/main/java/de/pixart/messenger/ui/XmppActivity.java
+++ b/src/main/java/de/pixart/messenger/ui/XmppActivity.java
@@ -458,8 +458,7 @@ public abstract class XmppActivity extends Activity {
}
protected SharedPreferences getPreferences() {
- return PreferenceManager
- .getDefaultSharedPreferences(getApplicationContext());
+ return PreferenceManager.getDefaultSharedPreferences(getApplicationContext());
}
public boolean useSubjectToIdentifyConference() {