diff options
Diffstat (limited to 'src/main/java/de/pixart/messenger/ui/ConversationsActivity.java')
| -rw-r--r-- | src/main/java/de/pixart/messenger/ui/ConversationsActivity.java | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/src/main/java/de/pixart/messenger/ui/ConversationsActivity.java b/src/main/java/de/pixart/messenger/ui/ConversationsActivity.java index 3882fd732..67618dc65 100644 --- a/src/main/java/de/pixart/messenger/ui/ConversationsActivity.java +++ b/src/main/java/de/pixart/messenger/ui/ConversationsActivity.java @@ -85,6 +85,7 @@ import de.pixart.messenger.ui.interfaces.OnConversationsListItemUpdated; import de.pixart.messenger.ui.util.ActivityResult; import de.pixart.messenger.ui.util.ConversationMenuConfigurator; import de.pixart.messenger.ui.util.PendingItem; +import de.pixart.messenger.utils.EmojiWrapper; import de.pixart.messenger.utils.ExceptionHelper; import de.pixart.messenger.utils.MenuDoubleTabUtil; import de.pixart.messenger.utils.UIHelper; @@ -545,7 +546,11 @@ public class ConversationsActivity extends XmppActivity implements OnConversatio case android.R.id.home: FragmentManager fm = getFragmentManager(); if (fm.getBackStackEntryCount() > 0) { - fm.popBackStack(); + try { + fm.popBackStack(); + } catch (IllegalArgumentException e) { + Log.w(Config.LOGTAG, "Unable to pop back stack after pressing home button"); + } return true; } break; @@ -557,7 +562,7 @@ public class ConversationsActivity extends XmppActivity implements OnConversatio if (!installFromUnknownSourceAllowed() && !xmppConnectionService.installedFromPlayStore()) { openInstallFromUnknownSourcesDialogIfNeeded(); } else { - UpdateService task = new UpdateService(this, xmppConnectionService.installedFromPlayStore()); + UpdateService task = new UpdateService(this, xmppConnectionService.installedFromPlayStore(), xmppConnectionService); task.executeOnExecutor(UpdateService.THREAD_POOL_EXECUTOR, "true"); Log.d(Config.LOGTAG, "AppUpdater started"); } @@ -688,7 +693,7 @@ public class ConversationsActivity extends XmppActivity implements OnConversatio actionBar.setDisplayShowCustomEnabled(true); TextView abtitle = findViewById(android.R.id.text1); TextView absubtitle = findViewById(android.R.id.text2); - abtitle.setText(conversation.getName()); + abtitle.setText(EmojiWrapper.transform(conversation.getName())); abtitle.setOnClickListener(view1 -> { if (conversation.getMode() == Conversation.MODE_SINGLE) { switchToContactDetails(conversation.getContact()); @@ -766,7 +771,7 @@ public class ConversationsActivity extends XmppActivity implements OnConversatio if (userWithChatStates.size() > 0) { if (userWithChatStates.size() == 1) { MucOptions.User user = userWithChatStates.get(0); - absubtitle.setText(getString(R.string.contact_is_typing, UIHelper.getDisplayName(user))); + absubtitle.setText(EmojiWrapper.transform(getString(R.string.contact_is_typing, UIHelper.getDisplayName(user)))); } else { StringBuilder builder = new StringBuilder(); for (MucOptions.User user : userWithChatStates) { @@ -775,7 +780,7 @@ public class ConversationsActivity extends XmppActivity implements OnConversatio } builder.append(UIHelper.getDisplayName(user)); } - absubtitle.setText(getString(R.string.contacts_are_typing, builder.toString())); + absubtitle.setText(EmojiWrapper.transform(getString(R.string.contacts_are_typing, builder.toString()))); } } } else { @@ -952,7 +957,7 @@ public class ConversationsActivity extends XmppActivity implements OnConversatio if (!installFromUnknownSourceAllowed() && !PlayStore) { openInstallFromUnknownSourcesDialogIfNeeded(); } else { - UpdateService task = new UpdateService(this, PlayStore); + UpdateService task = new UpdateService(this, PlayStore, xmppConnectionService); task.executeOnExecutor(UpdateService.THREAD_POOL_EXECUTOR, "false"); Log.d(Config.LOGTAG, "AppUpdater started"); } |