Difuse/difuse-phone-android
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Do not erase previously downloaded file if new one has the same name + delete file when deleting message

Browse source
This commit is contained in:
Sylvain Berfini 2018-02-14 17:11:22 +01:00
parent 7c9e041e14
commit 5bedf459e3
3 changed files with 35 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/android/org/linphone/chat/ChatEventsAdapter.java
View file

@ -20,6 +20,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
package org.linphone.chat; package org.linphone.chat;
import android.Manifest; import android.Manifest;
import android.content.ClipData;
import android.content.ClipboardManager;
import android.content.Context; import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.content.pm.PackageManager; import android.content.pm.PackageManager;
@ -44,6 +46,7 @@ import android.view.ViewGroup;
import android.webkit.MimeTypeMap; import android.webkit.MimeTypeMap;
import android.widget.ImageView; import android.widget.ImageView;
import android.widget.RelativeLayout; import android.widget.RelativeLayout;
import android.widget.Toast;
import org.linphone.LinphoneManager; import org.linphone.LinphoneManager;
import org.linphone.LinphoneUtils; import org.linphone.LinphoneUtils;
@ -72,6 +75,7 @@ import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.List; import java.util.List;
import static android.content.Context.CLIPBOARD_SERVICE;
import static android.content.Intent.FLAG_GRANT_READ_URI_PERMISSION; import static android.content.Intent.FLAG_GRANT_READ_URI_PERMISSION;
public class ChatEventsAdapter extends ListSelectionAdapter implements ChatMessageListener { public class ChatEventsAdapter extends ListSelectionAdapter implements ChatMessageListener {
@ -302,6 +306,12 @@ public class ChatEventsAdapter extends ListSelectionAdapter implements ChatMessa
v.setEnabled(false); v.setEnabled(false);
String filename = message.getFileTransferInformation().getName(); String filename = message.getFileTransferInformation().getName();
File file = new File(Environment.getExternalStorageDirectory(), filename); File file = new File(Environment.getExternalStorageDirectory(), filename);
int prefix = 1;
while (file.exists()) {
file = new File(Environment.getExternalStorageDirectory(), prefix + "_" + filename);
Log.w("File with that name already exists, renamed to " + prefix + "_" + filename);
prefix += 1;
}
message.setListener(ChatEventsAdapter.this); message.setListener(ChatEventsAdapter.this);
message.setFileTransferFilepath(file.getPath()); message.setFileTransferFilepath(file.getPath());
message.downloadFile(); message.downloadFile();
@ -374,7 +384,6 @@ public class ChatEventsAdapter extends ListSelectionAdapter implements ChatMessa
//TODO //TODO
break; break;
} }
//holder.eventTime.setText(LinphoneUtils.timestampToHumanDate(mContext, event.getTime(), R.string.messages_date_format));
} }
return view; return view;

16
src/android/org/linphone/chat/ChatListFragment.java
View file

@ -33,6 +33,7 @@ import android.widget.TextView;
import org.linphone.contacts.ContactsManager; import org.linphone.contacts.ContactsManager;
import org.linphone.core.ChatRoomListenerStub; import org.linphone.core.ChatRoomListenerStub;
import org.linphone.core.EventLog;
import org.linphone.ui.ListSelectionHelper; import org.linphone.ui.ListSelectionHelper;
import org.linphone.contacts.ContactsUpdatedListener; import org.linphone.contacts.ContactsUpdatedListener;
import org.linphone.fragments.FragmentsAvailable; import org.linphone.fragments.FragmentsAvailable;
@ -44,6 +45,8 @@ import org.linphone.core.ChatRoom;
import org.linphone.core.Core; import org.linphone.core.Core;
import org.linphone.core.CoreListenerStub; import org.linphone.core.CoreListenerStub;
import java.io.File;
import static org.linphone.fragments.FragmentsAvailable.CHAT_LIST; import static org.linphone.fragments.FragmentsAvailable.CHAT_LIST;
public class ChatListFragment extends Fragment implements OnItemClickListener, ContactsUpdatedListener, ListSelectionHelper.DeleteListener { public class ChatListFragment extends Fragment implements OnItemClickListener, ContactsUpdatedListener, ListSelectionHelper.DeleteListener {
@ -153,6 +156,19 @@ public class ChatListFragment extends Fragment implements OnItemClickListener, C
mChatRoomDeletionPendingCount = objectsToDelete.length; mChatRoomDeletionPendingCount = objectsToDelete.length;
for (Object obj : objectsToDelete) { for (Object obj : objectsToDelete) {
ChatRoom room = (ChatRoom)obj; ChatRoom room = (ChatRoom)obj;
for (EventLog eventLog : room.getHistoryEvents(0)) {
if (eventLog.getType() == EventLog.Type.ConferenceChatMessage) {
ChatMessage message = eventLog.getChatMessage();
if (message.getAppdata() != null) {
File file = new File(message.getAppdata());
if (file.exists()) {
file.delete();
}
}
}
}
room.setListener(new ChatRoomListenerStub() { room.setListener(new ChatRoomListenerStub() {
@Override @Override
public void onStateChanged(ChatRoom room, ChatRoom.State state) { public void onStateChanged(ChatRoom room, ChatRoom.State state) {

9
src/android/org/linphone/chat/GroupChatFragment.java
View file

@ -284,6 +284,15 @@ public class GroupChatFragment extends Fragment implements ChatRoomListener, Con
public void onDeleteSelection(Object[] objectsToDelete) { public void onDeleteSelection(Object[] objectsToDelete) {
for (Object obj : objectsToDelete) { for (Object obj : objectsToDelete) {
EventLog eventLog = (EventLog)obj; EventLog eventLog = (EventLog)obj;
if (eventLog.getType() == EventLog.Type.ConferenceChatMessage) {
ChatMessage message = eventLog.getChatMessage();
if (message.getAppdata() != null) {
File file = new File(message.getAppdata());
if (file.exists()) {
file.delete();
}
}
}
eventLog.deleteFromDatabase(); eventLog.deleteFromDatabase();
} }
if (mChatRoom.hasCapability(ChatRoomCapabilities.OneToOne.toInt())) { if (mChatRoom.hasCapability(ChatRoomCapabilities.OneToOne.toInt())) {