diff --git a/src/org/thoughtcrime/securesms/ConversationActivity.java b/src/org/thoughtcrime/securesms/ConversationActivity.java index a1d6afa5c..63caa6f98 100644 --- a/src/org/thoughtcrime/securesms/ConversationActivity.java +++ b/src/org/thoughtcrime/securesms/ConversationActivity.java @@ -103,6 +103,7 @@ import org.thoughtcrime.securesms.util.DynamicTheme; import org.thoughtcrime.securesms.util.MediaUtil; import org.thoughtcrime.securesms.util.Prefs; import org.thoughtcrime.securesms.util.RelayUtil; +import org.thoughtcrime.securesms.util.SendMessageUtil; import org.thoughtcrime.securesms.util.ServiceUtil; import org.thoughtcrime.securesms.util.Util; import org.thoughtcrime.securesms.util.ViewUtil; @@ -124,13 +125,10 @@ import java.util.List; import java.util.concurrent.ExecutionException; import static org.thoughtcrime.securesms.TransportOption.Type; -import static org.thoughtcrime.securesms.util.RelayUtil.getForwardedMessageIDs; import static org.thoughtcrime.securesms.util.RelayUtil.getSharedText; -import static org.thoughtcrime.securesms.util.RelayUtil.getSharedUris; import static org.thoughtcrime.securesms.util.RelayUtil.isForwarding; import static org.thoughtcrime.securesms.util.RelayUtil.isRelayingMessageContent; import static org.thoughtcrime.securesms.util.RelayUtil.isSharing; -import static org.thoughtcrime.securesms.util.RelayUtil.resetSharedText; /** * Activity for displaying a message thread, as well as @@ -643,7 +641,7 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity private void handleForwarding() { DcChat dcChat = dcContext.getChat(chatId); if (dcChat.isSelfTalk()) { - new RelayingTask(this, chatId).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR); + SendMessageUtil.immediatelyRelay(this, chatId); } else { String name = dcChat.getName(); if (!dcChat.isGroup()) { @@ -654,7 +652,7 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity } new AlertDialog.Builder(this) .setMessage(getString(R.string.ask_forward, name)) - .setPositiveButton(R.string.ok, (dialogInterface, i) -> new RelayingTask(this, chatId).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR)) + .setPositiveButton(R.string.ok, (dialogInterface, i) -> SendMessageUtil.immediatelyRelay(this, chatId)) .setNegativeButton(R.string.cancel, (dialogInterface, i) -> finish()) .show(); } @@ -672,11 +670,11 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity .setNegativeButton(android.R.string.cancel, ((dialog, which) -> { finish(); })) - .setPositiveButton(R.string.menu_send, (dialog, which) -> new RelayingTask(this, chatId).execute()) + .setPositiveButton(R.string.menu_send, (dialog, which) -> SendMessageUtil.immediatelyRelay(this, chatId)) .show(); } else { if (uriList.size() == 1) { - DcMsg message = createMessage(this, uriList.get(0), getSharedText(this)); + DcMsg message = SendMessageUtil.createMessage(this, uriList.get(0), getSharedText(this)); dcContext.setDraft(chatId, message); } initializeDraft().addListener(new AssertedSuccessListener() { @@ -1110,120 +1108,6 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity return future; } - static class RelayingTask extends AsyncTask { - - WeakReference activityRef; - int chatId; - - RelayingTask(Activity activity, int chatId) { - activityRef = new WeakReference<>(activity); - this.chatId = chatId; - } - - @Override - protected Void doInBackground(Void... voids) { - Activity activity = activityRef.get(); - if (activity == null) { - return null; - } - - activity.setResult(RESULT_OK); - if (isForwarding(activity)) { - handleForwarding(activity); - } else if (isSharing(activity)) { - handleSharing(activity); - } - return null; - } - - - private void handleForwarding(Activity activity) { - DcContext dcContext = DcHelper.getContext(activity); - dcContext.forwardMsgs(getForwardedMessageIDs(activity), chatId); - } - - private void handleSharing(Activity activity) { - DcContext dcContext = DcHelper.getContext(activity); - ArrayList uris = getSharedUris(activity); - Log.e(TAG, "HandleSharing, size: " + uris.size()+" text: "+ getSharedText(activity)); - try { - DcMsg textMessage = createMessage(activity, null, getSharedText(activity)); - dcContext.sendMsg(chatId, textMessage); - for(Uri uri : uris) { - Log.e(TAG, "HandleSharing "+uri + " text: "+ getSharedText(activity)); - DcMsg message = createMessage(activity, uri, null); - dcContext.sendMsg(chatId, message); - cleanup(activity, uri); - } - } catch (NullPointerException npe) { - Log.w(TAG, "Activity destroyed before background task finished. " + - "Cancelling message relaying. " + - npe.getMessage()); - } - } - - private void cleanup(Context context, final @Nullable Uri uri) { - if (uri != null && PersistentBlobProvider.isAuthority(context, uri)) { - Log.w(TAG, "cleaning up " + uri); - PersistentBlobProvider.getInstance(context).delete(context, uri); - } - } - - } - - private static DcMsg createMessage(Context context, Uri uri, String text) throws NullPointerException { - DcContext dcContext = DcHelper.getContext(context); - DcMsg message; - String mimeType = MediaUtil.getMimeType(context, uri); - if (uri == null) { - message = new DcMsg(dcContext, DcMsg.DC_MSG_TEXT); - } else if (MediaUtil.isImageType(mimeType)) { - message = new DcMsg(dcContext, DcMsg.DC_MSG_IMAGE); - } - else if (MediaUtil.isAudioType(mimeType)) { - message = new DcMsg(dcContext,DcMsg.DC_MSG_AUDIO); - } - else if (MediaUtil.isVideoType(mimeType)) { - message = new DcMsg(dcContext, DcMsg.DC_MSG_VIDEO); - } - else { - message = new DcMsg(dcContext, DcMsg.DC_MSG_FILE); - } - - if (uri != null) { - message.setFile(getRealPathFromUri(context, uri), mimeType); - } - message.setText(text); - return message; - } - - private static String getRealPathFromUri(Context context, Uri uri) throws NullPointerException { - ApplicationDcContext dcContext = DcHelper.getContext(context); - try { - String filename = uri.getPathSegments().get(2); // Get real file name from Uri - String ext = ""; - int i = filename.lastIndexOf("."); - if(i>=0) { - ext = filename.substring(i); - filename = filename.substring(0, i); - } - String path = dcContext.getBlobdirFile(filename, ext); - - // copy content to this file - if(path != null) { - InputStream inputStream = PartAuthority.getAttachmentStream(context, uri); - OutputStream outputStream = new FileOutputStream(path); - Util.copy(inputStream, outputStream); - } - - return path; - } - catch(Exception e) { - e.printStackTrace(); - return null; - } - } - protected void sendComplete(int chatId) { boolean refreshFragment = (chatId != this.chatId); diff --git a/src/org/thoughtcrime/securesms/ConversationListFragment.java b/src/org/thoughtcrime/securesms/ConversationListFragment.java index b75c7e925..cdae2f987 100644 --- a/src/org/thoughtcrime/securesms/ConversationListFragment.java +++ b/src/org/thoughtcrime/securesms/ConversationListFragment.java @@ -66,6 +66,7 @@ import org.thoughtcrime.securesms.connect.DcChatlistLoader; import org.thoughtcrime.securesms.connect.DcHelper; import org.thoughtcrime.securesms.mms.GlideApp; import org.thoughtcrime.securesms.util.RelayUtil; +import org.thoughtcrime.securesms.util.SendMessageUtil; import org.thoughtcrime.securesms.util.ViewUtil; import org.thoughtcrime.securesms.util.guava.Optional; import org.thoughtcrime.securesms.util.task.SnackbarAsyncTask; @@ -80,6 +81,7 @@ import static org.thoughtcrime.securesms.util.RelayUtil.acquireRelayMessageConte import static org.thoughtcrime.securesms.util.RelayUtil.getSharedText; import static org.thoughtcrime.securesms.util.RelayUtil.getSharedUris; import static org.thoughtcrime.securesms.util.RelayUtil.isRelayingMessageContent; +import static org.thoughtcrime.securesms.util.RelayUtil.resetRelayingMessageContent; public class ConversationListFragment extends Fragment @@ -193,8 +195,12 @@ public class ConversationListFragment extends Fragment final Set selectedChats = getListAdapter().getBatchSelections(); for (long chatId : selectedChats) { Log.e(TAG, "...to "+chatId); - new ConversationActivity.RelayingTask(getActivity(), (int) chatId).execute(); + SendMessageUtil.immediatelyRelay(getActivity(), (int) chatId); } + resetRelayingMessageContent(getActivity()); + actionMode.finish(); + actionMode = null; + startActivity(new Intent(getActivity(), (ConversationListActivity.class))); }) .show(); } diff --git a/src/org/thoughtcrime/securesms/util/RelayUtil.java b/src/org/thoughtcrime/securesms/util/RelayUtil.java index eb751dc6d..50b3a76c2 100644 --- a/src/org/thoughtcrime/securesms/util/RelayUtil.java +++ b/src/org/thoughtcrime/securesms/util/RelayUtil.java @@ -3,6 +3,7 @@ package org.thoughtcrime.securesms.util; import android.app.Activity; import android.content.Intent; import android.net.Uri; + import androidx.annotation.NonNull; import java.util.ArrayList; @@ -132,5 +133,4 @@ public class RelayUtil { composeIntent.putExtra(DIRECT_SHARING_CHAT_ID, chatId); } - } diff --git a/src/org/thoughtcrime/securesms/util/SendMessageUtil.java b/src/org/thoughtcrime/securesms/util/SendMessageUtil.java new file mode 100644 index 000000000..daff648ac --- /dev/null +++ b/src/org/thoughtcrime/securesms/util/SendMessageUtil.java @@ -0,0 +1,122 @@ +package org.thoughtcrime.securesms.util; + +import android.app.Activity; +import android.content.Context; +import android.net.Uri; +import android.util.Log; + +import androidx.annotation.Nullable; + +import com.b44t.messenger.DcContext; +import com.b44t.messenger.DcMsg; + +import org.thoughtcrime.securesms.ConversationActivity; +import org.thoughtcrime.securesms.connect.ApplicationDcContext; +import org.thoughtcrime.securesms.connect.DcHelper; +import org.thoughtcrime.securesms.mms.PartAuthority; +import org.thoughtcrime.securesms.providers.PersistentBlobProvider; + +import java.io.FileOutputStream; +import java.io.InputStream; +import java.io.OutputStream; +import java.util.ArrayList; + +import static android.app.Activity.RESULT_OK; +import static org.thoughtcrime.securesms.util.RelayUtil.getForwardedMessageIDs; +import static org.thoughtcrime.securesms.util.RelayUtil.getSharedText; +import static org.thoughtcrime.securesms.util.RelayUtil.getSharedUris; +import static org.thoughtcrime.securesms.util.RelayUtil.isForwarding; +import static org.thoughtcrime.securesms.util.RelayUtil.isSharing; + +public class SendMessageUtil { + private static final String TAG = SendMessageUtil.class.getSimpleName(); + + public static void immediatelyRelay(Activity activity, int chatId) { + activity.setResult(RESULT_OK); + if (isForwarding(activity)) { + handleForwarding(activity, chatId); + } else if (isSharing(activity)) { + handleSharing(activity, chatId); + } + } + + private static void handleForwarding(Activity activity, int chatId) { + DcContext dcContext = DcHelper.getContext(activity); + dcContext.forwardMsgs(getForwardedMessageIDs(activity), chatId); + } + + private static void handleSharing(Activity activity, int chatId) { + DcContext dcContext = DcHelper.getContext(activity); + ArrayList uris = getSharedUris(activity); + + Log.e(TAG, "HandleSharing, size: " + uris.size()+" text: "+ getSharedText(activity)); + DcMsg textMessage = createMessage(activity, null, getSharedText(activity)); + dcContext.sendMsg(chatId, textMessage); + for(Uri uri : uris) { + Log.e(TAG, "HandleSharing "+uri + " text: "+ getSharedText(activity)); + DcMsg message = createMessage(activity, uri, null); + dcContext.sendMsg(chatId, message); + cleanup(activity, uri); + } + } + + private static void cleanup(Context context, final @Nullable Uri uri) { + if (uri != null && PersistentBlobProvider.isAuthority(context, uri)) { + Log.w(TAG, "cleaning up " + uri); + PersistentBlobProvider.getInstance(context).delete(context, uri); + } + } + + public static DcMsg createMessage(Context context, Uri uri, String text) throws NullPointerException { + DcContext dcContext = DcHelper.getContext(context); + DcMsg message; + String mimeType = MediaUtil.getMimeType(context, uri); + if (uri == null) { + message = new DcMsg(dcContext, DcMsg.DC_MSG_TEXT); + } else if (MediaUtil.isImageType(mimeType)) { + message = new DcMsg(dcContext, DcMsg.DC_MSG_IMAGE); + } + else if (MediaUtil.isAudioType(mimeType)) { + message = new DcMsg(dcContext,DcMsg.DC_MSG_AUDIO); + } + else if (MediaUtil.isVideoType(mimeType)) { + message = new DcMsg(dcContext, DcMsg.DC_MSG_VIDEO); + } + else { + message = new DcMsg(dcContext, DcMsg.DC_MSG_FILE); + } + + if (uri != null) { + message.setFile(getRealPathFromUri(context, uri), mimeType); + } + message.setText(text); + return message; + } + + private static String getRealPathFromUri(Context context, Uri uri) throws NullPointerException { + ApplicationDcContext dcContext = DcHelper.getContext(context); + try { + String filename = uri.getPathSegments().get(2); // Get real file name from Uri + String ext = ""; + int i = filename.lastIndexOf("."); + if(i>=0) { + ext = filename.substring(i); + filename = filename.substring(0, i); + } + String path = dcContext.getBlobdirFile(filename, ext); + + // copy content to this file + if(path != null) { + InputStream inputStream = PartAuthority.getAttachmentStream(context, uri); + OutputStream outputStream = new FileOutputStream(path); + Util.copy(inputStream, outputStream); + } + + return path; + } + catch(Exception e) { + e.printStackTrace(); + return null; + } + } +}