Merge branch 'trz/rename' into trz/rebase

1 files changed, 2 insertions, 3 deletions

diff --git a/src/main/java/eu/siacs/conversations/ui/ShareWithActivity.java b/src/main/java/eu/siacs/conversations/ui/ShareWithActivity.java
index 7fcd6b33..ebe622d0 100644
--- a/src/main/java/eu/siacs/conversations/ui/ShareWithActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/ShareWithActivity.java
@@ -15,7 +15,6 @@ import android.widget.Toast;
 
 import java.net.URLConnection;
 import java.util.ArrayList;
-import java.util.Iterator;
 import java.util.List;
 import java.util.concurrent.atomic.AtomicInteger;
 
@@ -23,6 +22,7 @@ import de.thedevstack.conversationsplus.ConversationsPlusPreferences;
 import de.thedevstack.conversationsplus.ui.dialogs.UserDecisionDialog;
 import de.thedevstack.conversationsplus.ui.listeners.ResizePictureUserDecisionListener;
 import de.thedevstack.conversationsplus.ui.listeners.ShareWithResizePictureUserDecisionListener;
+import de.thedevstack.conversationsplus.utils.AccountUtil;
 import de.thedevstack.conversationsplus.utils.ConversationUtil;
 
 import eu.siacs.conversations.Config;
@@ -30,7 +30,6 @@ import eu.siacs.conversations.R;
 import eu.siacs.conversations.entities.Account;
 import eu.siacs.conversations.entities.Conversation;
 import eu.siacs.conversations.entities.Message;
-import eu.siacs.conversations.persistance.FileBackend;
 import eu.siacs.conversations.services.XmppConnectionService;
 import eu.siacs.conversations.ui.adapter.ConversationAdapter;
 import eu.siacs.conversations.utils.FileUtils;
@@ -308,7 +307,7 @@ public class ShareWithActivity extends XmppActivity implements XmppConnectionSer
 					}
 				};
 			}
-			if (account.httpUploadAvailable()
+			if (AccountUtil.isHttpUploadAvailable(account)
 					&& (conversation.getMode() == Conversation.MODE_MULTI
 					|| FileUtils.allFilesUnderSize(this, share.uris, max))
 					&& conversation.getNextEncryption() != Message.ENCRYPTION_OTR) {