Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2025-12-27 14:40:22 +00: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

6
app/src/main/java/org/thoughtcrime/securesms/logsubmit/LogSectionKeyPreferences.java
View File

@@ -8,6 +8,7 @@ import org.thoughtcrime.securesms.keyvalue.KeepMessagesDuration;
import org.thoughtcrime.securesms.keyvalue.SignalStore;
import org.thoughtcrime.securesms.recipients.Recipient;
import org.thoughtcrime.securesms.util.TextSecurePreferences;
import org.thoughtcrime.securesms.util.Util;
final class LogSectionKeyPreferences implements LogSection {
@@ -30,7 +31,10 @@ final class LogSectionKeyPreferences implements LogSection {
.append("self.isRegistered() : ").append(SignalStore.account().getAci() == null ? "false" : Recipient.self().isRegistered()).append("\n")
.append("Thread Trimming : ").append(getThreadTrimmingString()).append("\n")
.append("Censorship Setting : ").append(SignalStore.settings().getCensorshipCircumventionEnabled()).append("\n")
.append("Network Reachable : ").append(SignalStore.misc().isServiceReachableWithoutCircumvention()).append(", last checked: ").append(SignalStore.misc().getLastCensorshipServiceReachabilityCheckTime()).append("\n");
.append("Network Reachable : ").append(SignalStore.misc().isServiceReachableWithoutCircumvention()).append(", last checked: ").append(SignalStore.misc().getLastCensorshipServiceReachabilityCheckTime()).append("\n")
.append("Wifi Download : ").append(Util.join(TextSecurePreferences.getWifiMediaDownloadAllowed(context), ",")).append("\n")
.append("Roaming Download : ").append(Util.join(TextSecurePreferences.getRoamingMediaDownloadAllowed(context), ",")).append("\n")
.append("Mobile Download : ").append(Util.join(TextSecurePreferences.getMobileMediaDownloadAllowed(context), ",")).append("\n");
}
private static String getThreadTrimmingString() {

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;
}
}