aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorChristian Schneppe <christian.schneppe@pix-art.de>2019-09-23 20:50:35 +0200
committerChristian Schneppe <christian.schneppe@pix-art.de>2019-09-23 20:50:35 +0200
commit443925d2e22fc4ca8b74167e01be3dbd2a84cc75 (patch)
treec19a2ece3cfbc996be3e8cb11b45cc8837f53275 /src
parent104c02dc33de44791e4c6f3c869273685e400a4b (diff)
correct file locations for EmojiService
Diffstat (limited to 'src')
-rw-r--r--src/standard/java/de/pixart/messenger/services/EmojiService.java (renamed from src/main/java/de/pixart/messenger/services/EmojiService.java)0
-rw-r--r--src/standardPush/java/de/pixart/messenger/services/EmojiService.java4
2 files changed, 2 insertions, 2 deletions
diff --git a/src/main/java/de/pixart/messenger/services/EmojiService.java b/src/standard/java/de/pixart/messenger/services/EmojiService.java
index f76cf5a4b..f76cf5a4b 100644
--- a/src/main/java/de/pixart/messenger/services/EmojiService.java
+++ b/src/standard/java/de/pixart/messenger/services/EmojiService.java
diff --git a/src/standardPush/java/de/pixart/messenger/services/EmojiService.java b/src/standardPush/java/de/pixart/messenger/services/EmojiService.java
index e326b1766..0e5bfadd0 100644
--- a/src/standardPush/java/de/pixart/messenger/services/EmojiService.java
+++ b/src/standardPush/java/de/pixart/messenger/services/EmojiService.java
@@ -47,7 +47,7 @@ public class EmojiService {
// a) when using the ondemand emoji font (play store) flags don’t work
// b) the text preview has annoying glitches when the cut of text contains emojis (the emoji will be half visible)
// c) can trigger a hardware rendering bug https://issuetracker.google.com/issues/67102093
- fontRequest.setReplaceAll(useBundledEmoji && Build.VERSION.SDK_INT < Build.VERSION_CODES.O);
- EmojiCompat.init(config);
+ fontRequestEmojiCompatConfig.setReplaceAll(useBundledEmoji && Build.VERSION.SDK_INT < Build.VERSION_CODES.O);
+ EmojiCompat.init(fontRequestEmojiCompatConfig);
}
} \ No newline at end of file