From 151095827869aaa517fdfbd166f84592410abda0 Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Sat, 26 May 2018 10:17:38 +0200
Subject: [PATCH] do not show file id in check size button

---
 .../ui/adapter/MessageAdapter.java            | 70 ++++++++++---------
 1 file changed, 36 insertions(+), 34 deletions(-)

diff --git a/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java b/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java
index 8b77e8ba3d8ec4dd957cc71c9b579809f6628cbe..a838a75d594f122c4cc7324103fb297cee12a901 100644
--- a/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java
+++ b/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java
@@ -62,6 +62,7 @@ import eu.siacs.conversations.entities.DownloadableFile;
 import eu.siacs.conversations.entities.Message;
 import eu.siacs.conversations.entities.Message.FileParams;
 import eu.siacs.conversations.entities.Transferable;
+import eu.siacs.conversations.http.P1S3UrlStreamHandler;
 import eu.siacs.conversations.persistance.FileBackend;
 import eu.siacs.conversations.services.MessageArchiveService;
 import eu.siacs.conversations.services.NotificationService;
@@ -92,9 +93,6 @@ public class MessageAdapter extends ArrayAdapter<Message> implements CopyTextVie
 	private static final int RECEIVED = 1;
 	private static final int STATUS = 2;
 	private static final int DATE_SEPARATOR = 3;
-
-	private List<String> highlightedTerm = null;
-
 	private static final Linkify.TransformFilter WEBURL_TRANSFORM_FILTER = (matcher, url) -> {
 		if (url == null) {
 			return null;
@@ -106,40 +104,21 @@ public class MessageAdapter extends ArrayAdapter<Message> implements CopyTextVie
 			return "http://" + removeTrailingBracket(url);
 		}
 	};
-
-	private static String removeTrailingBracket(final String url) {
-		int numOpenBrackets = 0;
-		for (char c : url.toCharArray()) {
-			if (c == '(') {
-				++numOpenBrackets;
-			} else if (c == ')') {
-				--numOpenBrackets;
-			}
-		}
-		if (numOpenBrackets != 0 && url.charAt(url.length() - 1) == ')') {
-			return url.substring(0, url.length() - 1);
-		} else {
-			return url;
-		}
-	}
-
 	private static final Linkify.MatchFilter WEBURL_MATCH_FILTER = (cs, start, end) -> start < 1 || (cs.charAt(start - 1) != '@' && cs.charAt(start - 1) != '.' && !cs.subSequence(Math.max(0, start - 3), start).equals("://"));
-
 	private static final Linkify.MatchFilter XMPPURI_MATCH_FILTER = (s, start, end) -> {
 		XmppUri uri = new XmppUri(s.subSequence(start, end).toString());
 		return uri.isJidValid();
 	};
-
 	private final XmppActivity activity;
 	private final ListSelectionManager listSelectionManager = new ListSelectionManager();
 	private final AudioPlayer audioPlayer;
+	private List<String> highlightedTerm = null;
 	private DisplayMetrics metrics;
 	private OnContactPictureClicked mOnContactPictureClickedListener;
 	private OnContactPictureLongClicked mOnContactPictureLongClickedListener;
 	private boolean mIndicateReceived = false;
 	private boolean mUseGreenBackground = false;
 	private OnQuoteListener onQuoteListener;
-
 	public MessageAdapter(XmppActivity activity, List<Message> messages) {
 		super(activity, 0, messages);
 		this.audioPlayer = new AudioPlayer(this);
@@ -148,6 +127,22 @@ public class MessageAdapter extends ArrayAdapter<Message> implements CopyTextVie
 		updatePreferences();
 	}
 
+	private static String removeTrailingBracket(final String url) {
+		int numOpenBrackets = 0;
+		for (char c : url.toCharArray()) {
+			if (c == '(') {
+				++numOpenBrackets;
+			} else if (c == ')') {
+				--numOpenBrackets;
+			}
+		}
+		if (numOpenBrackets != 0 && url.charAt(url.length() - 1) == ')') {
+			return url.substring(0, url.length() - 1);
+		} else {
+			return url;
+		}
+	}
+
 	public static boolean cancelPotentialWork(Message message, ImageView imageView) {
 		final BitmapWorkerTask bitmapWorkerTask = getBitmapWorkerTask(imageView);
 
@@ -173,6 +168,12 @@ public class MessageAdapter extends ArrayAdapter<Message> implements CopyTextVie
 		return null;
 	}
 
+	private static void resetClickListener(View... views) {
+		for (View view : views) {
+			view.setOnClickListener(null);
+		}
+	}
+
 	public void flagScreenOn() {
 		activity.getWindow().addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
 	}
@@ -816,11 +817,18 @@ public class MessageAdapter extends ArrayAdapter<Message> implements CopyTextVie
 			} else if (message.treatAsDownloadable()) {
 				try {
 					URL url = new URL(message.getBody());
-					displayDownloadableMessage(viewHolder,
-							message,
-							activity.getString(R.string.check_x_filesize_on_host,
-									UIHelper.getFileDescriptionString(activity, message),
-									url.getHost()));
+					if (P1S3UrlStreamHandler.PROTOCOL_NAME.equalsIgnoreCase(url.getProtocol())) {
+						displayDownloadableMessage(viewHolder,
+								message,
+								activity.getString(R.string.check_x_filesize,
+										UIHelper.getFileDescriptionString(activity, message)));
+					} else {
+						displayDownloadableMessage(viewHolder,
+								message,
+								activity.getString(R.string.check_x_filesize_on_host,
+										UIHelper.getFileDescriptionString(activity, message),
+										url.getHost()));
+					}
 				} catch (Exception e) {
 					displayDownloadableMessage(viewHolder,
 							message,
@@ -862,12 +870,6 @@ public class MessageAdapter extends ArrayAdapter<Message> implements CopyTextVie
 		activity.showInstallPgpDialog();
 	}
 
-	private static void resetClickListener(View... views) {
-		for (View view : views) {
-			view.setOnClickListener(null);
-		}
-	}
-
 	@Override
 	public void notifyDataSetChanged() {
 		listSelectionManager.onBeforeNotifyDataSetChanged();