TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-12-03 11:12:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Only initialise EmojiGrid when not in edit mode

Browse Source 
Suppress initialisation of the emoji_grid_layout.xml when the
EmojiDrawer is being used in a layout where the editor is shown,
 to prevent an NPE when an editor is being used.

// FREEBIE

Closes #2288
This commit is contained in:
Sam Lanning
2015-01-02 21:22:42 +00:00
committed by Moxie Marlinspike
parent fe5fc411a7
commit b8ca0e57ad
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/org/thoughtcrime/securesms/components/EmojiDrawer.java
View File

@@ -74,8 +74,11 @@ public class EmojiDrawer extends KeyboardAwareLinearLayout {
inflater.inflate(R.layout.emoji_drawer, this, true); inflater.inflate(R.layout.emoji_drawer, this, true);
initializeResources(); initializeResources();
if (!this.isInEditMode()) {
initializeEmojiGrid(); initializeEmojiGrid();
} }
}
private void initializeResources() { private void initializeResources() {
this.pager = (ViewPager ) findViewById(R.id.emoji_pager); this.pager = (ViewPager ) findViewById(R.id.emoji_pager);