From 1ea2e7dc3b3f9080ab55e1712c737ae9685d7791 Mon Sep 17 00:00:00 2001
From: iNPUTmice <daniel@gultsch.de>
Date: Sat, 1 Nov 2014 14:33:34 +0100
Subject: fixed arrayoutofbounds + spelling

---
 .../java/eu/siacs/conversations/services/XmppConnectionService.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/main/java/eu/siacs/conversations/services/XmppConnectionService.java')

diff --git a/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java b/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
index be73e07f..ea6f509f 100644
--- a/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
+++ b/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
@@ -1935,7 +1935,7 @@ public class XmppConnectionService extends Service {
 		Message current = message;
 		while(current.getStatus() == Message.STATUS_SEND_FAILED) {
 			messages.add(current);
-			if (current.mergable(current.next())) {
+			if (current.mergeable(current.next())) {
 				current = current.next();
 			} else {
 				break;
-- 
cgit v1.2.3