awesome-bookmarks/arcanechat-android
3
0
Fork 0
mirror of https://github.com/ArcaneChat/android.git synced 2026-07-03 14:05:24 +02:00
Code Issues Packages Projects Releases 3 Wiki Activity

address code review: use AtomicReference, remove redundant null check, log failed videos

Browse Source 
Agent-Logs-Url: https://github.com/ArcaneChat/android/sessions/46f23f6d-d5a5-48b9-8b1d-4aa5cfdda115

Co-authored-by: adbenitez <24558636+adbenitez@users.noreply.github.com>
This commit is contained in:
copilot-swe-agent[bot]
2026-04-29 15:00:18 +00:00
committed by GitHub
parent e6fd96bf35
commit ceffc5df1c
1 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/org/thoughtcrime/securesms/util/SendRelayedMessageUtil.java
+11 -8
View File
@@ -27,6 +27,7 @@ import java.io.InputStreamReader;
import java.io.OutputStream;
import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.atomic.AtomicReference;
import org.thoughtcrime.securesms.ConversationListRelayingActivity;
import org.thoughtcrime.securesms.R;
import org.thoughtcrime.securesms.connect.DcHelper;
@@ -122,15 +123,15 @@ public class SendRelayedMessageUtil {
String text = sharedText;
boolean hasVideos = containsVideoType(context, uris);
final ProgressDialog[] progressDialog = {null};
AtomicReference<ProgressDialog> progressDialogRef = new AtomicReference<>(null);
if (hasVideos && context instanceof Activity) {
Activity activity = (Activity) context;
Util.runOnMain(
() -> {
if (!activity.isFinishing()) {
progressDialog[0] =
progressDialogRef.set(
ProgressDialog.show(
activity, "", context.getString(R.string.one_moment), true, false);
activity, "", context.getString(R.string.one_moment), true, false));
}
});
}
@@ -139,7 +140,7 @@ public class SendRelayedMessageUtil {
DcMsg msg = createMessage(context, uris.get(0), msgType, sharedHtml, subject, text);
if (msg.getType() == DcMsg.DC_MSG_VIDEO) {
if (!VideoRecoder.prepareVideo(context, chatId, msg)) {
dismissProgressDialog(progressDialog);
dismissProgressDialog(progressDialogRef);
return;
}
}
@@ -152,6 +153,7 @@ public class SendRelayedMessageUtil {
DcMsg msg = createMessage(context, uri, null, null, subject, null);
if (msg.getType() == DcMsg.DC_MSG_VIDEO) {
if (!VideoRecoder.prepareVideo(context, chatId, msg)) {
Log.w(TAG, "prepareVideo failed for " + uri + ", skipping");
continue;
}
}
@@ -159,15 +161,16 @@ public class SendRelayedMessageUtil {
}
}
dismissProgressDialog(progressDialog);
dismissProgressDialog(progressDialogRef);
}
private static void dismissProgressDialog(ProgressDialog[] progressDialog) {
if (progressDialog[0] != null) {
private static void dismissProgressDialog(AtomicReference<ProgressDialog> progressDialogRef) {
ProgressDialog dialog = progressDialogRef.get();
if (dialog != null) {
Util.runOnMain(
() -> {
try {
if (progressDialog[0] != null) progressDialog[0].dismiss();
dialog.dismiss();
} catch (final IllegalArgumentException e) {
// The activity is finishing/destroyed, do nothing.
}