1 files changed, 11 insertions, 7 deletions

diff --git a/src/main/java/de/thedevstack/conversationsplus/services/filetransfer/http/delete/DeleteTokenReceived.java b/src/main/java/de/thedevstack/conversationsplus/services/filetransfer/http/delete/DeleteTokenReceived.java
index a8bef0ed..186454e4 100644
--- a/src/main/java/de/thedevstack/conversationsplus/services/filetransfer/http/delete/DeleteTokenReceived.java
+++ b/src/main/java/de/thedevstack/conversationsplus/services/filetransfer/http/delete/DeleteTokenReceived.java
@@ -7,7 +7,7 @@ import java.io.IOException;
 
 import de.thedevstack.android.logcat.Logging;
 import de.thedevstack.conversationsplus.entities.Account;
-import de.thedevstack.conversationsplus.entities.Message;
+import de.thedevstack.conversationsplus.enums.FileStatus;
 import de.thedevstack.conversationsplus.http.HttpClient;
 import de.thedevstack.conversationsplus.utils.MessageUtil;
 import de.thedevstack.conversationsplus.xmpp.OnIqPacketReceived;
@@ -21,7 +21,7 @@ import okhttp3.Request;
 import okhttp3.Response;
 
 /**
- * Created by steckbrief on 21.08.2016.
+ *
  */
 public class DeleteTokenReceived implements OnIqPacketReceived {
     private static final String HEADER_NAME_DELETE_TOKEN = "X-FILETRANSFER-HTTP-DELETE-TOKEN";
@@ -47,19 +47,19 @@ public class DeleteTokenReceived implements OnIqPacketReceived {
                 @Override
                 public void onFailure(Call call, IOException e) {
                     Logging.e("filetransfer.http.delete", "Error while connecting to '" + call.request().url() + "': " + e.getMessage());
-                    MessageUtil.markMessage(remoteFile.getMessage(), Message.STATUS_REMOTE_FILE_DELETE_FAILED);
+                    MessageUtil.setAndSaveFileStatus(remoteFile.getMessage(), FileStatus.DELETE_FAILED);
                 }
 
                 @Override
                 public void onResponse(Call call, Response response) throws IOException {
                     if (response.isSuccessful()) {
-                        MessageUtil.markMessage(remoteFile.getMessage(), Message.STATUS_REMOTE_FILE_DELETED);
+                        MessageUtil.setAndSaveFileStatus(remoteFile.getMessage(), FileStatus.DELETED);
                         Logging.i("filetransfer.http.delete", "Remote file successfully deleted '" + remoteFile.getPath() + "'");
                     } else {
                         String detailedMessage = response.body().string();
+                        FileStatus fileStatus = FileStatus.DELETE_FAILED;
                         switch (response.code()) {
                             case 403:
-                            case 404:
                             case 500:
                                 try {
                                     JSONObject jsonObject = new JSONObject(detailedMessage);
@@ -68,16 +68,20 @@ public class DeleteTokenReceived implements OnIqPacketReceived {
                                     Logging.e("filetransfer.http.delete", "Failed to get error message from expected json response: " + detailedMessage);
                                 }
                                 break;
+                            case 404:
+                                fileStatus = FileStatus.DELETED;
+                                Logging.i("filetransfer.http.delete", "Failed to delete file - it was already deleted.");
+                                break;
                         }
                         Logging.e("filetransfer.http.delete", "Could not delete remote file '" + remoteFile.getPath() + "'. Response Code: " + response.code() + ", details: " + detailedMessage);
-                        MessageUtil.markMessage(remoteFile.getMessage(), Message.STATUS_REMOTE_FILE_DELETE_FAILED);
+                        MessageUtil.setAndSaveFileStatus(remoteFile.getMessage(), fileStatus);
                     }
                 }
             });
 
         } catch (XmppException e) {
             Logging.e("filetransfer.http.delete", "Error while trying to get the delete token: " + e.getMessage());
-            MessageUtil.markMessage(remoteFile.getMessage(), Message.STATUS_REMOTE_FILE_DELETE_FAILED);
+            MessageUtil.setAndSaveFileStatus(remoteFile.getMessage(), FileStatus.DELETE_FAILED);
         }
     }
 }