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

Update libsignal-client to 0.14.0

Browse Source
This commit is contained in:
Greyson Parrelli
2022-03-14 15:49:46 -04:00
committed by Cody Henthorne
parent 749bbf428d
commit 057231b9c3
650 changed files with 2154 additions and 2384 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/src/main/java/org/thoughtcrime/securesms/mms/AttachmentManager.java
View File

@@ -69,13 +69,13 @@ import org.thoughtcrime.securesms.util.concurrent.ListenableFuture;
import org.thoughtcrime.securesms.util.concurrent.ListenableFuture.Listener;
import org.thoughtcrime.securesms.util.concurrent.SettableFuture;
import org.thoughtcrime.securesms.util.views.Stub;
import org.whispersystems.libsignal.util.guava.Optional;
import java.io.IOException;
import java.util.Collections;
import java.util.Iterator;
import java.util.LinkedList;
import java.util.List;
import java.util.Optional;
import java.util.concurrent.ExecutionException;
@@ -94,7 +94,7 @@ public class AttachmentManager {
private SignalMapView mapView;
private @NonNull List<Uri> garbage = new LinkedList<>();
private @NonNull Optional<Slide> slide = Optional.absent();
private @NonNull Optional<Slide> slide = Optional.empty();
private @Nullable Uri captureUri;
public AttachmentManager(@NonNull Activity activity, @NonNull AttachmentListener listener) {
@@ -143,7 +143,7 @@ public class AttachmentManager {
}
markGarbage(getSlideUri());
slide = Optional.absent();
slide = Optional.empty();
}
}
@@ -152,7 +152,7 @@ public class AttachmentManager {
cleanup(getSlideUri());
captureUri = null;
slide = Optional.absent();
slide = Optional.empty();
Iterator<Uri> iterator = garbage.listIterator();
@@ -465,7 +465,7 @@ public class AttachmentManager {
Intent intent = new Intent(context, MediaPreviewActivity.class);
intent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
intent.putExtra(MediaPreviewActivity.SIZE_EXTRA, slide.asAttachment().getSize());
intent.putExtra(MediaPreviewActivity.CAPTION_EXTRA, slide.getCaption().orNull());
intent.putExtra(MediaPreviewActivity.CAPTION_EXTRA, slide.getCaption().orElse(null));
intent.setDataAndType(slide.getUri(), slide.getContentType());
context.startActivity(intent);

2
app/src/main/java/org/thoughtcrime/securesms/mms/AttachmentStreamLocalUriFetcher.java
View File

@@ -8,12 +8,12 @@ import com.bumptech.glide.load.data.DataFetcher;
import org.signal.core.util.logging.Log;
import org.whispersystems.libsignal.InvalidMessageException;
import org.whispersystems.libsignal.util.guava.Optional;
import org.whispersystems.signalservice.api.crypto.AttachmentCipherInputStream;
import java.io.File;
import java.io.IOException;
import java.io.InputStream;
import java.util.Optional;
class AttachmentStreamLocalUriFetcher implements DataFetcher<InputStream> {

2
app/src/main/java/org/thoughtcrime/securesms/mms/AttachmentStreamUriLoader.java
View File

@@ -10,11 +10,11 @@ import com.bumptech.glide.load.model.ModelLoaderFactory;
import com.bumptech.glide.load.model.MultiModelLoaderFactory;
import org.thoughtcrime.securesms.mms.AttachmentStreamUriLoader.AttachmentModel;
import org.whispersystems.libsignal.util.guava.Optional;
import java.io.File;
import java.io.InputStream;
import java.security.MessageDigest;
import java.util.Optional;
public class AttachmentStreamUriLoader implements ModelLoader<AttachmentModel, InputStream> {

16
app/src/main/java/org/thoughtcrime/securesms/mms/IncomingMediaMessage.kt
View File

@@ -11,9 +11,9 @@ import org.thoughtcrime.securesms.groups.GroupId
import org.thoughtcrime.securesms.linkpreview.LinkPreview
import org.thoughtcrime.securesms.recipients.RecipientId
import org.thoughtcrime.securesms.util.GroupUtil
import org.whispersystems.libsignal.util.guava.Optional
import org.whispersystems.signalservice.api.messages.SignalServiceAttachment
import org.whispersystems.signalservice.api.messages.SignalServiceGroupContext
import java.util.Optional
class IncomingMediaMessage(
val from: RecipientId?,
@@ -62,7 +62,7 @@ class IncomingMediaMessage(
sharedContacts: Optional<List<Contact>>
) : this(
from = from,
groupId = groupId.orNull(),
groupId = groupId.orElse(null),
body = body,
isPushMessage = false,
sentTimeMillis = sentTimeMillis,
@@ -76,7 +76,7 @@ class IncomingMediaMessage(
isViewOnce = viewOnce,
serverGuid = null,
attachments = ArrayList(attachments),
sharedContacts = ArrayList(sharedContacts.or(emptyList()))
sharedContacts = ArrayList(sharedContacts.orElse(emptyList()))
)
constructor(
@@ -103,7 +103,7 @@ class IncomingMediaMessage(
) : this(
from = from,
groupId = if (group.isPresent) GroupUtil.idFromGroupContextOrThrow(group.get()) else null,
body = body.orNull(),
body = body.orElse(null),
isPushMessage = true,
storyType = storyType,
parentStoryId = parentStoryId,
@@ -113,13 +113,13 @@ class IncomingMediaMessage(
subscriptionId = subscriptionId,
expiresIn = expiresIn,
isExpirationUpdate = expirationUpdate,
quote = quote.orNull(),
quote = quote.orElse(null),
isUnidentified = unidentified,
isViewOnce = viewOnce,
serverGuid = serverGuid,
attachments = PointerAttachment.forPointers(attachments).apply { if (sticker.isPresent) add(sticker.get()) },
sharedContacts = sharedContacts.or(emptyList()),
linkPreviews = linkPreviews.or(emptyList()),
mentions = mentions.or(emptyList())
sharedContacts = sharedContacts.orElse(emptyList()),
linkPreviews = linkPreviews.orElse(emptyList()),
mentions = mentions.orElse(emptyList())
)
}

2
app/src/main/java/org/thoughtcrime/securesms/mms/LegacyMmsConnection.java
View File

@@ -47,7 +47,6 @@ import org.thoughtcrime.securesms.database.ApnDatabase;
import org.thoughtcrime.securesms.util.ServiceUtil;
import org.thoughtcrime.securesms.util.TelephonyUtil;
import org.thoughtcrime.securesms.util.TextSecurePreferences;
import org.whispersystems.libsignal.util.guava.Optional;
import java.io.BufferedInputStream;
import java.io.ByteArrayOutputStream;
@@ -60,6 +59,7 @@ import java.net.URL;
import java.util.HashSet;
import java.util.LinkedList;
import java.util.List;
import java.util.Optional;
import java.util.Set;
@SuppressWarnings("deprecation")

4
app/src/main/java/org/thoughtcrime/securesms/mms/LocationSlide.java
View File

@@ -6,7 +6,9 @@ import android.net.Uri;
import androidx.annotation.NonNull;
import org.thoughtcrime.securesms.components.location.SignalPlace;
import org.whispersystems.libsignal.util.guava.Optional;
import java.util.Optional;
public class LocationSlide extends ImageSlide {

1
app/src/main/java/org/thoughtcrime/securesms/mms/MessageGroupContext.java
View File

@@ -15,7 +15,6 @@ import org.thoughtcrime.securesms.recipients.Recipient;
import org.thoughtcrime.securesms.recipients.RecipientId;
import org.thoughtcrime.securesms.util.Base64;
import org.whispersystems.signalservice.api.groupsv2.DecryptedGroupUtil;
import org.whispersystems.signalservice.api.push.ACI;
import org.whispersystems.signalservice.api.push.ServiceId;
import org.whispersystems.signalservice.api.util.UuidUtil;
import org.whispersystems.signalservice.internal.push.SignalServiceProtos.GroupContext;

2
app/src/main/java/org/thoughtcrime/securesms/mms/MmsConfigManager.java
View File

@@ -11,10 +11,10 @@ import com.android.mms.service_alt.MmsConfig;
import org.thoughtcrime.securesms.util.dualsim.SubscriptionInfoCompat;
import org.thoughtcrime.securesms.util.dualsim.SubscriptionManagerCompat;
import org.whispersystems.libsignal.util.guava.Optional;
import java.util.HashMap;
import java.util.Map;
import java.util.Optional;
final class MmsConfigManager {

1
app/src/main/java/org/thoughtcrime/securesms/mms/OutgoingExpirationUpdateMessage.java
View File

@@ -1,6 +1,5 @@
package org.thoughtcrime.securesms.mms;
import org.thoughtcrime.securesms.attachments.Attachment;
import org.thoughtcrime.securesms.database.ThreadDatabase;
import org.thoughtcrime.securesms.database.model.StoryType;
import org.thoughtcrime.securesms.recipients.Recipient;

12
app/src/main/java/org/thoughtcrime/securesms/mms/Slide.java
View File

@@ -33,9 +33,9 @@ import org.thoughtcrime.securesms.database.AttachmentDatabase;
import org.thoughtcrime.securesms.stickers.StickerLocator;
import org.thoughtcrime.securesms.util.MediaUtil;
import org.thoughtcrime.securesms.util.Util;
import org.whispersystems.libsignal.util.guava.Optional;
import java.security.SecureRandom;
import java.util.Optional;
public abstract class Slide {
@@ -66,17 +66,17 @@ public abstract class Slide {
@NonNull
public Optional<String> getBody() {
return Optional.absent();
return Optional.empty();
}
@NonNull
public Optional<String> getCaption() {
return Optional.fromNullable(attachment.getCaption());
return Optional.ofNullable(attachment.getCaption());
}
@NonNull
public Optional<String> getFileName() {
return Optional.fromNullable(attachment.getFileName());
return Optional.ofNullable(attachment.getFileName());
}
@Nullable
@@ -195,7 +195,7 @@ public abstract class Slide {
boolean quote,
@Nullable AttachmentDatabase.TransformProperties transformProperties)
{
String resolvedType = Optional.fromNullable(MediaUtil.getMimeType(context, uri)).or(defaultMime);
String resolvedType = Optional.ofNullable(MediaUtil.getMimeType(context, uri)).orElse(defaultMime);
String fastPreflightId = String.valueOf(new SecureRandom().nextLong());
return new UriAttachment(uri,
resolvedType,
@@ -226,7 +226,7 @@ public abstract class Slide {
}
}
return Optional.fromNullable(MediaUtil.getExtension(context, getUri()));
return Optional.ofNullable(MediaUtil.getExtension(context, getUri()));
}
private static @NonNull String getFileType(Optional<String> fileName) {

2
app/src/main/java/org/thoughtcrime/securesms/mms/SlideDeck.java
View File

@@ -26,10 +26,10 @@ import com.annimon.stream.Stream;
import org.thoughtcrime.securesms.attachments.Attachment;
import org.thoughtcrime.securesms.util.MediaUtil;
import org.thoughtcrime.securesms.util.Util;
import org.whispersystems.libsignal.util.guava.Optional;
import java.util.LinkedList;
import java.util.List;
import java.util.Optional;
public class SlideDeck {