From 949d3280d37d0aa6f63f17479db0fd223b582e2e Mon Sep 17 00:00:00 2001 From: Daniel Gultsch Date: Thu, 9 Nov 2017 20:49:44 +0100 Subject: [PATCH] open links in new tabs --- .../ui/adapter/MessageAdapter.java | 2 + .../conversations/ui/text/FixedURLSpan.java | 78 +++++++++++++++++++ src/main/res/values/strings.xml | 1 + 3 files changed, 81 insertions(+) create mode 100644 src/main/java/eu/siacs/conversations/ui/text/FixedURLSpan.java 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 9930ad1b2..8a115a1b1 100644 --- a/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java +++ b/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java @@ -61,6 +61,7 @@ import eu.siacs.conversations.services.NotificationService; import eu.siacs.conversations.ui.ConversationActivity; import eu.siacs.conversations.ui.service.AudioPlayer; import eu.siacs.conversations.ui.text.DividerSpan; +import eu.siacs.conversations.ui.text.FixedURLSpan; import eu.siacs.conversations.ui.text.QuoteSpan; import eu.siacs.conversations.ui.widget.ClickableMovementMethod; import eu.siacs.conversations.ui.widget.CopyTextView; @@ -489,6 +490,7 @@ public class MessageAdapter extends ArrayAdapter implements CopyTextVie Linkify.addLinks(body, XMPP_PATTERN, "xmpp"); Linkify.addLinks(body, Patterns.AUTOLINK_WEB_URL, "http", WEBURL_MATCH_FILTER, WEBURL_TRANSFORM_FILTER); Linkify.addLinks(body, GeoHelper.GEO_URI, "geo"); + FixedURLSpan.fix(body); viewHolder.messageBody.setAutoLinkMask(0); viewHolder.messageBody.setText(body); viewHolder.messageBody.setTextIsSelectable(true); diff --git a/src/main/java/eu/siacs/conversations/ui/text/FixedURLSpan.java b/src/main/java/eu/siacs/conversations/ui/text/FixedURLSpan.java new file mode 100644 index 000000000..9b8c3e8b8 --- /dev/null +++ b/src/main/java/eu/siacs/conversations/ui/text/FixedURLSpan.java @@ -0,0 +1,78 @@ +/* + * Copyright (c) 2017, Daniel Gultsch All rights reserved. + * + * Redistribution and use in source and binary forms, with or without modification, + * are permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, this + * list of conditions and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright notice, + * this list of conditions and the following disclaimer in the documentation and/or + * other materials provided with the distribution. + * + * 3. Neither the name of the copyright holder nor the names of its contributors + * may be used to endorse or promote products derived from this software without + * specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR + * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON + * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +package eu.siacs.conversations.ui.text; + +import android.annotation.SuppressLint; +import android.content.ActivityNotFoundException; +import android.content.Context; +import android.content.Intent; +import android.net.Uri; +import android.os.Build; +import android.text.Editable; +import android.text.Spanned; +import android.text.style.URLSpan; +import android.view.View; +import android.widget.Toast; + +import eu.siacs.conversations.R; + + +@SuppressLint("ParcelCreator") +public class FixedURLSpan extends URLSpan { + + private FixedURLSpan(String url) { + super(url); + } + + public static void fix(final Editable editable) { + for (final URLSpan urlspan : editable.getSpans(0, editable.length() - 1, URLSpan.class)) { + final int start = editable.getSpanStart(urlspan); + final int end = editable.getSpanEnd(urlspan); + editable.removeSpan(urlspan); + editable.setSpan(new FixedURLSpan(urlspan.getURL()), start, end, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE); + } + } + + @Override + public void onClick(View widget) { + final Uri uri = Uri.parse(getURL()); + final Context context = widget.getContext(); + final Intent intent = new Intent(Intent.ACTION_VIEW, uri); + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) { + intent.setFlags(Intent.FLAG_ACTIVITY_NEW_DOCUMENT); + } + //intent.putExtra(Browser.EXTRA_APPLICATION_ID, context.getPackageName()); + try { + context.startActivity(intent); + } catch (ActivityNotFoundException e) { + Toast.makeText(context, R.string.no_application_found_to_open_link, Toast.LENGTH_SHORT).show(); + } + } +} diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index 3f0208641..c3f128f98 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -383,6 +383,7 @@ file transmission failed The file has been deleted No application found to open file + No application found to open link Could not verify fingerprint Manually verify Are you sure that you want to verify your contact’s OTR fingerprint?