Update libsignal-client to 0.14.0

2026-04-26 11:51:10 +01:00 · 2022-03-14 15:49:46 -04:00
parent 749bbf428d
commit 057231b9c3
650 changed files with 2154 additions and 2384 deletions
--- a/app/src/main/java/org/thoughtcrime/securesms/components/ConversationItemFooter.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/ConversationItemFooter.java
@@ -41,10 +41,10 @@ import org.thoughtcrime.securesms.util.SignalLocalMetrics;
 import org.thoughtcrime.securesms.util.ViewUtil;
 import org.thoughtcrime.securesms.util.dualsim.SubscriptionInfoCompat;
 import org.thoughtcrime.securesms.util.dualsim.SubscriptionManagerCompat;
-import org.whispersystems.libsignal.util.guava.Optional;

 import java.util.Locale;
 import java.util.Objects;
+import java.util.Optional;
 import java.util.concurrent.TimeUnit;

 public class ConversationItemFooter extends ConstraintLayout {
--- a/app/src/main/java/org/thoughtcrime/securesms/components/ConversationTypingView.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/ConversationTypingView.java
@@ -11,15 +11,11 @@ import androidx.annotation.Nullable;
 import androidx.constraintlayout.widget.ConstraintLayout;
 import androidx.core.content.ContextCompat;

-import com.annimon.stream.Stream;
-
 import org.thoughtcrime.securesms.R;
 import org.thoughtcrime.securesms.badges.BadgeImageView;
 import org.thoughtcrime.securesms.mms.GlideRequests;
 import org.thoughtcrime.securesms.recipients.Recipient;
-import org.whispersystems.libsignal.util.Pair;

-import java.util.LinkedList;
 import java.util.List;

 public class ConversationTypingView extends ConstraintLayout {
--- a/app/src/main/java/org/thoughtcrime/securesms/components/CornerMask.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/CornerMask.java
@@ -7,11 +7,9 @@ import android.graphics.Path;
 import android.graphics.PorterDuff;
 import android.graphics.PorterDuffXfermode;
 import android.graphics.RectF;
-import android.graphics.drawable.shapes.RoundRectShape;
 import android.view.View;

 import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;

 public class CornerMask {

--- a/app/src/main/java/org/thoughtcrime/securesms/components/DocumentView.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/DocumentView.java
@@ -27,6 +27,7 @@ import org.thoughtcrime.securesms.events.PartProgressEvent;
 import org.thoughtcrime.securesms.mms.Slide;
 import org.thoughtcrime.securesms.mms.SlideClickListener;
 import org.thoughtcrime.securesms.util.Util;
+import org.whispersystems.signalservice.api.util.OptionalUtil;

 public class DocumentView extends FrameLayout {

@@ -105,11 +106,11 @@ public class DocumentView extends FrameLayout {

    this.documentSlide = documentSlide;

-    this.fileName.setText(documentSlide.getFileName()
-                                       .or(documentSlide.getCaption())
-                                       .or(getContext().getString(R.string.DocumentView_unnamed_file)));
+    this.fileName.setText(OptionalUtil.or(documentSlide.getFileName(),
+                                          documentSlide.getCaption())
+                                      .orElse(getContext().getString(R.string.DocumentView_unnamed_file)));
    this.fileSize.setText(Util.getPrettyFileSize(documentSlide.getFileSize()));
-    this.document.setText(documentSlide.getFileType(getContext()).or("").toLowerCase());
+    this.document.setText(documentSlide.getFileType(getContext()).orElse("").toLowerCase());
    this.setOnClickListener(new OpenClickedListener(documentSlide));
  }

--- a/app/src/main/java/org/thoughtcrime/securesms/components/FullScreenDialogFragment.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/FullScreenDialogFragment.java
@@ -13,7 +13,6 @@ import androidx.appcompat.widget.Toolbar;
 import androidx.fragment.app.DialogFragment;

 import org.thoughtcrime.securesms.R;
-import org.thoughtcrime.securesms.util.ThemeUtil;

 /**
 * Base dialog fragment for rendering as a full screen dialog with animation
--- a/app/src/main/java/org/thoughtcrime/securesms/components/InputPanel.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/InputPanel.java
@@ -53,11 +53,11 @@ import org.thoughtcrime.securesms.util.ViewUtil;
 import org.thoughtcrime.securesms.util.concurrent.AssertedSuccessListener;
 import org.thoughtcrime.securesms.util.concurrent.ListenableFuture;
 import org.thoughtcrime.securesms.util.concurrent.SettableFuture;
-import org.whispersystems.libsignal.util.guava.Optional;

 import java.util.Arrays;
 import java.util.List;
 import java.util.Objects;
+import java.util.Optional;
 import java.util.concurrent.TimeUnit;

 public class InputPanel extends LinearLayout
@@ -258,7 +258,7 @@ public class InputPanel extends LinearLayout
    if (quoteView.getQuoteId() > 0 && quoteView.getVisibility() == View.VISIBLE) {
      return Optional.of(new QuoteModel(quoteView.getQuoteId(), quoteView.getAuthor().getId(), quoteView.getBody().toString(), false, quoteView.getAttachments(), quoteView.getMentions()));
    } else {
-      return Optional.absent();
+      return Optional.empty();
    }
  }

--- a/app/src/main/java/org/thoughtcrime/securesms/components/InsetAwareConstraintLayout.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/InsetAwareConstraintLayout.java
@@ -13,7 +13,6 @@ import androidx.annotation.Nullable;
 import androidx.constraintlayout.widget.ConstraintLayout;
 import androidx.constraintlayout.widget.Guideline;

-import org.signal.glide.Log;
 import org.thoughtcrime.securesms.R;
 import org.thoughtcrime.securesms.util.ViewUtil;

--- a/app/src/main/java/org/thoughtcrime/securesms/components/LinkPreviewView.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/LinkPreviewView.java
@@ -22,13 +22,13 @@ import org.thoughtcrime.securesms.mms.GlideRequests;
 import org.thoughtcrime.securesms.mms.ImageSlide;
 import org.thoughtcrime.securesms.mms.SlidesClickedListener;
 import org.thoughtcrime.securesms.util.Util;
+import org.thoughtcrime.securesms.util.ViewUtil;

 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
 import java.util.Locale;

 import okhttp3.HttpUrl;
-import org.thoughtcrime.securesms.util.ViewUtil;

 /**
 * The view shown in the compose box or conversation that represents the state of the link preview.
--- a/app/src/main/java/org/thoughtcrime/securesms/components/MicrophoneRecorderView.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/MicrophoneRecorderView.java
@@ -19,7 +19,6 @@ import android.widget.ImageView;

 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
-import androidx.core.view.ViewCompat;

 import org.thoughtcrime.securesms.R;
 import org.thoughtcrime.securesms.permissions.Permissions;
--- a/app/src/main/java/org/thoughtcrime/securesms/components/QuoteView.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/QuoteView.java
@@ -351,7 +351,7 @@ public class QuoteView extends FrameLayout implements RecipientForeverObserver {
    } else if (documentSlide != null){
      thumbnailView.setVisibility(GONE);
      attachmentContainerView.setVisibility(VISIBLE);
-      attachmentNameView.setText(documentSlide.getFileName().or(""));
+      attachmentNameView.setText(documentSlide.getFileName().orElse(""));
    } else {
      thumbnailView.setVisibility(GONE);
      attachmentContainerView.setVisibility(GONE);
--- a/app/src/main/java/org/thoughtcrime/securesms/components/RatingManager.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/RatingManager.java
@@ -1,11 +1,7 @@
 package org.thoughtcrime.securesms.components;

-import android.content.ActivityNotFoundException;
 import android.content.Context;
 import android.content.DialogInterface;
-import android.content.Intent;
-import android.net.Uri;
-import android.widget.Toast;

 import androidx.appcompat.app.AlertDialog;

--- a/app/src/main/java/org/thoughtcrime/securesms/components/SendButton.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/SendButton.java
@@ -12,7 +12,9 @@ import org.thoughtcrime.securesms.TransportOptions;
 import org.thoughtcrime.securesms.TransportOptions.OnTransportChangedListener;
 import org.thoughtcrime.securesms.TransportOptionsPopup;
 import org.thoughtcrime.securesms.util.ViewUtil;
-import org.whispersystems.libsignal.util.guava.Optional;
+
+import java.util.Optional;
+

 public class SendButton extends AppCompatImageButton
    implements TransportOptions.OnTransportChangedListener,
@@ -22,7 +24,7 @@ public class SendButton extends AppCompatImageButton

  private final TransportOptions transportOptions;

-  private Optional<TransportOptionsPopup> transportOptionsPopup = Optional.absent();
+  private Optional<TransportOptionsPopup> transportOptionsPopup = Optional.empty();

  @SuppressWarnings("unused")
  public SendButton(Context context) {
--- a/app/src/main/java/org/thoughtcrime/securesms/components/ThumbnailView.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/ThumbnailView.java
@@ -40,11 +40,11 @@ import org.thoughtcrime.securesms.util.Util;
 import org.thoughtcrime.securesms.util.ViewUtil;
 import org.thoughtcrime.securesms.util.concurrent.ListenableFuture;
 import org.thoughtcrime.securesms.util.concurrent.SettableFuture;
-import org.whispersystems.libsignal.util.guava.Optional;

 import java.util.Collections;
 import java.util.Locale;
 import java.util.Objects;
+import java.util.Optional;
 import java.util.concurrent.ExecutionException;

 import static com.bumptech.glide.load.resource.drawable.DrawableTransitionOptions.withCrossFade;
@@ -69,7 +69,7 @@ public class ThumbnailView extends FrameLayout {
  private final int[] bounds        = new int[4];
  private final int[] measureDimens = new int[2];

-  private Optional<TransferControlView> transferControls       = Optional.absent();
+  private Optional<TransferControlView> transferControls       = Optional.empty();
  private SlideClickListener            thumbnailClickListener = null;
  private SlidesClickedListener         downloadClickListener  = null;
  private Slide                         slide                  = null;
--- a/app/src/main/java/org/thoughtcrime/securesms/components/camera/CameraView.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/camera/CameraView.java
@@ -42,12 +42,12 @@ import org.thoughtcrime.securesms.R;
 import org.thoughtcrime.securesms.util.BitmapUtil;
 import org.thoughtcrime.securesms.util.TextSecurePreferences;
 import org.thoughtcrime.securesms.util.Util;
-import org.whispersystems.libsignal.util.guava.Optional;

 import java.io.IOException;
 import java.util.Collections;
 import java.util.LinkedList;
 import java.util.List;
+import java.util.Optional;

@SuppressWarnings("deprecation")
 public class CameraView extends ViewGroup {
@@ -56,8 +56,8 @@ public class CameraView extends ViewGroup {
  private final CameraSurfaceView   surface;
  private final OnOrientationChange onOrientationChange;

-  private volatile Optional<Camera> camera             = Optional.absent();
-  private volatile int              cameraId           = CameraInfo.CAMERA_FACING_BACK;
+  private volatile Optional<Camera> camera   = Optional.empty();
+  private volatile int              cameraId = CameraInfo.CAMERA_FACING_BACK;
  private volatile int              displayOrientation = -1;

  private @NonNull  State                    state = State.PAUSED;
@@ -104,7 +104,7 @@ public class CameraView extends ViewGroup {
      Void onRunBackground() {
        try {
          long openStartMillis = System.currentTimeMillis();
-          camera = Optional.fromNullable(Camera.open(cameraId));
+          camera = Optional.ofNullable(Camera.open(cameraId));
          Log.i(TAG, "camera.open() -> " + (System.currentTimeMillis() - openStartMillis) + "ms");
          synchronized (CameraView.this) {
            CameraView.this.notifyAll();
@@ -145,7 +145,7 @@ public class CameraView extends ViewGroup {
      @Override
      protected void onPreMain() {
        cameraToDestroy = camera;
-        camera = Optional.absent();
+        camera = Optional.empty();
      }

      @Override
--- a/app/src/main/java/org/thoughtcrime/securesms/components/emoji/EmojiEditText.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/emoji/EmojiEditText.java
@@ -14,7 +14,6 @@ import org.signal.core.util.logging.Log;
 import org.thoughtcrime.securesms.R;
 import org.thoughtcrime.securesms.components.emoji.EmojiProvider.EmojiDrawable;
 import org.thoughtcrime.securesms.keyvalue.SignalStore;
-import org.thoughtcrime.securesms.util.TextSecurePreferences;


 public class EmojiEditText extends AppCompatEditText {
--- a/app/src/main/java/org/thoughtcrime/securesms/components/emoji/EmojiPageView.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/emoji/EmojiPageView.java
@@ -21,8 +21,8 @@ import org.thoughtcrime.securesms.components.emoji.EmojiPageViewGridAdapter.Emoj
 import org.thoughtcrime.securesms.components.emoji.EmojiPageViewGridAdapter.VariationSelectorListener;
 import org.thoughtcrime.securesms.util.ContextUtil;
 import org.thoughtcrime.securesms.util.DrawableUtil;
-import org.thoughtcrime.securesms.util.adapter.mapping.MappingModel;
 import org.thoughtcrime.securesms.util.ViewUtil;
+import org.thoughtcrime.securesms.util.adapter.mapping.MappingModel;

 import java.util.List;
 import java.util.Optional;
--- a/app/src/main/java/org/thoughtcrime/securesms/components/emoji/EmojiProvider.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/emoji/EmojiProvider.java
@@ -19,7 +19,6 @@ import org.signal.core.util.ThreadUtil;
 import org.signal.core.util.logging.Log;
 import org.thoughtcrime.securesms.components.emoji.parsing.EmojiDrawInfo;
 import org.thoughtcrime.securesms.components.emoji.parsing.EmojiParser;
-import org.thoughtcrime.securesms.emoji.EmojiFiles;
 import org.thoughtcrime.securesms.emoji.EmojiPageCache;
 import org.thoughtcrime.securesms.emoji.EmojiSource;
 import org.thoughtcrime.securesms.emoji.JumboEmoji;
--- a/app/src/main/java/org/thoughtcrime/securesms/components/emoji/EmojiTextView.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/emoji/EmojiTextView.java
@@ -33,9 +33,9 @@ import org.thoughtcrime.securesms.components.mention.MentionRendererDelegate;
 import org.thoughtcrime.securesms.emoji.JumboEmoji;
 import org.thoughtcrime.securesms.keyvalue.SignalStore;
 import org.thoughtcrime.securesms.util.Util;
-import org.whispersystems.libsignal.util.guava.Optional;

 import java.util.List;
+import java.util.Optional;

 import kotlin.Unit;

@@ -141,7 +141,7 @@ public class EmojiTextView extends AppCompatTextView {
    previousTransformationMethod = getTransformationMethod();

    if (useSystemEmoji || candidates == null || candidates.size() == 0) {
-      super.setText(new SpannableStringBuilder(Optional.fromNullable(text).or("")), BufferType.SPANNABLE);
+      super.setText(new SpannableStringBuilder(Optional.ofNullable(text).orElse("")), BufferType.SPANNABLE);
    } else {
      CharSequence emojified = EmojiProvider.emojify(candidates, text, this, isJumbomoji || forceJumboEmoji);
      super.setText(new SpannableStringBuilder(emojified), BufferType.SPANNABLE);
@@ -291,7 +291,7 @@ public class EmojiTextView extends AppCompatTextView {
        SpannableStringBuilder newContent = new SpannableStringBuilder();
        newContent.append(getText().subSequence(0, overflowStart))
                  .append(ellipsized.subSequence(0, ellipsized.length()))
-                  .append(Optional.fromNullable(overflowText).or(""));
+                  .append(Optional.ofNullable(overflowText).orElse(""));

        EmojiParser.CandidateList newCandidates = isInEditMode() ? null : EmojiProvider.getCandidates(newContent);
        CharSequence              emojified     = EmojiProvider.emojify(newCandidates, newContent, this, isJumbomoji || forceJumboEmoji);
--- a/app/src/main/java/org/thoughtcrime/securesms/components/emoji/MediaKeyboard.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/emoji/MediaKeyboard.java
@@ -10,8 +10,6 @@ import android.widget.FrameLayout;

 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
-import androidx.core.content.ContextCompat;
-import androidx.core.content.res.TypedArrayUtils;
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentActivity;
 import androidx.fragment.app.FragmentManager;
@@ -23,7 +21,6 @@ import org.thoughtcrime.securesms.components.InputAwareLayout.InputView;
 import org.thoughtcrime.securesms.keyboard.KeyboardPage;
 import org.thoughtcrime.securesms.keyboard.KeyboardPagerFragment;
 import org.thoughtcrime.securesms.keyboard.emoji.search.EmojiSearchFragment;
-import org.thoughtcrime.securesms.util.ThemeUtil;
 import org.thoughtcrime.securesms.util.ThemedFragment;

 public class MediaKeyboard extends FrameLayout implements InputView {
--- a/app/src/main/java/org/thoughtcrime/securesms/components/emoji/SimpleEmojiTextView.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/emoji/SimpleEmojiTextView.kt
@@ -6,7 +6,7 @@ import android.util.AttributeSet
 import androidx.appcompat.widget.AppCompatTextView
 import org.thoughtcrime.securesms.keyvalue.SignalStore
 import org.thoughtcrime.securesms.util.ThrottledDebouncer
-import org.whispersystems.libsignal.util.guava.Optional
+import java.util.Optional

 open class SimpleEmojiTextView @JvmOverloads constructor(
  context: Context,
@@ -21,7 +21,7 @@ open class SimpleEmojiTextView @JvmOverloads constructor(
    bufferType = type
    val candidates = if (isInEditMode) null else EmojiProvider.getCandidates(text)
    if (SignalStore.settings().isPreferSystemEmoji || candidates == null || candidates.size() == 0) {
-      super.setText(Optional.fromNullable(text).or(""), type)
+      super.setText(Optional.ofNullable(text).orElse(""), type)
    } else {
      val startDrawableSize: Int = compoundDrawables[0]?.let { it.intrinsicWidth + compoundDrawablePadding } ?: 0
      val endDrawableSize: Int = compoundDrawables[1]?.let { it.intrinsicWidth + compoundDrawablePadding } ?: 0
--- a/app/src/main/java/org/thoughtcrime/securesms/components/identity/UnverifiedSendDialog.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/identity/UnverifiedSendDialog.java
@@ -2,7 +2,6 @@ package org.thoughtcrime.securesms.components.identity;

 import android.content.Context;
 import android.content.DialogInterface;
-import android.os.AsyncTask;

 import androidx.annotation.NonNull;
 import androidx.appcompat.app.AlertDialog;
--- a/app/src/main/java/org/thoughtcrime/securesms/components/reminder/DozeReminder.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/reminder/DozeReminder.java
@@ -8,7 +8,6 @@ import android.net.Uri;
 import android.os.Build;
 import android.os.PowerManager;
 import android.provider.Settings;
-import android.view.View;

 import androidx.annotation.NonNull;
 import androidx.annotation.RequiresApi;
--- a/app/src/main/java/org/thoughtcrime/securesms/components/reminder/PushRegistrationReminder.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/reminder/PushRegistrationReminder.java
@@ -5,7 +5,6 @@ import android.content.Context;
 import org.thoughtcrime.securesms.R;
 import org.thoughtcrime.securesms.keyvalue.SignalStore;
 import org.thoughtcrime.securesms.registration.RegistrationNavigationActivity;
-import org.thoughtcrime.securesms.util.TextSecurePreferences;

 public class PushRegistrationReminder extends Reminder {

--- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/AppSettingsViewModel.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/AppSettingsViewModel.kt
@@ -25,7 +25,7 @@ class AppSettingsViewModel(private val subscriptionsRepository: SubscriptionsRep
  val state: LiveData<AppSettingsState> = store.stateLiveData

  init {
-    store.update(unreadPaymentsLiveData) { payments, state -> state.copy(unreadPaymentsCount = payments.transform { it.unreadCount }.or(0)) }
+    store.update(unreadPaymentsLiveData) { payments, state -> state.copy(unreadPaymentsCount = payments.map { it.unreadCount }.orElse(0)) }
    store.update(selfLiveData) { self, state -> state.copy(self = self) }
  }

--- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/notifications/profiles/SelectRecipientsFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/notifications/profiles/SelectRecipientsFragment.kt
@@ -21,7 +21,7 @@ import org.thoughtcrime.securesms.util.CircularProgressButtonUtil
 import org.thoughtcrime.securesms.util.LifecycleDisposable
 import org.thoughtcrime.securesms.util.Util
 import org.thoughtcrime.securesms.util.ViewUtil
-import org.whispersystems.libsignal.util.guava.Optional
+import java.util.Optional
 import java.util.function.Consumer

 /**
--- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/privacy/advanced/AdvancedPrivacySettingsRepository.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/privacy/advanced/AdvancedPrivacySettingsRepository.kt
@@ -12,9 +12,9 @@ import org.thoughtcrime.securesms.keyvalue.SignalStore
 import org.thoughtcrime.securesms.recipients.Recipient
 import org.thoughtcrime.securesms.storage.StorageSyncHelper
 import org.thoughtcrime.securesms.util.TextSecurePreferences
-import org.whispersystems.libsignal.util.guava.Optional
 import org.whispersystems.signalservice.api.push.exceptions.AuthorizationFailedException
 import java.io.IOException
+import java.util.Optional
 import java.util.concurrent.ExecutionException

 private val TAG = Log.tag(AdvancedPrivacySettingsRepository::class.java)
@@ -26,7 +26,7 @@ class AdvancedPrivacySettingsRepository(private val context: Context) {
      val result = try {
        val accountManager = ApplicationDependencies.getSignalServiceAccountManager()
        try {
-          accountManager.setGcmId(Optional.absent())
+          accountManager.setGcmId(Optional.empty())
        } catch (e: AuthorizationFailedException) {
          Log.w(TAG, e)
        }
--- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/DonationPaymentRepository.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/DonationPaymentRepository.kt
@@ -214,7 +214,7 @@ class DonationPaymentRepository(activity: Activity) : StripeApi.PaymentIntentFet
              Log.w(TAG, "Failed to set user subscription to level $subscriptionLevel with response code ${it.status}", it.applicationError.get(), true)
              SignalStore.donationsValues().clearLevelOperations()
            } else {
-              Log.w(TAG, "Failed to set user subscription to level $subscriptionLevel", it.executionError.orNull(), true)
+              Log.w(TAG, "Failed to set user subscription to level $subscriptionLevel", it.executionError.orElse(null), true)
            }

            LevelUpdate.updateProcessingState(false)
--- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/manage/ManageDonationsViewModel.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/manage/ManageDonationsViewModel.kt
@@ -48,7 +48,7 @@ class ManageDonationsViewModel(
    disposables += SubscriptionRedemptionJobWatcher.watch().subscribeBy { jobStateOptional ->
      store.update { manageDonationsState ->
        manageDonationsState.copy(
-          subscriptionRedemptionState = jobStateOptional.transform { jobState ->
+          subscriptionRedemptionState = jobStateOptional.map { jobState ->
            when (jobState) {
              JobTracker.JobState.PENDING -> ManageDonationsState.SubscriptionRedemptionState.IN_PROGRESS
              JobTracker.JobState.RUNNING -> ManageDonationsState.SubscriptionRedemptionState.IN_PROGRESS
@@ -56,7 +56,7 @@ class ManageDonationsViewModel(
              JobTracker.JobState.FAILURE -> ManageDonationsState.SubscriptionRedemptionState.FAILED
              JobTracker.JobState.IGNORED -> ManageDonationsState.SubscriptionRedemptionState.NONE
            }
-          }.or(ManageDonationsState.SubscriptionRedemptionState.NONE)
+          }.orElse(ManageDonationsState.SubscriptionRedemptionState.NONE)
        )
      }
    }
--- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/manage/SubscriptionRedemptionJobWatcher.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/manage/SubscriptionRedemptionJobWatcher.kt
@@ -6,7 +6,7 @@ import org.thoughtcrime.securesms.jobmanager.JobTracker
 import org.thoughtcrime.securesms.jobs.DonationReceiptRedemptionJob
 import org.thoughtcrime.securesms.jobs.SubscriptionReceiptRequestResponseJob
 import org.thoughtcrime.securesms.keyvalue.SignalStore
-import org.whispersystems.libsignal.util.guava.Optional
+import java.util.Optional
 import java.util.concurrent.TimeUnit

 /**
@@ -27,7 +27,7 @@ object SubscriptionRedemptionJobWatcher {
    if (jobState == null && SignalStore.donationsValues().getSubscriptionRedemptionFailed()) {
      Optional.of(JobTracker.JobState.FAILURE)
    } else {
-      Optional.fromNullable(jobState)
+      Optional.ofNullable(jobState)
    }
  }.distinctUntilChanged()
 }
--- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/conversation/ConversationSettingsRepository.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/conversation/ConversationSettingsRepository.kt
@@ -28,8 +28,8 @@ import org.thoughtcrime.securesms.recipients.Recipient
 import org.thoughtcrime.securesms.recipients.RecipientId
 import org.thoughtcrime.securesms.recipients.RecipientUtil
 import org.thoughtcrime.securesms.util.FeatureFlags
-import org.whispersystems.libsignal.util.guava.Optional
 import java.io.IOException
+import java.util.Optional
 import java.util.concurrent.TimeUnit

 private val TAG = Log.tag(ConversationSettingsRepository::class.java)
@@ -41,7 +41,7 @@ class ConversationSettingsRepository(
  @WorkerThread
  fun getThreadMedia(threadId: Long): Optional<Cursor> {
    return if (threadId <= 0) {
-      Optional.absent()
+      Optional.empty()
    } else {
      Optional.of(SignalDatabase.media.getGalleryMediaForThread(threadId, MediaDatabase.Sorting.Newest))
    }
@@ -77,7 +77,7 @@ class ConversationSettingsRepository(
  fun getIdentity(recipientId: RecipientId, consumer: (IdentityRecord?) -> Unit) {
    SignalExecutors.BOUNDED.execute {
      if (SignalStore.account().aci != null && SignalStore.account().pni != null) {
-        consumer(ApplicationDependencies.getProtocolStore().aci().identities().getIdentityRecord(recipientId).orNull())
+        consumer(ApplicationDependencies.getProtocolStore().aci().identities().getIdentityRecord(recipientId).orElse(null))
      } else {
        consumer(null)
      }
--- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/conversation/ConversationSettingsViewModel.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/conversation/ConversationSettingsViewModel.kt
@@ -25,7 +25,7 @@ import org.thoughtcrime.securesms.util.FeatureFlags
 import org.thoughtcrime.securesms.util.SingleLiveEvent
 import org.thoughtcrime.securesms.util.livedata.LiveDataUtil
 import org.thoughtcrime.securesms.util.livedata.Store
-import org.whispersystems.libsignal.util.guava.Optional
+import java.util.Optional

 sealed class ConversationSettingsViewModel(
  private val repository: ConversationSettingsRepository,
@@ -65,22 +65,22 @@ sealed class ConversationSettingsViewModel(
          openedMediaCursors.add(cursor.get())
        }

-        val ids: List<Long> = cursor.transform<List<Long>> {
+        val ids: List<Long> = cursor.map<List<Long>> {
          val result = mutableListOf<Long>()
          while (it.moveToNext()) {
            result.add(CursorUtil.requireLong(it, AttachmentDatabase.ROW_ID))
          }
          result
-        }.or(listOf())
+        }.orElse(listOf())

        state.copy(
-          sharedMedia = cursor.orNull(),
+          sharedMedia = cursor.orElse(null),
          sharedMediaIds = ids,
          sharedMediaLoaded = true,
          displayInternalRecipientDetails = repository.isInternalRecipientDetailsEnabled()
        )
      } else {
-        cursor.orNull().ensureClosed()
+        cursor.orElse(null).ensureClosed()
        state.copy(sharedMedia = null)
      }
    }
--- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/conversation/InternalConversationSettingsFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/conversation/InternalConversationSettingsFragment.kt
@@ -60,7 +60,7 @@ class InternalConversationSettingsFragment : DSLSettingsFragment(
      )

      if (!recipient.isGroup) {
-        val serviceId = recipient.serviceId.transform(ServiceId::toString).or("null")
+        val serviceId = recipient.serviceId.map(ServiceId::toString).orElse("null")
        longClickPref(
          title = DSLSettingsText.from("ServiceId"),
          summary = DSLSettingsText.from(serviceId),
@@ -226,7 +226,7 @@ class InternalConversationSettingsFragment : DSLSettingsFragment(

      SignalExecutors.BOUNDED.execute {
        val threadId: Long? = SignalDatabase.threads.getThreadIdFor(recipientId)
-        val groupId: GroupId? = SignalDatabase.groups.getGroup(recipientId).transform { it.id }.orNull()
+        val groupId: GroupId? = SignalDatabase.groups.getGroup(recipientId).map { it.id }.orElse(null)
        store.update { state -> state.copy(threadId = threadId, groupId = groupId) }
      }
    }
--- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/conversation/preferences/BioTextPreference.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/conversation/preferences/BioTextPreference.kt
@@ -56,7 +56,7 @@ object BioTextPreference {
      }
    }

-    override fun getSubhead2Text(): String? = recipient.e164.transform(PhoneNumberFormatter::prettyPrint).orNull()
+    override fun getSubhead2Text(): String? = recipient.e164.map(PhoneNumberFormatter::prettyPrint).orElse(null)

    override fun areContentsTheSame(newItem: RecipientModel): Boolean {
      return super.areContentsTheSame(newItem) && newItem.recipient.hasSameContent(recipient)
--- a/app/src/main/java/org/thoughtcrime/securesms/components/voice/VoiceNoteDraft.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/voice/VoiceNoteDraft.kt
@@ -2,7 +2,6 @@ package org.thoughtcrime.securesms.components.voice

 import android.net.Uri
 import org.thoughtcrime.securesms.database.DraftDatabase
-import java.lang.IllegalArgumentException

 private const val SIZE = "size"

--- a/app/src/main/java/org/thoughtcrime/securesms/components/voice/VoiceNoteMediaController.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/voice/VoiceNoteMediaController.java
@@ -1,7 +1,6 @@
 package org.thoughtcrime.securesms.components.voice;

 import android.content.ComponentName;
-import android.media.AudioManager;
 import android.net.Uri;
 import android.os.Bundle;
 import android.os.Handler;
@@ -15,7 +14,6 @@ import android.support.v4.media.session.PlaybackStateCompat;

 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
-import androidx.appcompat.app.AppCompatActivity;
 import androidx.fragment.app.FragmentActivity;
 import androidx.lifecycle.DefaultLifecycleObserver;
 import androidx.lifecycle.LifecycleOwner;
@@ -29,9 +27,9 @@ import org.thoughtcrime.securesms.recipients.Recipient;
 import org.thoughtcrime.securesms.recipients.RecipientId;
 import org.thoughtcrime.securesms.util.DefaultValueLiveData;
 import org.thoughtcrime.securesms.util.livedata.LiveDataUtil;
-import org.whispersystems.libsignal.util.guava.Optional;

 import java.util.Objects;
+import java.util.Optional;

 /**
 * Encapsulates control of voice note playback from an Activity component.
@@ -92,7 +90,7 @@ public class VoiceNoteMediaController implements DefaultLifecycleObserver {
                playbackState.getTrackDuration(),
                playbackState.getSpeed())));
      } else {
-        return new DefaultValueLiveData<>(Optional.absent());
+        return new DefaultValueLiveData<>(Optional.empty());
      }
    });
  }
--- a/app/src/main/java/org/thoughtcrime/securesms/components/voice/VoiceNotePlaybackParameters.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/voice/VoiceNotePlaybackParameters.java
@@ -7,8 +7,6 @@ import androidx.annotation.NonNull;

 import com.google.android.exoplayer2.PlaybackParameters;

-import org.signal.core.util.logging.Log;
-
 public final class VoiceNotePlaybackParameters {

  private final MediaSessionCompat mediaSessionCompat;
--- a/app/src/main/java/org/thoughtcrime/securesms/components/webrtc/AudioOutputAdapter.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/webrtc/AudioOutputAdapter.java
@@ -5,7 +5,6 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.CompoundButton;
 import android.widget.RadioButton;
-import android.widget.TextView;

 import androidx.annotation.CallSuper;
 import androidx.annotation.NonNull;
--- a/app/src/main/java/org/thoughtcrime/securesms/components/webrtc/CallParticipantListUpdate.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/webrtc/CallParticipantListUpdate.java
@@ -8,7 +8,6 @@ import com.annimon.stream.Stream;

 import org.thoughtcrime.securesms.events.CallParticipant;
 import org.thoughtcrime.securesms.events.CallParticipantId;
-import org.thoughtcrime.securesms.recipients.Recipient;
 import org.thoughtcrime.securesms.util.SetUtil;

 import java.util.List;
--- a/app/src/main/java/org/thoughtcrime/securesms/components/webrtc/CallParticipantsLayout.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/webrtc/CallParticipantsLayout.java
@@ -16,7 +16,6 @@ import org.thoughtcrime.securesms.R;
 import org.thoughtcrime.securesms.events.CallParticipant;
 import org.thoughtcrime.securesms.util.Util;
 import org.thoughtcrime.securesms.util.ViewUtil;
-import org.webrtc.RendererCommon;

 import java.util.Collections;
 import java.util.List;
--- a/app/src/main/java/org/thoughtcrime/securesms/components/webrtc/CallParticipantsState.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/webrtc/CallParticipantsState.kt
@@ -130,7 +130,7 @@ data class CallParticipantsState(
      ringerRecipient.hasServiceId()
    ) {
      val ringerName = ringerRecipient.getShortDisplayName(context)
-      val membersWithoutYouOrRinger: List<GroupMemberEntry.FullMember> = groupMembers.filterNot { it.member.isSelf || ringerRecipient.requireServiceId() == it.member.serviceId.orNull() }
+      val membersWithoutYouOrRinger: List<GroupMemberEntry.FullMember> = groupMembers.filterNot { it.member.isSelf || ringerRecipient.requireServiceId() == it.member.serviceId.orElse(null) }

      return when (membersWithoutYouOrRinger.size) {
        0 -> context.getString(R.string.WebRtcCallView__s_is_calling_you, ringerName)
--- a/app/src/main/java/org/thoughtcrime/securesms/components/webrtc/EglBaseWrapper.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/webrtc/EglBaseWrapper.kt
@@ -2,6 +2,7 @@ package org.thoughtcrime.securesms.components.webrtc

 import android.opengl.EGL14
 import org.signal.core.util.logging.Log
+import org.thoughtcrime.securesms.components.webrtc.EglBaseWrapper.Companion.acquireEglBase
 import org.webrtc.EglBase
 import org.webrtc.EglBase10
 import org.webrtc.EglBase14
--- a/app/src/main/java/org/thoughtcrime/securesms/components/webrtc/participantslist/CallParticipantViewHolder.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/webrtc/participantslist/CallParticipantViewHolder.java
@@ -1,7 +1,6 @@
 package org.thoughtcrime.securesms.components.webrtc.participantslist;

 import android.view.View;
-import android.widget.ImageView;

 import androidx.annotation.NonNull;

--- a/app/src/main/java/org/thoughtcrime/securesms/components/webrtc/participantslist/CallParticipantViewState.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/webrtc/participantslist/CallParticipantViewState.java
@@ -5,7 +5,6 @@ import android.view.View;

 import androidx.annotation.NonNull;

-import org.thoughtcrime.securesms.R;
 import org.thoughtcrime.securesms.events.CallParticipant;
 import org.thoughtcrime.securesms.recipients.Recipient;
 import org.thoughtcrime.securesms.util.viewholders.RecipientMappingModel;