From 5e0a3a8d6532e250af5c44ebd797944c3a3e5170 Mon Sep 17 00:00:00 2001 From: Lyndon Date: Mon, 6 Nov 2017 18:14:34 +0100 Subject: [PATCH] When a conversation was already open it affected the file sharing process. --- .../ownchat/page/chat/BaseChatActivity.java | 16 ++++++++++++++++ .../ownchat/page/chat/GroupChatActivity.java | 16 ++++++++++++++++ .../ownchat/page/chat/SingleChatActivity.java | 16 ++++++++++++++++ .../FileConfirmationActivity.java | 8 ++++---- .../ownchat/page/sharing/SharingActivity.java | 19 +++++++++++++++++-- 5 files changed, 69 insertions(+), 6 deletions(-) diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/page/chat/BaseChatActivity.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/page/chat/BaseChatActivity.java index 22fab3d..d838737 100644 --- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/page/chat/BaseChatActivity.java +++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/page/chat/BaseChatActivity.java @@ -628,4 +628,20 @@ abstract class BaseChatActivity extends RuntimePermissionActivity implements Cha startActivity(new Intent(this, MainActivity.class)); } + + @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); + } } \ No newline at end of file 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 d21efab..64694b7 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,6 +122,22 @@ 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 dccbd86..1a21882 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,6 +62,22 @@ 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()) { diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/page/fileconfirmation/FileConfirmationActivity.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/page/fileconfirmation/FileConfirmationActivity.java index b23e906..af92a0f 100644 --- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/page/fileconfirmation/FileConfirmationActivity.java +++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/page/fileconfirmation/FileConfirmationActivity.java @@ -19,6 +19,9 @@ import com.bumptech.glide.request.target.GlideDrawableImageViewTarget; import butterknife.OnClick; import de.beyondsoft.ownchat.R; +import de.beyondsoft.ownchat.data.AppPrefsConstants; +import de.beyondsoft.ownchat.data.prefs.BooleanPreference; +import de.beyondsoft.ownchat.data.prefs.StringPreference; import de.beyondsoft.ownchat.di.InjectionHelper; import de.beyondsoft.ownchat.model.Group; import de.beyondsoft.ownchat.utils.Constants; @@ -27,6 +30,7 @@ import de.beyondsoft.ownchat.utils.FileUtils; import java.io.File; import javax.inject.Inject; +import javax.inject.Named; import butterknife.BindView; import butterknife.ButterKnife; @@ -172,8 +176,4 @@ public class FileConfirmationActivity extends AppCompatActivity implements FileC public void showError(String message) { } - - public File getFile(Uri fileUri) { - return FileUtils.getFile(this, fileUri); - } } diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/page/sharing/SharingActivity.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/page/sharing/SharingActivity.java index f0b38af..502ffc0 100644 --- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/page/sharing/SharingActivity.java +++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/page/sharing/SharingActivity.java @@ -141,13 +141,20 @@ public class SharingActivity extends AppCompatActivity implements SharingView, S @Override public void onOpenGroupMessage(Group group) { - startActivity(GroupChatActivity.createIntent(this, group)); + Intent intent = GroupChatActivity.createIntent(this, group); + intent.putExtra("TEST_EXTRA", true); + + startActivity(intent); finishAffinity(); } @Override public void onOpenPrivateMessage(Group contact) { - startActivity(SingleChatActivity.createIntent(this, contact)); + Intent intent = SingleChatActivity.createIntent(this, contact); + + intent.putExtra("TEST_EXTRA", true); + + startActivity(intent); finishAffinity(); } @@ -170,4 +177,12 @@ public class SharingActivity extends AppCompatActivity implements SharingView, S public void setGroups(ArrayList groups) { mContactsAdapter.setGroups(groups); } + + @Override + protected void onDestroy() { + mIsComingFromSharingActivity.set(false); + mSelectedFilePath.delete(); + + super.onDestroy(); + } }