XmppConnectionService.markMessage moved to MessageUtil

XmppConnectionService.attachLocationToConversation moved to ConversationUtil

1 files changed, 8 insertions, 84 deletions

diff --git a/src/main/java/de/thedevstack/conversationsplus/services/XmppConnectionService.java b/src/main/java/de/thedevstack/conversationsplus/services/XmppConnectionService.java
index cf587efe..9c0e55db 100644
--- a/src/main/java/de/thedevstack/conversationsplus/services/XmppConnectionService.java
+++ b/src/main/java/de/thedevstack/conversationsplus/services/XmppConnectionService.java
@@ -217,7 +217,7 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa
 				if (conversation.getAccount() == account) {
 					Message message = conversation.findUnsentMessageWithUuid(uuid);
 					if (message != null) {
-						markMessage(message, Message.STATUS_SEND);
+                        MessageUtil.markMessage(message, Message.STATUS_SEND);
 					}
 				}
 			}
@@ -360,64 +360,6 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa
 		}
 	}
 
-	public void attachLocationToConversation(final Conversation conversation,
-											 final Uri uri,
-											 final UiCallback<Message> callback) {
-		int encryption = conversation.getNextEncryption();
-		if (encryption == Message.ENCRYPTION_PGP) {
-			encryption = Message.ENCRYPTION_DECRYPTED;
-		}
-		Message message = new Message(conversation, uri.toString(), encryption);
-		if (conversation.getNextCounterpart() != null) {
-			message.setCounterpart(conversation.getNextCounterpart());
-		}
-		if (encryption == Message.ENCRYPTION_DECRYPTED) {
-			getPgpEngine().encrypt(message, callback);
-		} else {
-			callback.success(message);
-		}
-	}
-
-	public void attachFileToConversation(final Conversation conversation,
-										 final Uri uri,
-										 final UiCallback<Message> callback) {
-		final Message message;
-		if (conversation.getNextEncryption() == Message.ENCRYPTION_PGP) {
-			message = new Message(conversation, "", Message.ENCRYPTION_DECRYPTED);
-		} else {
-			message = new Message(conversation, "", conversation.getNextEncryption());
-		}
-		message.setCounterpart(conversation.getNextCounterpart());
-		message.setType(Message.TYPE_FILE);
-		String path = FileUtils.getPath(uri);
-		if (path != null) {
-			message.setRelativeFilePath(path);
-			MessageUtil.updateFileParams(message);
-			if (message.getEncryption() == Message.ENCRYPTION_DECRYPTED) {
-				getPgpEngine().encrypt(message, callback);
-			} else {
-				callback.success(message);
-			}
-		} else {
-            ConversationsPlusApplication.executeFileAdding(new Runnable() {
-                @Override
-                public void run() {
-                    try {
-                        FileBackend.copyFileToPrivateStorage(message, uri);
-                        MessageUtil.updateFileParams(message);
-                        if (message.getEncryption() == Message.ENCRYPTION_DECRYPTED) {
-                            getPgpEngine().encrypt(message, callback);
-                        } else {
-                            callback.success(message);
-                        }
-                    } catch (FileCopyException e) {
-                        callback.error(e.getResId(), message);
-                    }
-                }
-            });
-		}
-	}
-
 	public Conversation find(Bookmark bookmark) {
 		return find(bookmark.getAccount(), bookmark.getJid());
 	}
@@ -828,7 +770,7 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa
 					new Conversation.OnMessageFound() {
 						@Override
 						public void onMessageFound(Message message) {
-							markMessage(message, Message.STATUS_SEND_FAILED);
+							MessageUtil.markMessage(message, Message.STATUS_SEND_FAILED);
 						}
 					});
 		}
@@ -940,9 +882,9 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa
 		if (resend) {
 			if (packet != null && addToConversation) {
 				if (account.getXmppConnection().getFeatures().sm() || conversation.getMode() == Conversation.MODE_MULTI) {
-					markMessage(message, Message.STATUS_UNSEND);
+                    MessageUtil.markMessage(message, Message.STATUS_UNSEND);
 				} else {
-					markMessage(message, Message.STATUS_SEND);
+                    MessageUtil.markMessage(message, Message.STATUS_SEND);
 				}
 			}
 		} else {
@@ -1158,7 +1100,7 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa
 					message.setTransferable(new TransferablePlaceholder(Transferable.STATUS_DELETED));
 					final int s = message.getStatus();
 					if (s == Message.STATUS_WAITING || s == Message.STATUS_OFFERED || s == Message.STATUS_UNSEND) {
-						markMessage(message, Message.STATUS_SEND_FAILED);
+						MessageUtil.markMessage(message, Message.STATUS_SEND_FAILED);
 					}
 				}
 			}
@@ -2344,7 +2286,7 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa
 
 					@Override
 					public void onMessageFound(Message message) {
-						markMessage(message, Message.STATUS_WAITING);
+						MessageUtil.markMessage(message, Message.STATUS_WAITING);
 					}
 				});
 			}
@@ -2359,7 +2301,7 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa
 			if (conversation.getJid().toBareJid().equals(recipient) && conversation.getAccount() == account) {
 				final Message message = conversation.findSentMessageWithUuidOrRemoteId(uuid);
 				if (message != null) {
-					markMessage(message, status);
+					MessageUtil.markMessage(message, status);
 				}
 				return message;
 			}
@@ -2367,24 +2309,6 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa
 		return null;
 	}
 
-	public boolean markMessage(Conversation conversation, String uuid, int status) {
-		if (uuid == null) {
-			return false;
-		} else {
-			Message message = conversation.findSentMessageWithUuid(uuid);
-			if (message != null) {
-				markMessage(message, status);
-				return true;
-			} else {
-				return false;
-			}
-		}
-	}
-
-	public void markMessage(Message message, int status) {
-        MessageUtil.markMessage(message, status);
-	}
-
 	public int unreadCount() {
 		int count = 0;
 		for (Conversation conversation : getConversations()) {
@@ -2682,7 +2606,7 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa
 	public void resendFailedMessages(final Message message) {
         if (message.getStatus() == Message.STATUS_SEND_FAILED) {
             message.setTime(System.currentTimeMillis());
-            markMessage(message, Message.STATUS_WAITING);
+            MessageUtil.markMessage(message, Message.STATUS_WAITING);
             this.resendMessage(message, false);
         }
 	}