diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/QuoteView.java b/app/src/main/java/org/thoughtcrime/securesms/components/QuoteView.java index 97813b4870..16d377470a 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/QuoteView.java +++ b/app/src/main/java/org/thoughtcrime/securesms/components/QuoteView.java @@ -195,7 +195,7 @@ public class QuoteView extends FrameLayout implements RecipientModifiedListener private void setQuoteAuthor(@NonNull Recipient author) { boolean outgoing = messageType != MESSAGE_TYPE_INCOMING; - boolean isOwnNumber = Util.isOwnNumber(getContext(), author.getAddress()); + boolean isOwnNumber = Util.isOwnNumber(getContext(), author.getAddress().serialize()); String quoteeDisplayName = author.toShortString(); diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/emoji/parsing/EmojiPageBitmap.java b/app/src/main/java/org/thoughtcrime/securesms/components/emoji/parsing/EmojiPageBitmap.java index 9855734d2a..763062e78c 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/emoji/parsing/EmojiPageBitmap.java +++ b/app/src/main/java/org/thoughtcrime/securesms/components/emoji/parsing/EmojiPageBitmap.java @@ -79,7 +79,7 @@ public class EmojiPageBitmap { InputStream assetStream = assetManager.open(model.getSprite()); BitmapFactory.Options options = new BitmapFactory.Options(); - if (Util.isLowMemory(context)) { + if (org.thoughtcrime.securesms.util.Util.isLowMemory(context)) { Log.i(TAG, "Low memory detected. Changing sample size."); options.inSampleSize = 2; scale = decodeScale * 2; diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationActivity.java b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationActivity.java index 3e1f7fdc49..0789f443af 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationActivity.java +++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationActivity.java @@ -1855,7 +1855,7 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity if (!TextSecurePreferences.isPushRegistered(this)) return false; if (recipient.isGroupRecipient()) return false; - return Util.isOwnNumber(this, recipient.getAddress()); + return Util.isOwnNumber(this, recipient.getAddress().serialize()); } private boolean isGroupConversation() { diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/GroupDatabase.java b/app/src/main/java/org/thoughtcrime/securesms/database/GroupDatabase.java index ea100d2a55..f17e6aca8c 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/database/GroupDatabase.java +++ b/app/src/main/java/org/thoughtcrime/securesms/database/GroupDatabase.java @@ -155,7 +155,7 @@ public class GroupDatabase extends Database implements LokiOpenGroupDatabaseProt List recipients = new LinkedList<>(); for (Address member : members) { - if (!includeSelf && Util.isOwnNumber(context, member)) + if (!includeSelf && Util.isOwnNumber(context, member.serialize())) continue; if (member.isContact()) { diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/MmsSmsDatabase.java b/app/src/main/java/org/thoughtcrime/securesms/database/MmsSmsDatabase.java index e585ea0623..0ddf142866 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/database/MmsSmsDatabase.java +++ b/app/src/main/java/org/thoughtcrime/securesms/database/MmsSmsDatabase.java @@ -96,8 +96,8 @@ public class MmsSmsDatabase extends Database { MessageRecord messageRecord; while ((messageRecord = reader.getNext()) != null) { - if ((Util.isOwnNumber(context, author) && messageRecord.isOutgoing()) || - (!Util.isOwnNumber(context, author) && messageRecord.getIndividualRecipient().getAddress().equals(author))) + if ((Util.isOwnNumber(context, author.serialize()) && messageRecord.isOutgoing()) || + (!Util.isOwnNumber(context, author.serialize()) && messageRecord.getIndividualRecipient().getAddress().equals(author))) { return messageRecord; } @@ -180,7 +180,7 @@ public class MmsSmsDatabase extends Database { try (Cursor cursor = queryTables(new String[]{ MmsSmsColumns.NORMALIZED_DATE_SENT, MmsSmsColumns.ADDRESS }, selection, order, null)) { String serializedAddress = address.serialize(); - boolean isOwnNumber = Util.isOwnNumber(context, address); + boolean isOwnNumber = Util.isOwnNumber(context, address.serialize()); while (cursor != null && cursor.moveToNext()) { boolean quoteIdMatches = cursor.getLong(0) == quoteId; @@ -200,7 +200,7 @@ public class MmsSmsDatabase extends Database { try (Cursor cursor = queryTables(new String[]{ MmsSmsColumns.NORMALIZED_DATE_RECEIVED, MmsSmsColumns.ADDRESS }, selection, order, null)) { String serializedAddress = address.serialize(); - boolean isOwnNumber = Util.isOwnNumber(context, address); + boolean isOwnNumber = Util.isOwnNumber(context, address.serialize()); while (cursor != null && cursor.moveToNext()) { boolean timestampMatches = cursor.getLong(0) == receivedTimestamp; diff --git a/app/src/main/java/org/thoughtcrime/securesms/giph/ui/GiphyAdapter.java b/app/src/main/java/org/thoughtcrime/securesms/giph/ui/GiphyAdapter.java index 3dcd959967..41298ec0bf 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/giph/ui/GiphyAdapter.java +++ b/app/src/main/java/org/thoughtcrime/securesms/giph/ui/GiphyAdapter.java @@ -156,7 +156,7 @@ class GiphyAdapter extends RecyclerView.Adapter { .load(new ChunkedImageUrl(image.getStillUrl(), image.getStillSize())) .diskCacheStrategy(DiskCacheStrategy.ALL); - if (Util.isLowMemory(context)) { + if (org.thoughtcrime.securesms.util.Util.isLowMemory(context)) { glideRequests.load(new ChunkedImageUrl(image.getStillUrl(), image.getStillSize())) .placeholder(new ColorDrawable(Util.getRandomElement(MaterialColor.values()).toConversationColor(context))) .diskCacheStrategy(DiskCacheStrategy.ALL) diff --git a/app/src/main/java/org/thoughtcrime/securesms/mms/PushMediaConstraints.java b/app/src/main/java/org/thoughtcrime/securesms/mms/PushMediaConstraints.java index 97f348d8cb..3d5ef96399 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/mms/PushMediaConstraints.java +++ b/app/src/main/java/org/thoughtcrime/securesms/mms/PushMediaConstraints.java @@ -2,7 +2,6 @@ package org.thoughtcrime.securesms.mms; import android.content.Context; -import org.session.libsession.utilities.Util; import org.session.libsignal.service.loki.api.fileserver.FileServerAPI; public class PushMediaConstraints extends MediaConstraints { @@ -12,7 +11,7 @@ public class PushMediaConstraints extends MediaConstraints { @Override public int getImageMaxWidth(Context context) { - return Util.isLowMemory(context) ? MAX_IMAGE_DIMEN_LOWMEM : MAX_IMAGE_DIMEN; + return org.thoughtcrime.securesms.util.Util.isLowMemory(context) ? MAX_IMAGE_DIMEN_LOWMEM : MAX_IMAGE_DIMEN; } @Override diff --git a/app/src/main/java/org/thoughtcrime/securesms/util/Util.java b/app/src/main/java/org/thoughtcrime/securesms/util/Util.java index 9415de0104..b21fbd17fa 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/util/Util.java +++ b/app/src/main/java/org/thoughtcrime/securesms/util/Util.java @@ -17,33 +17,28 @@ package org.thoughtcrime.securesms.util; import android.annotation.TargetApi; +import android.app.ActivityManager; import android.content.Context; import android.content.pm.PackageManager; import android.os.Build.VERSION; import android.os.Build.VERSION_CODES; -import android.os.Handler; -import android.os.Looper; -import androidx.annotation.NonNull; import android.text.TextUtils; -import org.session.libsession.utilities.TextSecurePreferences; import org.thoughtcrime.securesms.components.ComposeText; -import org.session.libsession.messaging.threads.Address; import org.thoughtcrime.securesms.mms.OutgoingLegacyMmsConnection; -import java.io.ByteArrayOutputStream; -import java.io.IOException; -import java.io.InputStream; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collection; -import java.util.LinkedList; -import java.util.List; - import network.loki.messenger.BuildConfig; public class Util { + @TargetApi(VERSION_CODES.KITKAT) + public static boolean isLowMemory(Context context) { + ActivityManager activityManager = (ActivityManager) context.getSystemService(Context.ACTIVITY_SERVICE); + + return (VERSION.SDK_INT >= VERSION_CODES.KITKAT && activityManager.isLowRamDevice()) || + activityManager.getLargeMemoryClass() <= 64; + } + public static boolean isEmpty(ComposeText value) { return value == null || value.getText() == null || TextUtils.isEmpty(value.getTextTrimmed()); } diff --git a/libsession/src/main/java/org/session/libsession/utilities/Util.kt b/libsession/src/main/java/org/session/libsession/utilities/Util.kt index 3672ae2553..4f52b9c46c 100644 --- a/libsession/src/main/java/org/session/libsession/utilities/Util.kt +++ b/libsession/src/main/java/org/session/libsession/utilities/Util.kt @@ -1,13 +1,9 @@ package org.session.libsession.utilities import android.annotation.SuppressLint -import android.annotation.TargetApi -import android.app.ActivityManager import android.content.Context import android.graphics.Typeface import android.net.Uri -import android.os.Build.VERSION -import android.os.Build.VERSION_CODES import android.os.Handler import android.os.Looper import android.provider.Telephony @@ -15,7 +11,6 @@ import android.text.Spannable import android.text.SpannableString import android.text.TextUtils import android.text.style.StyleSpan -import org.session.libsession.messaging.threads.Address import org.session.libsignal.utilities.logging.Log import org.session.libsignal.utilities.Base64 import java.io.* @@ -212,8 +207,8 @@ object Util { } @JvmStatic - fun isOwnNumber(context: Context, address: Address): Boolean { - return if (address.isGroup) false else TextSecurePreferences.getLocalNumber(context) == address.serialize() + fun isOwnNumber(context: Context, number: String): Boolean { + return TextSecurePreferences.getLocalNumber(context).equals(number) } @JvmStatic @@ -319,14 +314,6 @@ object Util { return collection == null || collection.isEmpty() } - @JvmStatic - @TargetApi(VERSION_CODES.KITKAT) - fun isLowMemory(context: Context): Boolean { - val activityManager = context.getSystemService(Context.ACTIVITY_SERVICE) as ActivityManager - return VERSION.SDK_INT >= VERSION_CODES.KITKAT && activityManager.isLowRamDevice || - activityManager.largeMemoryClass <= 64 - } - @JvmStatic fun getRandomElement(elements: Array): T { return elements[SecureRandom().nextInt(elements.size)]