Minor refactoring

src/org/thoughtcrime/securesms/conversation/ConversationActivity.java

@@ -2440,28 +2440,18 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
 
     final long id = fragment.stageOutgoingMessage(outgoingMessage);
 
-    new AsyncTask<Void, Void, Long>() {
+    if (initiating) {
-      @Override
+      DatabaseFactory.getRecipientDatabase(context).setProfileSharing(recipient, true);
-      protected Long doInBackground(Void... param) {
+    }
-        if (initiating) {
-          DatabaseFactory.getRecipientDatabase(context).setProfileSharing(recipient, true);
-        }
-
-        long result = MessageSender.send(context, outgoingMessage, threadId, forceSms, () -> fragment.releaseOutgoingMessage(id));
 
-        if (!recipient.isGroupRecipient()) {
+    long result = MessageSender.send(context, outgoingMessage, threadId, forceSms, () -> fragment.releaseOutgoingMessage(id));
-          ApplicationContext.getInstance(context).sendSessionRequestIfNeeded(recipient.getAddress().serialize());
-        }
 
-        return result;
+    if (!recipient.isGroupRecipient()) {
-      }
+      ApplicationContext.getInstance(context).sendSessionRequestIfNeeded(recipient.getAddress().serialize());
+    }
 
-      @Override
+    sendComplete(result);
-      protected void onPostExecute(Long result) {
+    future.set(null);
-        sendComplete(result);
-        future.set(null);
-      }
-    }.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
 
     return future;
   }
@@ -2489,27 +2479,17 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
     silentlySetComposeText("");
     final long id = fragment.stageOutgoingMessage(message);
 
-    new AsyncTask<OutgoingTextMessage, Void, Long>() {
+    if (initiatingConversation) {
-      @Override
+      DatabaseFactory.getRecipientDatabase(context).setProfileSharing(recipient, true);
-      protected Long doInBackground(OutgoingTextMessage... messages) {
+    }
-        if (initiatingConversation) {
-          DatabaseFactory.getRecipientDatabase(context).setProfileSharing(recipient, true);
-        }
-
-        long result = MessageSender.send(context, messages[0], threadId, forceSms, () -> fragment.releaseOutgoingMessage(id));
 
-        if (!recipient.isGroupRecipient()) {
+    long result = MessageSender.send(context, message, threadId, forceSms, () -> fragment.releaseOutgoingMessage(id));
-          ApplicationContext.getInstance(context).sendSessionRequestIfNeeded(recipient.getAddress().serialize());
-        }
 
-        return result;
+    if (!recipient.isGroupRecipient()) {
-      }
+      ApplicationContext.getInstance(context).sendSessionRequestIfNeeded(recipient.getAddress().serialize());
+    }
 
-      @Override
+    sendComplete(result);
-      protected void onPostExecute(Long result) {
-         sendComplete(result);
-       }
-    }.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, message);
   }
 
   private void showDefaultSmsPrompt() {