forked from mirror/monocles_chat_clean
Allow long press to copy any link in a message (singpolyma)
This commit is contained in:
parent
52f8abc980
commit
70611be09e
5 changed files with 32 additions and 33 deletions
|
@ -89,6 +89,7 @@ dependencies {
|
||||||
implementation 'com.github.AppIntro:AppIntro:6.2.0'
|
implementation 'com.github.AppIntro:AppIntro:6.2.0'
|
||||||
implementation 'androidx.browser:browser:1.4.0'
|
implementation 'androidx.browser:browser:1.4.0'
|
||||||
implementation 'com.otaliastudios:transcoder:0.9.1' // 0.10.4 seems to be buggy
|
implementation 'com.otaliastudios:transcoder:0.9.1' // 0.10.4 seems to be buggy
|
||||||
|
implementation 'me.saket:better-link-movement-method:2.2.0'
|
||||||
implementation project(':libs:AXML')
|
implementation project(':libs:AXML')
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -1475,7 +1475,6 @@ public class ConversationFragment extends XmppFragment implements EditMessage.Ke
|
||||||
menu.setHeaderTitle(R.string.message_options);
|
menu.setHeaderTitle(R.string.message_options);
|
||||||
MenuItem openWith = menu.findItem(R.id.open_with);
|
MenuItem openWith = menu.findItem(R.id.open_with);
|
||||||
MenuItem copyMessage = menu.findItem(R.id.copy_message);
|
MenuItem copyMessage = menu.findItem(R.id.copy_message);
|
||||||
MenuItem copyLink = menu.findItem(R.id.copy_link);
|
|
||||||
MenuItem quoteMessage = menu.findItem(R.id.quote_message);
|
MenuItem quoteMessage = menu.findItem(R.id.quote_message);
|
||||||
MenuItem retryDecryption = menu.findItem(R.id.retry_decryption);
|
MenuItem retryDecryption = menu.findItem(R.id.retry_decryption);
|
||||||
MenuItem correctMessage = menu.findItem(R.id.correct_message);
|
MenuItem correctMessage = menu.findItem(R.id.correct_message);
|
||||||
|
@ -1495,13 +1494,6 @@ public class ConversationFragment extends XmppFragment implements EditMessage.Ke
|
||||||
deleteMessage.setVisible(true);
|
deleteMessage.setVisible(true);
|
||||||
if (!m.isFileOrImage() && !encrypted && !m.isGeoUri() && !m.treatAsDownloadable() && !unInitiatedButKnownSize && t == null && !m.isMessageDeleted()) {
|
if (!m.isFileOrImage() && !encrypted && !m.isGeoUri() && !m.treatAsDownloadable() && !unInitiatedButKnownSize && t == null && !m.isMessageDeleted()) {
|
||||||
copyMessage.setVisible(true);
|
copyMessage.setVisible(true);
|
||||||
String body = m.getMergedBody().toString();
|
|
||||||
if (ShareUtil.containsXmppUri(body)) {
|
|
||||||
copyLink.setTitle(R.string.copy_jabber_id);
|
|
||||||
copyLink.setVisible(true);
|
|
||||||
} else if (Patterns.AUTOLINK_WEB_URL.matcher(body).find()) {
|
|
||||||
copyLink.setVisible(true);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
if (!encrypted && !unInitiatedButKnownSize && t == null) {
|
if (!encrypted && !unInitiatedButKnownSize && t == null) {
|
||||||
quoteMessage.setVisible(!showError && QuoteHelper.isMessageQuoteable(m));
|
quoteMessage.setVisible(!showError && QuoteHelper.isMessageQuoteable(m));
|
||||||
|
@ -1593,9 +1585,6 @@ public class ConversationFragment extends XmppFragment implements EditMessage.Ke
|
||||||
case R.id.copy_message:
|
case R.id.copy_message:
|
||||||
ShareUtil.copyToClipboard(activity, selectedMessage);
|
ShareUtil.copyToClipboard(activity, selectedMessage);
|
||||||
return true;
|
return true;
|
||||||
case R.id.copy_link:
|
|
||||||
ShareUtil.copyLinkToClipboard(activity, selectedMessage);
|
|
||||||
return true;
|
|
||||||
case R.id.quote_message:
|
case R.id.quote_message:
|
||||||
if (conversation.getMode() == Conversation.MODE_MULTI) {
|
if (conversation.getMode() == Conversation.MODE_MULTI) {
|
||||||
quoteMessage(selectedMessage, user);
|
quoteMessage(selectedMessage, user);
|
||||||
|
|
|
@ -1,5 +1,7 @@
|
||||||
package eu.siacs.conversations.ui.adapter;
|
package eu.siacs.conversations.ui.adapter;
|
||||||
|
|
||||||
|
import eu.siacs.conversations.ui.widget.ClickableMovementMethod;
|
||||||
|
import me.saket.bettermovementmethod.BetterLinkMovementMethod;
|
||||||
import static android.view.ViewGroup.LayoutParams.WRAP_CONTENT;
|
import static android.view.ViewGroup.LayoutParams.WRAP_CONTENT;
|
||||||
import static eu.siacs.conversations.entities.Message.DELETED_MESSAGE_BODY;
|
import static eu.siacs.conversations.entities.Message.DELETED_MESSAGE_BODY;
|
||||||
import static eu.siacs.conversations.entities.Message.DELETED_MESSAGE_BODY_OLD;
|
import static eu.siacs.conversations.entities.Message.DELETED_MESSAGE_BODY_OLD;
|
||||||
|
@ -11,6 +13,7 @@ import static eu.siacs.conversations.ui.SettingsActivity.SHOW_MAPS_INSIDE;
|
||||||
import static eu.siacs.conversations.ui.util.MyLinkify.removeTrackingParameter;
|
import static eu.siacs.conversations.ui.util.MyLinkify.removeTrackingParameter;
|
||||||
import static eu.siacs.conversations.ui.util.MyLinkify.removeTrailingBracket;
|
import static eu.siacs.conversations.ui.util.MyLinkify.removeTrailingBracket;
|
||||||
import static eu.siacs.conversations.ui.util.MyLinkify.replaceYoutube;
|
import static eu.siacs.conversations.ui.util.MyLinkify.replaceYoutube;
|
||||||
|
import eu.siacs.conversations.ui.util.ShareUtil;
|
||||||
|
|
||||||
import android.Manifest;
|
import android.Manifest;
|
||||||
import android.annotation.SuppressLint;
|
import android.annotation.SuppressLint;
|
||||||
|
@ -35,6 +38,7 @@ import android.text.style.StyleSpan;
|
||||||
import android.util.Base64;
|
import android.util.Base64;
|
||||||
import android.util.DisplayMetrics;
|
import android.util.DisplayMetrics;
|
||||||
import android.util.Log;
|
import android.util.Log;
|
||||||
|
import android.view.MotionEvent;
|
||||||
import android.view.View;
|
import android.view.View;
|
||||||
import android.view.ViewGroup;
|
import android.view.ViewGroup;
|
||||||
import android.view.WindowManager;
|
import android.view.WindowManager;
|
||||||
|
@ -88,7 +92,6 @@ import eu.siacs.conversations.ui.util.MyLinkify;
|
||||||
import eu.siacs.conversations.ui.util.QuoteHelper;
|
import eu.siacs.conversations.ui.util.QuoteHelper;
|
||||||
import eu.siacs.conversations.ui.util.StyledAttributes;
|
import eu.siacs.conversations.ui.util.StyledAttributes;
|
||||||
import eu.siacs.conversations.ui.util.ViewUtil;
|
import eu.siacs.conversations.ui.util.ViewUtil;
|
||||||
import eu.siacs.conversations.ui.widget.ClickableMovementMethod;
|
|
||||||
import eu.siacs.conversations.ui.widget.RichLinkView;
|
import eu.siacs.conversations.ui.widget.RichLinkView;
|
||||||
import eu.siacs.conversations.utils.CryptoHelper;
|
import eu.siacs.conversations.utils.CryptoHelper;
|
||||||
import eu.siacs.conversations.utils.Emoticons;
|
import eu.siacs.conversations.utils.Emoticons;
|
||||||
|
@ -698,7 +701,13 @@ public class MessageAdapter extends ArrayAdapter<Message> {
|
||||||
MyLinkify.addLinks(body, message.getConversation().getAccount());
|
MyLinkify.addLinks(body, message.getConversation().getAccount());
|
||||||
viewHolder.messageBody.setText(body);
|
viewHolder.messageBody.setText(body);
|
||||||
viewHolder.messageBody.setAutoLinkMask(0);
|
viewHolder.messageBody.setAutoLinkMask(0);
|
||||||
viewHolder.messageBody.setMovementMethod(ClickableMovementMethod.getInstance());
|
BetterLinkMovementMethod method = BetterLinkMovementMethod.newInstance();
|
||||||
|
method.setOnLinkLongClickListener((tv, url) -> {
|
||||||
|
tv.dispatchTouchEvent(MotionEvent.obtain(0, 0, MotionEvent.ACTION_CANCEL, 0f, 0f, 0));
|
||||||
|
ShareUtil.copyLinkToClipboard(activity, url);
|
||||||
|
return true;
|
||||||
|
});
|
||||||
|
viewHolder.messageBody.setMovementMethod(method);
|
||||||
} else {
|
} else {
|
||||||
viewHolder.messageBody.setText("");
|
viewHolder.messageBody.setText("");
|
||||||
viewHolder.messageBody.setTextIsSelectable(false);
|
viewHolder.messageBody.setTextIsSelectable(false);
|
||||||
|
|
|
@ -47,6 +47,7 @@ import me.drakeet.support.toast.ToastCompat;
|
||||||
import android.net.Uri;
|
import android.net.Uri;
|
||||||
import android.text.SpannableStringBuilder;
|
import android.text.SpannableStringBuilder;
|
||||||
import android.text.style.URLSpan;
|
import android.text.style.URLSpan;
|
||||||
|
import android.widget.Toast;
|
||||||
|
|
||||||
public class ShareUtil {
|
public class ShareUtil {
|
||||||
|
|
||||||
|
@ -111,26 +112,29 @@ public class ShareUtil {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public static void copyLinkToClipboard(final XmppActivity activity, final String url) {
|
||||||
|
final Uri uri = Uri.parse(url);
|
||||||
|
if ("xmpp".equals(uri.getScheme())) {
|
||||||
|
try {
|
||||||
|
final Jid jid = new XmppUri(uri).getJid();
|
||||||
|
if (activity.copyTextToClipboard(jid.asBareJid().toString(), R.string.account_settings_jabber_id)) {
|
||||||
|
Toast.makeText(activity, R.string.jabber_id_copied_to_clipboard, Toast.LENGTH_SHORT).show();
|
||||||
|
}
|
||||||
|
} catch (final Exception e) { }
|
||||||
|
} else {
|
||||||
|
if (activity.copyTextToClipboard(url, R.string.web_address)) {
|
||||||
|
Toast.makeText(activity, R.string.url_copied_to_clipboard, Toast.LENGTH_SHORT).show();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
public static void copyLinkToClipboard(final XmppActivity activity, final Message message) {
|
public static void copyLinkToClipboard(final XmppActivity activity, final Message message) {
|
||||||
final SpannableStringBuilder body = message.getMergedBody();
|
final SpannableStringBuilder body = message.getMergedBody();
|
||||||
MyLinkify.addLinks(body, true);
|
MyLinkify.addLinks(body, true);
|
||||||
for (final URLSpan urlspan : body.getSpans(0, body.length() - 1, URLSpan.class)) {
|
for (final URLSpan urlspan : body.getSpans(0, body.length() - 1, URLSpan.class)) {
|
||||||
final Uri uri = Uri.parse(urlspan.getURL());
|
copyLinkToClipboard(activity, urlspan.getURL());
|
||||||
if ("xmpp".equals(uri.getScheme())) {
|
return;
|
||||||
try {
|
|
||||||
final Jid jid = new XmppUri(uri).getJid();
|
|
||||||
if (activity.copyTextToClipboard(jid.asBareJid().toString(), R.string.account_settings_jabber_id)) {
|
|
||||||
ToastCompat.makeText(activity, R.string.jabber_id_copied_to_clipboard, ToastCompat.LENGTH_SHORT).show();
|
|
||||||
}
|
|
||||||
return;
|
|
||||||
} catch (final Exception e) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
if (activity.copyTextToClipboard(urlspan.getURL(), R.string.web_address)) {
|
|
||||||
ToastCompat.makeText(activity, R.string.url_copied_to_clipboard, ToastCompat.LENGTH_SHORT).show();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -13,10 +13,6 @@
|
||||||
android:id="@+id/copy_message"
|
android:id="@+id/copy_message"
|
||||||
android:title="@string/copy_to_clipboard"
|
android:title="@string/copy_to_clipboard"
|
||||||
android:visible="false" />
|
android:visible="false" />
|
||||||
<item
|
|
||||||
android:id="@+id/copy_link"
|
|
||||||
android:title="@string/copy_link"
|
|
||||||
android:visible="false" />
|
|
||||||
<item
|
<item
|
||||||
android:id="@+id/retry_decryption"
|
android:id="@+id/retry_decryption"
|
||||||
android:title="@string/retry_decryption"
|
android:title="@string/retry_decryption"
|
||||||
|
|
Loading…
Reference in a new issue