From 34fc1c29f61ce6127e9e6e91a3555bc2ed95a757 Mon Sep 17 00:00:00 2001 From: Lyndon Date: Mon, 6 Nov 2017 18:14:54 +0100 Subject: [PATCH] When a conversation was already open it affected the file sharing process. --- .../ownchat/page/chat/GroupChatActivity.java | 16 ---------------- .../ownchat/page/chat/SingleChatActivity.java | 16 ---------------- 2 files changed, 32 deletions(-) diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/page/chat/GroupChatActivity.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/page/chat/GroupChatActivity.java index 64694b7..d21efab 100644 --- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/page/chat/GroupChatActivity.java +++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/page/chat/GroupChatActivity.java @@ -122,22 +122,6 @@ public class GroupChatActivity extends BaseChatActivity { startActivity(ChatMembersActivity.createIntent(this, mGroup)); } -// @Override -// protected void onNewIntent(Intent intent) { -// boolean test = intent.getBooleanExtra("TEST_EXTRA", false); -// -// if(test) { -// Group group = intent.getParcelableExtra(GROUP_ARG); -// -// if(group != null) { -// finish(); -// startActivity(intent); -// } -// } -// -// super.onNewIntent(intent); -// } - @Override protected BaseChatAdapter getAdapter() { return new GroupChatAdapter(mUserIdPreference.get()); diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/page/chat/SingleChatActivity.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/page/chat/SingleChatActivity.java index 1a21882..dccbd86 100644 --- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/page/chat/SingleChatActivity.java +++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/page/chat/SingleChatActivity.java @@ -62,22 +62,6 @@ public class SingleChatActivity extends BaseChatActivity { } } -// @Override -// protected void onNewIntent(Intent intent) { -// boolean test = intent.getBooleanExtra("TEST_EXTRA", false); -// -// if(test) { -// Group group = intent.getParcelableExtra(GROUP_ARG); -// -// if(group != null) { -// finish(); -// startActivity(intent); -// } -// } -// -// super.onNewIntent(intent); -// } - @Override protected void onResume() { if (!mChatPresenter.isAttached()) {