Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-04-23 02:10:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Provide better 'why' when an attachment is not auto-downloaded.

Browse Source
This commit is contained in:
Cody Henthorne
2023-06-21 16:18:16 -04:00
parent 882748f080
commit df8aaa2005
2 changed files with 21 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
app/src/main/java/org/thoughtcrime/securesms/util/AttachmentUtil.java
View File

@@ -32,6 +32,7 @@ public class AttachmentUtil {
}
if (!isFromTrustedConversation(context, attachment)) {
Log.w(TAG, "Not allowing download due to untrusted conversation");
return false;
}
@@ -45,11 +46,23 @@ public class AttachmentUtil {
{
return true;
} else if (attachment.isVideoGif()) {
return NotInCallConstraint.isNotInConnectedCall() && allowedTypes.contains("image");
boolean allowed = NotInCallConstraint.isNotInConnectedCall() && allowedTypes.contains("image");
if (!allowed) {
Log.w(TAG, "Not auto downloading. inCall: " + NotInCallConstraint.isNotInConnectedCall() + " allowedType: " + allowedTypes.contains("image"));
}
return allowed;
} else if (isNonDocumentType(contentType)) {
return NotInCallConstraint.isNotInConnectedCall() && allowedTypes.contains(MediaUtil.getDiscreteMimeType(contentType));
boolean allowed = NotInCallConstraint.isNotInConnectedCall() && allowedTypes.contains(MediaUtil.getDiscreteMimeType(contentType));
if (!allowed) {
Log.w(TAG, "Not auto downloading. inCall: " + NotInCallConstraint.isNotInConnectedCall() + " allowedType: " + allowedTypes.contains(MediaUtil.getDiscreteMimeType(contentType)));
}
return allowed;
} else {
return NotInCallConstraint.isNotInConnectedCall() && allowedTypes.contains("documents");
boolean allowed = NotInCallConstraint.isNotInConnectedCall() && allowedTypes.contains("documents");
if (!allowed) {
Log.w(TAG, "Not auto downloading. inCall: " + NotInCallConstraint.isNotInConnectedCall() + " allowedType: " + allowedTypes.contains("documents"));
}
return allowed;
}
}