mirror
/
Signal-Android
kopia lustrzana https://github.com/ryukoposting/Signal-Android
1
0
Forkuj 0
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność

Fix issue with sharing resizable media to MMS.

fork-5.53.8
Alex Hart 2021-05-10 13:56:54 -03:00 zatwierdzone przez GitHub
rodzic 1427de7c65
commit 69cd7eb449
Nie znaleziono w bazie danych klucza dla tego podpisu
ID klucza GPG: 4AEE18F83AFDEB23
1 zmienionych plików z 10 dodań i 17 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

27
app/src/main/java/org/thoughtcrime/securesms/sharing/ShareRepository.java
Wyświetl plik

@ -20,6 +20,8 @@ import org.signal.core.util.concurrent.SignalExecutors;
import org.signal.core.util.logging.Log;
import org.thoughtcrime.securesms.TransportOption;
import org.thoughtcrime.securesms.TransportOptions;
import org.thoughtcrime.securesms.attachments.Attachment;
import org.thoughtcrime.securesms.attachments.UriAttachment;
import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
import org.thoughtcrime.securesms.mediasend.Media;
import org.thoughtcrime.securesms.mediasend.MediaSendConstants;
@ -113,11 +115,15 @@ class ShareRepository {
// TODO Convert to multi-session after file drafts are fixed.
}
return ShareData.forIntentData(blobUri, mimeType, true, isMmsSupported(context, mimeType, size));
return ShareData.forIntentData(blobUri, mimeType, true, isMmsSupported(context, asUriAttachment(blobUri, mimeType, size)));
}
}
private boolean isMmsSupported(@NonNull Context context, @NonNull String mimeType, long size) {
private @NonNull UriAttachment asUriAttachment(@NonNull Uri uri, @NonNull String mimeType, long size) {
return new UriAttachment(uri, mimeType, -1, size, null, false, false, false, false, null, null, null, null, null);
}
private boolean isMmsSupported(@NonNull Context context, @NonNull Attachment attachment) {
boolean canReadPhoneState = ContextCompat.checkSelfPermission(context, Manifest.permission.READ_PHONE_STATE) == PackageManager.PERMISSION_GRANTED;
if (!TextSecurePreferences.isSmsEnabled(context) || !canReadPhoneState || !Util.isMmsCapable(context)) {
return false;
@ -127,20 +133,7 @@ class ShareRepository {
options.setDefaultTransport(TransportOption.Type.SMS);
MediaConstraints mmsConstraints = MediaConstraints.getMmsMediaConstraints(options.getSelectedTransport().getSimSubscriptionId().or(-1));
final boolean canMmsSupportFileSize;
if (MediaUtil.isGif(mimeType)) {
canMmsSupportFileSize = size <= mmsConstraints.getGifMaxSize(context);
} else if (MediaUtil.isVideo(mimeType)) {
canMmsSupportFileSize = size <= mmsConstraints.getVideoMaxSize(context);
} else if (MediaUtil.isImageType(mimeType)) {
canMmsSupportFileSize = size <= mmsConstraints.getImageMaxSize(context);
} else if (MediaUtil.isAudioType(mimeType)) {
canMmsSupportFileSize = size <= mmsConstraints.getAudioMaxSize(context);
} else {
canMmsSupportFileSize = size <= mmsConstraints.getDocumentMaxSize(context);
}
return canMmsSupportFileSize;
return mmsConstraints.isSatisfied(context, attachment) || mmsConstraints.canResize(attachment);
}
@WorkerThread
@ -202,7 +195,7 @@ class ShareRepository {
if (media.size() > 0) {
boolean isMmsSupported = Stream.of(media)
.allMatch(m -> isMmsSupported(context, m.getMimeType(), m.getSize()));
.allMatch(m -> isMmsSupported(context, asUriAttachment(m.getUri(), m.getMimeType(), m.getSize())));
return ShareData.forMedia(media, isMmsSupported);
} else {
return null;