More fixes

mastodon/build.gradle

@@ -10,7 +10,7 @@ android {
 		applicationId "org.joinmastodon.android"
 		minSdk 23
 		targetSdk 31
-		versionCode 21
+		versionCode 22
 		versionName "0.1"
 	}
 

mastodon/src/main/java/org/joinmastodon/android/api/session/AccountSessionManager.java

@@ -96,7 +96,7 @@ public class AccountSessionManager{
 		sessions.put(session.getID(), session);
 		lastActiveAccountID=session.getID();
 		writeAccountsFile();
-		maybeUpdateLocalInfo();
+		updateInstanceEmojis(instance, instance.uri);
 		if(PushSubscriptionManager.arePushNotificationsAvailable()){
 			session.getPushSubscriptionManager().registerAccountForPush();
 		}
@@ -268,6 +268,18 @@ public class AccountSessionManager{
 					@Override
 					public void onSuccess(Instance instance){
 						instances.put(domain, instance);
+						updateInstanceEmojis(instance, domain);
+					}
+
+					@Override
+					public void onError(ErrorResponse error){
+
+					}
+				})
+				.execNoAuth(domain);
+	}
+
+	private void updateInstanceEmojis(Instance instance, String domain){
 		new GetCustomEmojis()
 				.setCallback(new Callback<>(){
 					@Override
@@ -290,14 +302,6 @@ public class AccountSessionManager{
 				.execNoAuth(domain);
 	}
 
-					@Override
-					public void onError(ErrorResponse error){
-
-					}
-				})
-				.execNoAuth(domain);
-	}
-
 	private File getInstanceInfoFile(String domain){
 		return new File(MastodonApp.context.getFilesDir(), "instance_"+domain.replace('.', '_')+".json");
 	}

mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/StatusDisplayItem.java

@@ -107,7 +107,7 @@ public abstract class StatusDisplayItem{
 		if(statusForContent.poll!=null){
 			buildPollItems(parentID, fragment, statusForContent.poll, items);
 		}
-		if(statusForContent.card!=null && statusForContent.mediaAttachments.isEmpty()){
+		if(statusForContent.card!=null && statusForContent.mediaAttachments.isEmpty() && TextUtils.isEmpty(statusForContent.spoilerText)){
 			items.add(new LinkCardStatusDisplayItem(parentID, fragment, statusForContent));
 		}
 		if(addFooter){