TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-02-21 14:18:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

clean

Browse Source
This commit is contained in:
Ryan ZHAO 2021-02-04 10:28:51 +11:00
parent c07056f385
commit 6c857e203b
9 changed files with 21 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/org/thoughtcrime/securesms/components/QuoteView.java
View File

@ -195,7 +195,7 @@ public class QuoteView extends FrameLayout implements RecipientModifiedListener
private void setQuoteAuthor(@NonNull Recipient author) { private void setQuoteAuthor(@NonNull Recipient author) {
boolean outgoing = messageType != MESSAGE_TYPE_INCOMING; 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(); String quoteeDisplayName = author.toShortString();

2
app/src/main/java/org/thoughtcrime/securesms/components/emoji/parsing/EmojiPageBitmap.java
View File

@ -79,7 +79,7 @@ public class EmojiPageBitmap {
InputStream assetStream = assetManager.open(model.getSprite()); InputStream assetStream = assetManager.open(model.getSprite());
BitmapFactory.Options options = new BitmapFactory.Options(); 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."); Log.i(TAG, "Low memory detected. Changing sample size.");
options.inSampleSize = 2; options.inSampleSize = 2;
scale = decodeScale * 2; scale = decodeScale * 2;

2
app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationActivity.java
View File

@ -1855,7 +1855,7 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
if (!TextSecurePreferences.isPushRegistered(this)) return false; if (!TextSecurePreferences.isPushRegistered(this)) return false;
if (recipient.isGroupRecipient()) return false; if (recipient.isGroupRecipient()) return false;
return Util.isOwnNumber(this, recipient.getAddress()); return Util.isOwnNumber(this, recipient.getAddress().serialize());
} }
private boolean isGroupConversation() { private boolean isGroupConversation() {

2
app/src/main/java/org/thoughtcrime/securesms/database/GroupDatabase.java
View File

@ -155,7 +155,7 @@ public class GroupDatabase extends Database implements LokiOpenGroupDatabaseProt
List<Recipient> recipients = new LinkedList<>(); List<Recipient> recipients = new LinkedList<>();
for (Address member : members) { for (Address member : members) {
if (!includeSelf && Util.isOwnNumber(context, member)) if (!includeSelf && Util.isOwnNumber(context, member.serialize()))
continue; continue;
if (member.isContact()) { if (member.isContact()) {

8
app/src/main/java/org/thoughtcrime/securesms/database/MmsSmsDatabase.java
View File

@ -96,8 +96,8 @@ public class MmsSmsDatabase extends Database {
MessageRecord messageRecord; MessageRecord messageRecord;
while ((messageRecord = reader.getNext()) != null) { while ((messageRecord = reader.getNext()) != null) {
if ((Util.isOwnNumber(context, author) && messageRecord.isOutgoing()) || if ((Util.isOwnNumber(context, author.serialize()) && messageRecord.isOutgoing()) ||
(!Util.isOwnNumber(context, author) && messageRecord.getIndividualRecipient().getAddress().equals(author))) (!Util.isOwnNumber(context, author.serialize()) && messageRecord.getIndividualRecipient().getAddress().equals(author)))
{ {
return messageRecord; 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)) { try (Cursor cursor = queryTables(new String[]{ MmsSmsColumns.NORMALIZED_DATE_SENT, MmsSmsColumns.ADDRESS }, selection, order, null)) {
String serializedAddress = address.serialize(); String serializedAddress = address.serialize();
boolean isOwnNumber = Util.isOwnNumber(context, address); boolean isOwnNumber = Util.isOwnNumber(context, address.serialize());
while (cursor != null && cursor.moveToNext()) { while (cursor != null && cursor.moveToNext()) {
boolean quoteIdMatches = cursor.getLong(0) == quoteId; 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)) { try (Cursor cursor = queryTables(new String[]{ MmsSmsColumns.NORMALIZED_DATE_RECEIVED, MmsSmsColumns.ADDRESS }, selection, order, null)) {
String serializedAddress = address.serialize(); String serializedAddress = address.serialize();
boolean isOwnNumber = Util.isOwnNumber(context, address); boolean isOwnNumber = Util.isOwnNumber(context, address.serialize());
while (cursor != null && cursor.moveToNext()) { while (cursor != null && cursor.moveToNext()) {
boolean timestampMatches = cursor.getLong(0) == receivedTimestamp; boolean timestampMatches = cursor.getLong(0) == receivedTimestamp;

2
app/src/main/java/org/thoughtcrime/securesms/giph/ui/GiphyAdapter.java
View File

@ -156,7 +156,7 @@ class GiphyAdapter extends RecyclerView.Adapter<GiphyAdapter.GiphyViewHolder> {
.load(new ChunkedImageUrl(image.getStillUrl(), image.getStillSize())) .load(new ChunkedImageUrl(image.getStillUrl(), image.getStillSize()))
.diskCacheStrategy(DiskCacheStrategy.ALL); .diskCacheStrategy(DiskCacheStrategy.ALL);
if (Util.isLowMemory(context)) { if (org.thoughtcrime.securesms.util.Util.isLowMemory(context)) {
glideRequests.load(new ChunkedImageUrl(image.getStillUrl(), image.getStillSize())) glideRequests.load(new ChunkedImageUrl(image.getStillUrl(), image.getStillSize()))
.placeholder(new ColorDrawable(Util.getRandomElement(MaterialColor.values()).toConversationColor(context))) .placeholder(new ColorDrawable(Util.getRandomElement(MaterialColor.values()).toConversationColor(context)))
.diskCacheStrategy(DiskCacheStrategy.ALL) .diskCacheStrategy(DiskCacheStrategy.ALL)

3
app/src/main/java/org/thoughtcrime/securesms/mms/PushMediaConstraints.java
View File

@ -2,7 +2,6 @@ package org.thoughtcrime.securesms.mms;
import android.content.Context; import android.content.Context;
import org.session.libsession.utilities.Util;
import org.session.libsignal.service.loki.api.fileserver.FileServerAPI; import org.session.libsignal.service.loki.api.fileserver.FileServerAPI;
public class PushMediaConstraints extends MediaConstraints { public class PushMediaConstraints extends MediaConstraints {
@ -12,7 +11,7 @@ public class PushMediaConstraints extends MediaConstraints {
@Override @Override
public int getImageMaxWidth(Context context) { 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 @Override

23
app/src/main/java/org/thoughtcrime/securesms/util/Util.java
View File

@ -17,33 +17,28 @@
package org.thoughtcrime.securesms.util; package org.thoughtcrime.securesms.util;
import android.annotation.TargetApi; import android.annotation.TargetApi;
import android.app.ActivityManager;
import android.content.Context; import android.content.Context;
import android.content.pm.PackageManager; import android.content.pm.PackageManager;
import android.os.Build.VERSION; import android.os.Build.VERSION;
import android.os.Build.VERSION_CODES; import android.os.Build.VERSION_CODES;
import android.os.Handler;
import android.os.Looper;
import androidx.annotation.NonNull;
import android.text.TextUtils; import android.text.TextUtils;
import org.session.libsession.utilities.TextSecurePreferences;
import org.thoughtcrime.securesms.components.ComposeText; import org.thoughtcrime.securesms.components.ComposeText;
import org.session.libsession.messaging.threads.Address;
import org.thoughtcrime.securesms.mms.OutgoingLegacyMmsConnection; 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; import network.loki.messenger.BuildConfig;
public class Util { 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) { public static boolean isEmpty(ComposeText value) {
return value == null || value.getText() == null || TextUtils.isEmpty(value.getTextTrimmed()); return value == null || value.getText() == null || TextUtils.isEmpty(value.getTextTrimmed());
} }

17
libsession/src/main/java/org/session/libsession/utilities/Util.kt
View File

@ -1,13 +1,9 @@
package org.session.libsession.utilities package org.session.libsession.utilities
import android.annotation.SuppressLint import android.annotation.SuppressLint
import android.annotation.TargetApi
import android.app.ActivityManager
import android.content.Context import android.content.Context
import android.graphics.Typeface import android.graphics.Typeface
import android.net.Uri import android.net.Uri
import android.os.Build.VERSION
import android.os.Build.VERSION_CODES
import android.os.Handler import android.os.Handler
import android.os.Looper import android.os.Looper
import android.provider.Telephony import android.provider.Telephony
@ -15,7 +11,6 @@ import android.text.Spannable
import android.text.SpannableString import android.text.SpannableString
import android.text.TextUtils import android.text.TextUtils
import android.text.style.StyleSpan import android.text.style.StyleSpan
import org.session.libsession.messaging.threads.Address
import org.session.libsignal.utilities.logging.Log import org.session.libsignal.utilities.logging.Log
import org.session.libsignal.utilities.Base64 import org.session.libsignal.utilities.Base64
import java.io.* import java.io.*
@ -212,8 +207,8 @@ object Util {
} }
@JvmStatic @JvmStatic
fun isOwnNumber(context: Context, address: Address): Boolean { fun isOwnNumber(context: Context, number: String): Boolean {
return if (address.isGroup) false else TextSecurePreferences.getLocalNumber(context) == address.serialize() return TextSecurePreferences.getLocalNumber(context).equals(number)
} }
@JvmStatic @JvmStatic
@ -319,14 +314,6 @@ object Util {
return collection == null || collection.isEmpty() 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 @JvmStatic
fun <T> getRandomElement(elements: Array<T>): T { fun <T> getRandomElement(elements: Array<T>): T {
return elements[SecureRandom().nextInt(elements.size)] return elements[SecureRandom().nextInt(elements.size)]