From a8d08cbdc241aa8ead3fab13350412d80e6424a2 Mon Sep 17 00:00:00 2001 From: Christian Schneppe Date: Tue, 18 Apr 2017 20:23:08 +0200 Subject: reused code to retrieve AutoAcceptFileSize for AutoResend --- .../messenger/services/XmppConnectionService.java | 20 +------------------- 1 file changed, 1 insertion(+), 19 deletions(-) (limited to 'src') diff --git a/src/main/java/de/pixart/messenger/services/XmppConnectionService.java b/src/main/java/de/pixart/messenger/services/XmppConnectionService.java index 02f9273c7..97999a587 100644 --- a/src/main/java/de/pixart/messenger/services/XmppConnectionService.java +++ b/src/main/java/de/pixart/messenger/services/XmppConnectionService.java @@ -1470,30 +1470,12 @@ public class XmppConnectionService extends Service { }); } - private long AcceptFileSize() { - String config = "0"; - SharedPreferences sharedPref = getPreferences(); - if (isWIFI()) { - config = sharedPref.getString("auto_accept_file_size_wifi", "10485760"); - } else if (isMobile() && !isMobileRoaming()) { - config = sharedPref.getString("auto_accept_file_size_mobile", "262144"); - } else if (isMobile() && isMobileRoaming()) { - config = sharedPref.getString("auto_accept_file_size_roaming", "1"); - } - - try { - return Long.parseLong(config); - } catch (NumberFormatException e) { - return 1048576; - } - } - private void resendFailedFileMessages(final Conversation conversation) { conversation.findFailedMessagesWithFiles(new Conversation.OnMessageFound() { @Override public void onMessageFound(Message message) { - if (AcceptFileSize() >= message.getFileParams().size) { + if (mHttpConnectionManager.getAutoAcceptFileSize() >= message.getFileParams().size) { Log.d(Config.LOGTAG, "Resend failed message with size " + message.getFileParams().size + " bytes for " + conversation.getJid()); resendMessage(message, true); } -- cgit v1.2.3