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

Move all Pair usage to kotlin.Pair

Browse Source
This commit is contained in:
Greyson Parrelli
2025-11-10 12:03:18 -05:00
parent 66f136903f
commit 2147ad29fa
20 changed files with 72 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/org/thoughtcrime/securesms/util/BitmapUtil.java
View File

@@ -11,7 +11,7 @@ import android.graphics.YuvImage;
import android.graphics.drawable.BitmapDrawable;
import android.graphics.drawable.Drawable;
import android.os.Build;
import android.util.Pair;
import kotlin.Pair;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
@@ -271,7 +271,7 @@ public class BitmapUtil {
public static Pair<Integer, Integer> getDimensions(InputStream inputStream) throws BitmapDecodingException {
BitmapFactory.Options options = getImageDimensions(inputStream);
return new Pair<>(options.outWidth, options.outHeight);
return new Pair(options.outWidth, options.outHeight);
}
public static ByteArrayInputStream toCompressedJpeg(Bitmap bitmap) {

6
app/src/main/java/org/thoughtcrime/securesms/util/MediaUtil.java
View File

@@ -14,7 +14,7 @@ import android.media.ThumbnailUtils;
import android.net.Uri;
import android.provider.MediaStore;
import android.text.TextUtils;
import android.util.Pair;
import kotlin.Pair;
import android.webkit.MimeTypeMap;
import androidx.annotation.NonNull;
@@ -279,9 +279,9 @@ public class MediaUtil {
}
}
if (dimens == null) {
dimens = new Pair<>(0, 0);
dimens = new Pair(0, 0);
}
Log.d(TAG, "Dimensions for [" + uri + "] are " + dimens.first + " x " + dimens.second);
Log.d(TAG, "Dimensions for [" + uri + "] are " + dimens.getFirst() + " x " + dimens.getSecond());
return dimens;
}

2
app/src/main/java/org/thoughtcrime/securesms/util/storage/FileStorage.java
View File

@@ -94,7 +94,7 @@ public final class FileStorage {
private static @NonNull OutputStream getOutputStream(@NonNull Context context, File outputFile) throws IOException {
AttachmentSecret attachmentSecret = AttachmentSecretProvider.getInstance(context).getOrCreateAttachmentSecret();
return ModernEncryptingPartOutputStream.createFor(attachmentSecret, outputFile, true).second;
return ModernEncryptingPartOutputStream.createFor(attachmentSecret, outputFile, true).getSecond();
}
private static @NonNull InputStream getInputStream(@NonNull Context context, File inputFile) throws IOException {