From 956f2da8a10d709216cc7f965460aeaa0726fc0b Mon Sep 17 00:00:00 2001 From: Sylvain Berfini Date: Wed, 20 Feb 2019 10:06:34 +0100 Subject: [PATCH] Added logs to help debug sharing issues --- .../main/java/org/linphone/chat/ChatMessagesFragment.java | 8 ++++++-- .../java/org/linphone/chat/ChatRoomCreationFragment.java | 5 ++++- .../main/java/org/linphone/chat/ChatRoomsFragment.java | 5 +++++ .../main/java/org/linphone/chat/GroupInfoFragment.java | 5 ++++- 4 files changed, 19 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/org/linphone/chat/ChatMessagesFragment.java b/app/src/main/java/org/linphone/chat/ChatMessagesFragment.java index e2d41c1f9..b0e36cc18 100644 --- a/app/src/main/java/org/linphone/chat/ChatMessagesFragment.java +++ b/app/src/main/java/org/linphone/chat/ChatMessagesFragment.java @@ -316,6 +316,7 @@ public class ChatMessagesFragment extends Fragment if (getArguments() != null) { String fileSharedUri = getArguments().getString("fileSharedUri"); if (fileSharedUri != null) { + Log.i("[ChatMessages] Found shared file(s): " + fileSharedUri); if (fileSharedUri.contains(":")) { String[] files = fileSharedUri.split(":"); for (String file : files) { @@ -326,8 +327,11 @@ public class ChatMessagesFragment extends Fragment } } - if (getArguments().getString("messageDraft") != null) - mMessageTextToSend.setText(getArguments().getString("messageDraft")); + if (getArguments().getString("messageDraft") != null) { + String sharedText = getArguments().getString("messageDraft"); + mMessageTextToSend.setText(sharedText); + Log.i("[ChatMessages] Found shared text: " + sharedText); + } } if (savedInstanceState != null) { diff --git a/app/src/main/java/org/linphone/chat/ChatRoomCreationFragment.java b/app/src/main/java/org/linphone/chat/ChatRoomCreationFragment.java index ae0ea3e66..f640afcf6 100644 --- a/app/src/main/java/org/linphone/chat/ChatRoomCreationFragment.java +++ b/app/src/main/java/org/linphone/chat/ChatRoomCreationFragment.java @@ -256,7 +256,10 @@ public class ChatRoomCreationFragment extends Fragment String fileSharedUri = getArguments().getString("fileSharedUri"); String messageDraft = getArguments().getString("messageDraft"); - if (fileSharedUri != null || messageDraft != null) mShareInfos = new Bundle(); + if (fileSharedUri != null || messageDraft != null) { + Log.i("[ChatRoomCreation] Forwarding arguments to new chat room"); + mShareInfos = new Bundle(); + } if (fileSharedUri != null) { LinphoneActivity.instance().checkAndRequestPermissionsToSendImage(); diff --git a/app/src/main/java/org/linphone/chat/ChatRoomsFragment.java b/app/src/main/java/org/linphone/chat/ChatRoomsFragment.java index b8c5a8bbd..3debf2d7e 100644 --- a/app/src/main/java/org/linphone/chat/ChatRoomsFragment.java +++ b/app/src/main/java/org/linphone/chat/ChatRoomsFragment.java @@ -51,6 +51,7 @@ import org.linphone.core.CoreListenerStub; import org.linphone.core.EventLog; import org.linphone.core.ProxyConfig; import org.linphone.fragments.FragmentsAvailable; +import org.linphone.mediastream.Log; import org.linphone.utils.SelectableHelper; public class ChatRoomsFragment extends Fragment @@ -118,6 +119,7 @@ public class ChatRoomsFragment extends Fragment public void onClick(View v) { Bundle extras = null; if (getArguments() != null) { + Log.i("[ChatRooms] Forwarding arguments to new chat room"); extras = (Bundle) getArguments().clone(); getArguments().clear(); } @@ -132,6 +134,7 @@ public class ChatRoomsFragment extends Fragment public void onClick(View v) { Bundle extras = null; if (getArguments() != null) { + Log.i("[ChatRooms] Forwarding arguments to new group chat room"); extras = (Bundle) getArguments().clone(); getArguments().clear(); } @@ -195,6 +198,7 @@ public class ChatRoomsFragment extends Fragment Toast.LENGTH_SHORT) .show(); } + Log.i("[ChatRooms] Arguments found: " + messageSharedUri + " / " + fileSharedUri); } return view; @@ -208,6 +212,7 @@ public class ChatRoomsFragment extends Fragment ChatRoom room = (ChatRoom) mChatRoomsAdapter.getItem(position); Bundle extras = null; if (getArguments() != null) { + Log.i("[ChatRooms] Forwarding arguments to existing chat room"); extras = (Bundle) getArguments().clone(); getArguments().clear(); } diff --git a/app/src/main/java/org/linphone/chat/GroupInfoFragment.java b/app/src/main/java/org/linphone/chat/GroupInfoFragment.java index 285c6801b..018fb02f3 100644 --- a/app/src/main/java/org/linphone/chat/GroupInfoFragment.java +++ b/app/src/main/java/org/linphone/chat/GroupInfoFragment.java @@ -144,7 +144,10 @@ public class GroupInfoFragment extends Fragment implements ChatRoomListener { String fileSharedUri = getArguments().getString("fileSharedUri"); String messageDraft = getArguments().getString("messageDraft"); - if (fileSharedUri != null || messageDraft != null) mShareInfos = new Bundle(); + if (fileSharedUri != null || messageDraft != null) { + Log.i("[GroupInfo] Forwarding arguments to group chat room"); + mShareInfos = new Bundle(); + } if (fileSharedUri != null) mShareInfos.putString("fileSharedUri", fileSharedUri);