cache some information generated from body like isEmojiOnly, fileParams and isGeoUri

This commit is contained in:
Daniel Gultsch 2017-08-03 13:24:41 +02:00
parent 7bcf173866
commit c3cbb21133
6 changed files with 98 additions and 118 deletions

View file

@ -90,6 +90,11 @@ public class Message extends AbstractEntity {
private String axolotlFingerprint = null; private String axolotlFingerprint = null;
private String errorMessage = null; private String errorMessage = null;
private Boolean isGeoUri = null;
private Boolean isEmojisOnly = null;
private Boolean treatAsDownloadable = null;
private FileParams fileParams = null;
private Message(Conversation conversation) { private Message(Conversation conversation) {
this.conversation = conversation; this.conversation = conversation;
} }
@ -195,21 +200,21 @@ public class Message extends AbstractEntity {
public static Message createStatusMessage(Conversation conversation, String body) { public static Message createStatusMessage(Conversation conversation, String body) {
final Message message = new Message(conversation); final Message message = new Message(conversation);
message.setType(Message.TYPE_STATUS); message.setType(Message.TYPE_STATUS);
message.setBody(body); message.body = body;
return message; return message;
} }
public static Message createLoadMoreMessage(Conversation conversation) { public static Message createLoadMoreMessage(Conversation conversation) {
final Message message = new Message(conversation); final Message message = new Message(conversation);
message.setType(Message.TYPE_STATUS); message.setType(Message.TYPE_STATUS);
message.setBody("LOAD_MORE"); message.body = "LOAD_MORE";
return message; return message;
} }
public static Message createDateSeparator(Message message) { public static Message createDateSeparator(Message message) {
final Message separator = new Message(message.getConversation()); final Message separator = new Message(message.getConversation());
separator.setType(Message.TYPE_STATUS); separator.setType(Message.TYPE_STATUS);
separator.setBody(MessageAdapter.DATE_SEPARATOR_BODY); separator.body = MessageAdapter.DATE_SEPARATOR_BODY;
separator.setTime(message.getTimeSent()); separator.setTime(message.getTimeSent());
return separator; return separator;
} }
@ -279,11 +284,15 @@ public class Message extends AbstractEntity {
return body; return body;
} }
public void setBody(String body) { public synchronized void setBody(String body) {
if (body == null) { if (body == null) {
throw new Error("You should not set the message body to null"); throw new Error("You should not set the message body to null");
} }
this.body = body; this.body = body;
this.isGeoUri = null;
this.isEmojisOnly = null;
this.treatAsDownloadable = null;
this.fileParams = null;
} }
public String getErrorMessage() { public String getErrorMessage() {
@ -401,7 +410,8 @@ public class Message extends AbstractEntity {
return this.transferable; return this.transferable;
} }
public void setTransferable(Transferable transferable) { public synchronized void setTransferable(Transferable transferable) {
this.fileParams = null;
this.transferable = transferable; this.transferable = transferable;
} }
@ -496,8 +506,8 @@ public class Message extends AbstractEntity {
this.edited() == message.edited() && this.edited() == message.edited() &&
(message.getTimeSent() - this.getTimeSent()) <= (Config.MESSAGE_MERGE_WINDOW * 1000) && (message.getTimeSent() - this.getTimeSent()) <= (Config.MESSAGE_MERGE_WINDOW * 1000) &&
this.getBody().length() + message.getBody().length() <= Config.MAX_DISPLAY_MESSAGE_CHARS && this.getBody().length() + message.getBody().length() <= Config.MAX_DISPLAY_MESSAGE_CHARS &&
!GeoHelper.isGeoUri(message.getBody()) && !message.isGeoUri()&&
!GeoHelper.isGeoUri(this.body) && !this.isGeoUri() &&
!message.treatAsDownloadable() && !message.treatAsDownloadable() &&
!this.treatAsDownloadable() && !this.treatAsDownloadable() &&
!message.getBody().startsWith(ME_COMMAND) && !message.getBody().startsWith(ME_COMMAND) &&
@ -651,120 +661,92 @@ public class Message extends AbstractEntity {
} }
} }
public boolean treatAsDownloadable() { public synchronized boolean treatAsDownloadable() {
if (body.trim().contains(" ")) { if (treatAsDownloadable == null) {
return false; if (body.trim().contains(" ")) {
} treatAsDownloadable = false;
try { }
final URL url = new URL(body); try {
final String ref = url.getRef(); final URL url = new URL(body);
final String protocol = url.getProtocol(); final String ref = url.getRef();
final boolean encrypted = ref != null && ref.matches("([A-Fa-f0-9]{2}){48}"); final String protocol = url.getProtocol();
return (AesGcmURLStreamHandler.PROTOCOL_NAME.equalsIgnoreCase(protocol) && encrypted) final boolean encrypted = ref != null && ref.matches("([A-Fa-f0-9]{2}){48}");
|| (("http".equalsIgnoreCase(protocol) || "https".equalsIgnoreCase(protocol)) && (oob || encrypted)); treatAsDownloadable = (AesGcmURLStreamHandler.PROTOCOL_NAME.equalsIgnoreCase(protocol) && encrypted)
|| (("http".equalsIgnoreCase(protocol) || "https".equalsIgnoreCase(protocol)) && (oob || encrypted));
} catch (MalformedURLException e) { } catch (MalformedURLException e) {
return false; treatAsDownloadable = false;
}
} }
return treatAsDownloadable;
} }
public boolean bodyIsOnlyEmojis() { public synchronized boolean bodyIsOnlyEmojis() {
return EmojiManager.isOnlyEmojis(body.replaceAll("\\s","")); if (isEmojisOnly == null) {
isEmojisOnly = EmojiManager.isOnlyEmojis(body.replaceAll("\\s", ""));
}
return isEmojisOnly;
} }
public FileParams getFileParams() { public synchronized boolean isGeoUri() {
FileParams params = getLegacyFileParams(); if (isGeoUri == null) {
if (params != null) { isGeoUri = GeoHelper.GEO_URI.matcher(body).matches();
return params;
} }
params = new FileParams(); return isGeoUri;
if (this.transferable != null) { }
params.size = this.transferable.getFileSize();
} public synchronized FileParams getFileParams() {
if (body == null) { if (fileParams == null) {
return params; fileParams = new FileParams();
} if (this.transferable != null) {
String parts[] = body.split("\\|"); fileParams.size = this.transferable.getFileSize();
switch (parts.length) { }
case 1: String parts[] = body == null ? new String[0] : body.split("\\|");
try { switch (parts.length) {
params.size = Long.parseLong(parts[0]); case 1:
} catch (NumberFormatException e) {
try { try {
params.url = new URL(parts[0]); fileParams.size = Long.parseLong(parts[0]);
} catch (MalformedURLException e1) { } catch (NumberFormatException e) {
params.url = null; fileParams.url = parseUrl(parts[0]);
} }
} break;
break; case 4:
case 2: fileParams.width = parseInt(parts[2]);
case 4: fileParams.height = parseInt(parts[3]);
try { case 2:
params.url = new URL(parts[0]); fileParams.url = parseUrl(parts[0]);
} catch (MalformedURLException e1) { fileParams.size = parseLong(parts[1]);
params.url = null; break;
} case 3:
try { fileParams.size = parseLong(parts[0]);
params.size = Long.parseLong(parts[1]); fileParams.width = parseInt(parts[1]);
} catch (NumberFormatException e) { fileParams.height = parseInt(parts[2]);
params.size = 0; break;
} }
try {
params.width = Integer.parseInt(parts[2]);
} catch (NumberFormatException | ArrayIndexOutOfBoundsException e) {
params.width = 0;
}
try {
params.height = Integer.parseInt(parts[3]);
} catch (NumberFormatException | ArrayIndexOutOfBoundsException e) {
params.height = 0;
}
break;
case 3:
try {
params.size = Long.parseLong(parts[0]);
} catch (NumberFormatException e) {
params.size = 0;
}
try {
params.width = Integer.parseInt(parts[1]);
} catch (NumberFormatException e) {
params.width = 0;
}
try {
params.height = Integer.parseInt(parts[2]);
} catch (NumberFormatException e) {
params.height = 0;
}
break;
} }
return params; return fileParams;
} }
public FileParams getLegacyFileParams() { private static long parseLong(String value) {
FileParams params = new FileParams(); try {
if (body == null) { return Long.parseLong(value);
return params; } catch (NumberFormatException e) {
return 0;
} }
String parts[] = body.split(","); }
if (parts.length == 3) {
try { private static int parseInt(String value) {
params.size = Long.parseLong(parts[0]); try {
} catch (NumberFormatException e) { return Integer.parseInt(value);
return null; } catch (NumberFormatException e) {
} return 0;
try { }
params.width = Integer.parseInt(parts[1]); }
} catch (NumberFormatException e) {
return null; private static URL parseUrl(String value) {
} try {
try { return new URL(value);
params.height = Integer.parseInt(parts[2]); } catch (MalformedURLException e) {
} catch (NumberFormatException e) {
return null;
}
return params;
} else {
return null; return null;
} }
} }

View file

@ -531,7 +531,7 @@ public class NotificationService {
private Message getFirstLocationMessage(final Iterable<Message> messages) { private Message getFirstLocationMessage(final Iterable<Message> messages) {
for (final Message message : messages) { for (final Message message : messages) {
if (GeoHelper.isGeoUri(message.getBody())) { if (message.isGeoUri()) {
return message; return message;
} }
} }

View file

@ -618,7 +618,7 @@ public class ConversationFragment extends Fragment implements EditMessage.Keyboa
MenuItem cancelTransmission = menu.findItem(R.id.cancel_transmission); MenuItem cancelTransmission = menu.findItem(R.id.cancel_transmission);
MenuItem deleteFile = menu.findItem(R.id.delete_file); MenuItem deleteFile = menu.findItem(R.id.delete_file);
MenuItem showErrorMessage = menu.findItem(R.id.show_error_message); MenuItem showErrorMessage = menu.findItem(R.id.show_error_message);
if (!treatAsFile && !GeoHelper.isGeoUri(m.getBody()) && !m.treatAsDownloadable()) { if (!treatAsFile && !m.isGeoUri() && !m.treatAsDownloadable()) {
selectText.setVisible(ListSelectionManager.isSupported()); selectText.setVisible(ListSelectionManager.isSupported());
} }
if (m.getEncryption() == Message.ENCRYPTION_DECRYPTION_FAILED) { if (m.getEncryption() == Message.ENCRYPTION_DECRYPTION_FAILED) {
@ -636,7 +636,7 @@ public class ConversationFragment extends Fragment implements EditMessage.Keyboa
sendAgain.setVisible(true); sendAgain.setVisible(true);
} }
if (m.hasFileOnRemoteHost() if (m.hasFileOnRemoteHost()
|| GeoHelper.isGeoUri(m.getBody()) || m.isGeoUri()
|| m.treatAsDownloadable() || m.treatAsDownloadable()
|| (t != null && t instanceof HttpDownloadConnection)) { || (t != null && t instanceof HttpDownloadConnection)) {
copyUrl.setVisible(true); copyUrl.setVisible(true);
@ -713,7 +713,7 @@ public class ConversationFragment extends Fragment implements EditMessage.Keyboa
private void shareWith(Message message) { private void shareWith(Message message) {
Intent shareIntent = new Intent(); Intent shareIntent = new Intent();
shareIntent.setAction(Intent.ACTION_SEND); shareIntent.setAction(Intent.ACTION_SEND);
if (GeoHelper.isGeoUri(message.getBody())) { if (message.isGeoUri()) {
shareIntent.putExtra(Intent.EXTRA_TEXT, message.getBody()); shareIntent.putExtra(Intent.EXTRA_TEXT, message.getBody());
shareIntent.setType("text/plain"); shareIntent.setType("text/plain");
} else if (!message.isFileOrImage()) { } else if (!message.isFileOrImage()) {
@ -785,7 +785,7 @@ public class ConversationFragment extends Fragment implements EditMessage.Keyboa
private void copyUrl(Message message) { private void copyUrl(Message message) {
final String url; final String url;
final int resId; final int resId;
if (GeoHelper.isGeoUri(message.getBody())) { if (message.isGeoUri()) {
resId = R.string.location; resId = R.string.location;
url = message.getBody(); url = message.getBody();
} else if (message.hasFileOnRemoteHost()) { } else if (message.hasFileOnRemoteHost()) {

View file

@ -790,7 +790,7 @@ public class MessageAdapter extends ArrayAdapter<Message> implements CopyTextVie
} else if (message.getEncryption() == Message.ENCRYPTION_DECRYPTION_FAILED) { } else if (message.getEncryption() == Message.ENCRYPTION_DECRYPTION_FAILED) {
displayDecryptionFailed(viewHolder,darkBackground); displayDecryptionFailed(viewHolder,darkBackground);
} else { } else {
if (GeoHelper.isGeoUri(message.getBody())) { if (message.isGeoUri()) {
displayLocationMessage(viewHolder,message); displayLocationMessage(viewHolder,message);
} else if (message.bodyIsOnlyEmojis()) { } else if (message.bodyIsOnlyEmojis()) {
displayEmojiMessage(viewHolder, message.getBody().replaceAll("\\s","")); displayEmojiMessage(viewHolder, message.getBody().replaceAll("\\s",""));

View file

@ -16,9 +16,7 @@ import eu.siacs.conversations.entities.Message;
public class GeoHelper { public class GeoHelper {
public static Pattern GEO_URI = Pattern.compile("geo:([\\-0-9.]+),([\\-0-9.]+)(?:,([\\-0-9.]+))?(?:\\?(.*))?", Pattern.CASE_INSENSITIVE); public static Pattern GEO_URI = Pattern.compile("geo:([\\-0-9.]+),([\\-0-9.]+)(?:,([\\-0-9.]+))?(?:\\?(.*))?", Pattern.CASE_INSENSITIVE);
public static boolean isGeoUri(String body) {
return body != null && GEO_URI.matcher(body).matches();
}
public static ArrayList<Intent> createGeoIntentsFromMessage(Message message) { public static ArrayList<Intent> createGeoIntentsFromMessage(Message message) {
final ArrayList<Intent> intents = new ArrayList<>(); final ArrayList<Intent> intents = new ArrayList<>();

View file

@ -202,7 +202,7 @@ public class UIHelper {
if (body.startsWith(Message.ME_COMMAND)) { if (body.startsWith(Message.ME_COMMAND)) {
return new Pair<>(body.replaceAll("^" + Message.ME_COMMAND, return new Pair<>(body.replaceAll("^" + Message.ME_COMMAND,
UIHelper.getMessageDisplayName(message) + " "), false); UIHelper.getMessageDisplayName(message) + " "), false);
} else if (GeoHelper.isGeoUri(message.getBody())) { } else if (message.isGeoUri()) {
if (message.getStatus() == Message.STATUS_RECEIVED) { if (message.getStatus() == Message.STATUS_RECEIVED) {
return new Pair<>(context.getString(R.string.received_location), true); return new Pair<>(context.getString(R.string.received_location), true);
} else { } else {