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

Fix crash when draft text is null. 

Fixes #10913
fork-5.53.8
Fumiaki Yoshimatsu 2021-02-19 16:17:30 -05:00 zatwierdzone przez Cody Henthorne
rodzic 2e82ee0aaf
commit 687192f071
3 zmienionych plików z 10 dodań i 8 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

10
app/src/main/java/org/thoughtcrime/securesms/mediasend/MediaSendActivity.java
Wyświetl plik

@ -196,11 +196,11 @@ public class MediaSendActivity extends PassphraseRequiredActivity implements Med
return intent; return intent;
} }
public static Intent buildShareIntent(@NonNull Context context, public static Intent buildShareIntent(@NonNull Context context,
@NonNull List<Media> media, @NonNull List<Media> media,
@NonNull List<RecipientId> recipientIds, @NonNull List<RecipientId> recipientIds,
@NonNull CharSequence body, @Nullable CharSequence body,
@NonNull TransportOption transportOption) @NonNull TransportOption transportOption)
{ {
Intent intent = new Intent(context, MediaSendActivity.class); Intent intent = new Intent(context, MediaSendActivity.class);
intent.putParcelableArrayListExtra(KEY_MEDIA, new ArrayList<>(media)); intent.putParcelableArrayListExtra(KEY_MEDIA, new ArrayList<>(media));

2
app/src/main/java/org/thoughtcrime/securesms/sharing/MultiShareArgs.java
Wyświetl plik

@ -82,7 +82,7 @@ public final class MultiShareArgs implements Parcelable {
return dataType; return dataType;
} }
public String getDraftText() { public @Nullable String getDraftText() {
return draftText; return draftText;
} }

6
app/src/main/java/org/thoughtcrime/securesms/sharing/MultiShareSender.java
Wyświetl plik

@ -72,7 +72,9 @@ public final class MultiShareSender {
boolean forceSms = recipient.isForceSmsSelection() && transport.isSms(); boolean forceSms = recipient.isForceSmsSelection() && transport.isSms();
int subscriptionId = transport.getSimSubscriptionId().or(-1); int subscriptionId = transport.getSimSubscriptionId().or(-1);
long expiresIn = recipient.getExpireMessages() * 1000L; long expiresIn = recipient.getExpireMessages() * 1000L;
boolean needsSplit = !transport.isSms() && message.length() > transport.calculateCharacters(message).maxPrimaryMessageSize; boolean needsSplit = !transport.isSms() &&
message != null &&
message.length() > transport.calculateCharacters(message).maxPrimaryMessageSize;
boolean isMediaMessage = !multiShareArgs.getMedia().isEmpty() || boolean isMediaMessage = !multiShareArgs.getMedia().isEmpty() ||
(multiShareArgs.getDataUri() != null && multiShareArgs.getDataUri() != Uri.EMPTY) || (multiShareArgs.getDataUri() != null && multiShareArgs.getDataUri() != Uri.EMPTY) ||
multiShareArgs.getStickerLocator() != null || multiShareArgs.getStickerLocator() != null ||
@ -132,7 +134,7 @@ public final class MultiShareSender {
int subscriptionId) int subscriptionId)
{ {
String body = multiShareArgs.getDraftText(); String body = multiShareArgs.getDraftText();
if (transportOption.isType(TransportOption.Type.TEXTSECURE) && !forceSms) { if (transportOption.isType(TransportOption.Type.TEXTSECURE) && !forceSms && body != null) {
MessageUtil.SplitResult splitMessage = MessageUtil.getSplitMessage(context, body, transportOption.calculateCharacters(body).maxPrimaryMessageSize); MessageUtil.SplitResult splitMessage = MessageUtil.getSplitMessage(context, body, transportOption.calculateCharacters(body).maxPrimaryMessageSize);
body = splitMessage.getBody(); body = splitMessage.getBody();