diff options
author | Christian Schneppe <christian@pix-art.de> | 2018-03-29 22:23:31 +0200 |
---|---|---|
committer | Christian Schneppe <christian@pix-art.de> | 2018-03-29 22:23:31 +0200 |
commit | ee7240f2e0d02346cd0c606b082d095cae5a1fa5 (patch) | |
tree | 8f5cdb984cb4b3f8196044ee33243bd56301e949 /src/main/java/de/pixart/messenger/ui/ConversationFragment.java | |
parent | 48e09a935902b715aa605d368795925999f1cfa9 (diff) |
move new activity back to original name
Diffstat (limited to '')
-rw-r--r-- | src/main/java/de/pixart/messenger/ui/ConversationFragment.java | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/main/java/de/pixart/messenger/ui/ConversationFragment.java b/src/main/java/de/pixart/messenger/ui/ConversationFragment.java index 37924a0ea..f5fc419a1 100644 --- a/src/main/java/de/pixart/messenger/ui/ConversationFragment.java +++ b/src/main/java/de/pixart/messenger/ui/ConversationFragment.java @@ -148,7 +148,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 ConversationsMainActivity activity; + private ConversationActivity activity; protected OnClickListener clickToVerify = new OnClickListener() { @Override public void onClick(View v) { @@ -968,9 +968,9 @@ public class ConversationFragment extends XmppFragment implements EditMessage.Ke @Override public void onAttach(Activity activity) { super.onAttach(activity); - Log.d(Config.LOGTAG, "onAttach()"); - if (activity instanceof ConversationsMainActivity) { - this.activity = (ConversationsMainActivity) activity; + Log.d(Config.LOGTAG, "ConversationFragment.onAttach()"); + if (activity instanceof ConversationActivity) { + this.activity = (ConversationActivity) activity; } else { throw new IllegalStateException("Trying to attach fragment to activity that is not the ConversationActivity"); } @@ -1764,6 +1764,7 @@ public class ConversationFragment extends XmppFragment implements EditMessage.Ke @Override public void onActivityCreated(Bundle savedInstanceState) { + Log.d(Config.LOGTAG, "ConversationFragment.onActivityCreated()"); super.onActivityCreated(savedInstanceState); if (savedInstanceState == null) { return; |