Improved error handling for filetransfer:http:delete, Check for httpupload feature available extended to include filetransfer:http as well, method to check if http upload is available moved from data class 'Account' to 'AccountUtil'

4 files changed, 41 insertions, 17 deletions

diff --git a/src/main/java/de/thedevstack/conversationsplus/services/XmppConnectionService.java b/src/main/java/de/thedevstack/conversationsplus/services/XmppConnectionService.java
index 83cefc80..ee0ee14a 100644
--- a/src/main/java/de/thedevstack/conversationsplus/services/XmppConnectionService.java
+++ b/src/main/java/de/thedevstack/conversationsplus/services/XmppConnectionService.java
@@ -38,7 +38,6 @@ import org.openintents.openpgp.util.OpenPgpApi;
 import org.openintents.openpgp.util.OpenPgpServiceConnection;
 
 import java.math.BigInteger;
-import java.security.SecureRandom;
 import java.security.cert.CertificateException;
 import java.security.cert.X509Certificate;
 import java.util.ArrayList;
@@ -53,11 +52,11 @@ import java.util.Locale;
 import java.util.Map;
 import java.util.concurrent.CopyOnWriteArrayList;
 
-import de.duenndns.ssl.MemorizingTrustManager;
 import de.thedevstack.android.logcat.Logging;
 import de.thedevstack.conversationsplus.ConversationsPlusApplication;
 import de.thedevstack.conversationsplus.ConversationsPlusPreferences;
 import de.thedevstack.conversationsplus.services.filetransfer.FileTransferManager;
+import de.thedevstack.conversationsplus.utils.AccountUtil;
 import de.thedevstack.conversationsplus.utils.ImageUtil;
 import de.thedevstack.conversationsplus.utils.MessageUtil;
 import de.thedevstack.conversationsplus.utils.UiUpdateHelper;
@@ -85,7 +84,6 @@ import de.thedevstack.conversationsplus.entities.TransferablePlaceholder;
 import de.thedevstack.conversationsplus.generator.IqGenerator;
 import de.thedevstack.conversationsplus.generator.MessageGenerator;
 import de.thedevstack.conversationsplus.generator.PresenceGenerator;
-import de.thedevstack.conversationsplus.http.HttpConnectionManager;
 import de.thedevstack.conversationsplus.parser.IqParser;
 import de.thedevstack.conversationsplus.parser.MessageParser;
 import de.thedevstack.conversationsplus.parser.PresenceParser;
@@ -1080,7 +1078,7 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa
 		} else {
 			for (Conversation conversation : getConversations()) {
 				if (conversation.getMode() == Conversation.MODE_SINGLE
-						|| conversation.getAccount().httpUploadAvailable()) {
+						|| AccountUtil.isHttpUploadAvailable(conversation.getAccount())) {
 					list.add(conversation);
 				}
 			}
diff --git a/src/main/java/de/thedevstack/conversationsplus/services/filetransfer/http/delete/DeleteRemoteFileService.java b/src/main/java/de/thedevstack/conversationsplus/services/filetransfer/http/delete/DeleteRemoteFileService.java
index eb9f1b04..2085cf4b 100644
--- a/src/main/java/de/thedevstack/conversationsplus/services/filetransfer/http/delete/DeleteRemoteFileService.java
+++ b/src/main/java/de/thedevstack/conversationsplus/services/filetransfer/http/delete/DeleteRemoteFileService.java
@@ -31,12 +31,16 @@ public class DeleteRemoteFileService implements SimpleUserDecisionCallback {
                 path = this.message.getFileParams().getUrl();
             }
 
-            DeleteRemoteFile remoteFile = new DeleteRemoteFile(path, this.message);
-            Account account = this.message.getConversation().getAccount();
-            Jid host = account.getXmppConnection().findDiscoItemByFeature(FileTransferHttp.NAMESPACE);
-            IqPacket request = FileTransferHttpDeleteSlotRequestPacketGenerator.generate(host, path);
-            MessageUtil.setAndSaveFileStatus(this.message, FileStatus.DELETING);
-            XmppSendUtil.sendIqPacket(account, request, new DeleteTokenReceived(remoteFile));
+            if (null != path) {
+                DeleteRemoteFile remoteFile = new DeleteRemoteFile(path, this.message);
+                Account account = this.message.getConversation().getAccount();
+                Jid host = account.getXmppConnection().findDiscoItemByFeature(FileTransferHttp.NAMESPACE);
+                if (null != host) {
+                    IqPacket request = FileTransferHttpDeleteSlotRequestPacketGenerator.generate(host, path);
+                    MessageUtil.setAndSaveFileStatus(this.message, FileStatus.DELETING);
+                    XmppSendUtil.sendIqPacket(account, request, new DeleteTokenReceived(remoteFile));
+                }
+            }
         }
     }
 
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 186454e4..83a250de 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
@@ -1,16 +1,21 @@
 package de.thedevstack.conversationsplus.services.filetransfer.http.delete;
 
+import android.widget.Toast;
+
 import org.json.JSONException;
 import org.json.JSONObject;
 
 import java.io.IOException;
 
 import de.thedevstack.android.logcat.Logging;
+import de.thedevstack.conversationsplus.R;
 import de.thedevstack.conversationsplus.entities.Account;
 import de.thedevstack.conversationsplus.enums.FileStatus;
 import de.thedevstack.conversationsplus.http.HttpClient;
 import de.thedevstack.conversationsplus.utils.MessageUtil;
+import de.thedevstack.conversationsplus.utils.ui.ConversationsPlusToast;
 import de.thedevstack.conversationsplus.xmpp.OnIqPacketReceived;
+import de.thedevstack.conversationsplus.xmpp.exceptions.ServiceUnavailableException;
 import de.thedevstack.conversationsplus.xmpp.exceptions.XmppException;
 import de.thedevstack.conversationsplus.xmpp.filetransfer.http.delete.DeleteSlotPacketParser;
 import de.thedevstack.conversationsplus.xmpp.stanzas.IqPacket;
@@ -81,6 +86,11 @@ public class DeleteTokenReceived implements OnIqPacketReceived {
 
         } catch (XmppException e) {
             Logging.e("filetransfer.http.delete", "Error while trying to get the delete token: " + e.getMessage());
+            int messageResId = R.string.cplus_remote_file_delete_failed;
+            if (e instanceof ServiceUnavailableException) {
+                messageResId = R.string.cplus_remote_file_delete_service_unavailable;
+            }
+            ConversationsPlusToast.makeErrorToast(messageResId, Toast.LENGTH_LONG);
             MessageUtil.setAndSaveFileStatus(remoteFile.getMessage(), FileStatus.DELETE_FAILED);
         }
     }
diff --git a/src/main/java/de/thedevstack/conversationsplus/services/filetransfer/http/upload/HttpUploadFileTransferService.java b/src/main/java/de/thedevstack/conversationsplus/services/filetransfer/http/upload/HttpUploadFileTransferService.java
index 6b19cd5f..f0bb438d 100644
--- a/src/main/java/de/thedevstack/conversationsplus/services/filetransfer/http/upload/HttpUploadFileTransferService.java
+++ b/src/main/java/de/thedevstack/conversationsplus/services/filetransfer/http/upload/HttpUploadFileTransferService.java
@@ -13,8 +13,10 @@ import de.thedevstack.conversationsplus.persistance.FileBackend;
 import de.thedevstack.conversationsplus.services.AbstractConnectionManager;
 import de.thedevstack.conversationsplus.services.FileTransferService;
 import de.thedevstack.conversationsplus.services.filetransfer.AbstractFileTransferService;
+import de.thedevstack.conversationsplus.utils.AccountUtil;
 import de.thedevstack.conversationsplus.utils.MessageUtil;
 import de.thedevstack.conversationsplus.utils.XmppSendUtil;
+import de.thedevstack.conversationsplus.xmpp.filetransfer.http.FileTransferHttp;
 import de.thedevstack.conversationsplus.xmpp.filetransfer.http.upload.HttpUpload;
 import de.thedevstack.conversationsplus.xmpp.filetransfer.http.upload.HttpUploadRequestSlotPacketGenerator;
 import de.thedevstack.conversationsplus.xmpp.jid.Jid;
@@ -62,19 +64,29 @@ public class HttpUploadFileTransferService extends AbstractFileTransferService i
             file.setExpectedSize(inputStreamAndExpectedSize.second);
 
             Logging.d("httpupload", "Requesting upload slot for file upload");
-            Jid host = account.getXmppConnection().findDiscoItemByFeature(HttpUpload.NAMESPACE);
-            IqPacket request = HttpUploadRequestSlotPacketGenerator.generate(host, file.getName(), file.getSize(), file.getMimeType());
-            XmppSendUtil.sendIqPacket(account, request, new HttpUploadSlotRequestReceived(entity));
-            MessageUtil.markMessage(message, Message.STATUS_UNSEND);
+            Jid host = this.getHost(account);
+            if (null != host) {
+                IqPacket request = HttpUploadRequestSlotPacketGenerator.generate(host, file.getName(), file.getSize(), file.getMimeType());
+                XmppSendUtil.sendIqPacket(account, request, new HttpUploadSlotRequestReceived(entity));
+                MessageUtil.markMessage(message, Message.STATUS_UNSEND);
 
-            Logging.d("httpupload", "Upload slot for file upload requested");
-            started = true;
+                Logging.d("httpupload", "Upload slot for file upload requested");
+                started = true;
+            }
         } catch (FileNotFoundException e) {
             Logging.e("httpupload", "Could not find file, exception message: " + e.getMessage());
         }
         return started;
     }
 
+    private Jid getHost(Account account) {
+        Jid host = account.getXmppConnection().findDiscoItemByFeature(FileTransferHttp.NAMESPACE);
+        if (null == host) {
+            host = account.getXmppConnection().findDiscoItemByFeature(HttpUpload.NAMESPACE);
+        }
+        return host;
+    }
+
     /**
      * Checks whether a message can be sent using this service or not.
      *
@@ -87,6 +99,6 @@ public class HttpUploadFileTransferService extends AbstractFileTransferService i
                 && null != message.getConversation()
                 && null != message.getConversation().getAccount()
                 && null != message.getFileParams()
-                && message.getConversation().getAccount().httpUploadAvailable(message.getFileParams().getSize());
+                && AccountUtil.isHttpUploadAvailable(message.getConversation().getAccount(), message.getFileParams().getSize());
     }
 }