Release 3.36.1

app/build.gradle

@@ -6,8 +6,8 @@ android {
     defaultConfig {
         minSdkVersion 19
         targetSdkVersion 29
-        versionCode 374
-        versionName "2.36.0"
+        versionCode 375
+        versionName "2.36.1"
         multiDexEnabled true
         renderscriptTargetApi 28 as int
         renderscriptSupportModeEnabled true

app/src/main/assets/changelogs/375.txt

@@ -8,6 +8,7 @@ changed:
 - Allow cross-account replies on followed instances
 
 Fixed:
+- Crash when having custom emoji in display name
 - Crash when adding media
 - Remove extra spaces at the bottom of messages
 - Some issue with custom emoji

app/src/main/java/app/fedilab/android/helper/Helper.java

@@ -1972,8 +1972,9 @@ public class Helper {
             activity.finish(); //User is logged out to get a new token
         } else {
 
-            makeEmojis(activity, username, account.getDisplayNameSpan(), account.getEmojis());
+
             username.setText(String.format("@%s", account.getUsername() + "@" + account.getInstance()));
+            makeEmojis(activity, displayedName, account.getDisplayNameSpan(), account.getEmojis());
             displayedName.setText(account.getDisplayNameSpan(), TextView.BufferType.SPANNABLE);
             loadGiF(activity, account, profilePicture);
             String urlHeader = !disableGif ? account.getHeader() : account.getHeader_static();
@@ -4411,6 +4412,7 @@ public class Helper {
 
         if (emojis != null && emojis.size() > 0) {
             for (final Emojis emoji : emojis) {
+                if (isValidContextForGlide(context)) {
                     Glide.with(context)
                             .asDrawable()
                             .load(disableAnimatedEmoji ? emoji.getStatic_url() : emoji.getUrl())
@@ -4459,6 +4461,7 @@ public class Helper {
                 }
             }
         }
+    }
 
     //Event Type
     public enum EventStreaming {