diff options
Diffstat (limited to 'src/main/java/de/pixart/messenger/ui/ConversationFragment.java')
| -rw-r--r-- | src/main/java/de/pixart/messenger/ui/ConversationFragment.java | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/src/main/java/de/pixart/messenger/ui/ConversationFragment.java b/src/main/java/de/pixart/messenger/ui/ConversationFragment.java index 41047b785..b2fd1813b 100644 --- a/src/main/java/de/pixart/messenger/ui/ConversationFragment.java +++ b/src/main/java/de/pixart/messenger/ui/ConversationFragment.java @@ -153,7 +153,7 @@ public class ConversationFragment extends XmppFragment implements EditMessage.Ke protected Message lastHistoryMessage = null; SimpleDateFormat sdf = new SimpleDateFormat("EEEE, dd. MMM yyyy", Locale.getDefault()); private Toast messageLoaderToast; - private ConversationActivity activity; + private ConversationsActivity activity; private boolean reInitRequiredOnStart = true; @@ -980,11 +980,11 @@ public class ConversationFragment extends XmppFragment implements EditMessage.Ke if (activity.xmppConnectionServiceBound) { if (ImageUrisCount == 1) { Uri uri = imageUris.get(0); - Log.d(Config.LOGTAG, "ConversationActivity.onActivityResult() - attaching image to conversations. CHOOSE_IMAGE"); + Log.d(Config.LOGTAG, "ConversationsActivity.onActivityResult() - attaching image to conversations. CHOOSE_IMAGE"); attachImageToConversation(conversation, uri, false); } else { for (Iterator<Uri> i = imageUris.iterator(); i.hasNext(); i.remove()) { - Log.d(Config.LOGTAG, "ConversationActivity.onActivityResult() - attaching images to conversations. CHOOSE_IMAGES"); + Log.d(Config.LOGTAG, "ConversationsActivity.onActivityResult() - attaching images to conversations. CHOOSE_IMAGES"); attachImagesToConversation(conversation, i.next()); } } @@ -1057,10 +1057,10 @@ public class ConversationFragment extends XmppFragment implements EditMessage.Ke public void onAttach(Activity activity) { super.onAttach(activity); Log.d(Config.LOGTAG, "ConversationFragment.onAttach()"); - if (activity instanceof ConversationActivity) { - this.activity = (ConversationActivity) activity; + if (activity instanceof ConversationsActivity) { + this.activity = (ConversationsActivity) activity; } else { - throw new IllegalStateException("Trying to attach fragment to activity that is not the ConversationActivity"); + throw new IllegalStateException("Trying to attach fragment to activity that is not the ConversationsActivity"); } } @@ -2118,10 +2118,10 @@ public class ConversationFragment extends XmppFragment implements EditMessage.Ke } private void processExtras(Bundle extras) { - final String downloadUuid = extras.getString(ConversationActivity.EXTRA_DOWNLOAD_UUID); - final String text = extras.getString(ConversationActivity.EXTRA_TEXT); - final String nick = extras.getString(ConversationActivity.EXTRA_NICK); - final boolean pm = extras.getBoolean(ConversationActivity.EXTRA_IS_PRIVATE_MESSAGE, false); + final String downloadUuid = extras.getString(ConversationsActivity.EXTRA_DOWNLOAD_UUID); + final String text = extras.getString(ConversationsActivity.EXTRA_TEXT); + final String nick = extras.getString(ConversationsActivity.EXTRA_NICK); + final boolean pm = extras.getBoolean(ConversationsActivity.EXTRA_IS_PRIVATE_MESSAGE, false); if (nick != null) { if (pm) { Jid jid = conversation.getJid(); @@ -2633,7 +2633,7 @@ public class ConversationFragment extends XmppFragment implements EditMessage.Ke } protected void sendOtrMessage(final Message message) { - final ConversationActivity activity = (ConversationActivity) getActivity(); + final ConversationsActivity activity = (ConversationsActivity) getActivity(); final XmppConnectionService xmppService = activity.xmppConnectionService; activity.selectPresence(message.getConversation(), () -> { |