mirrors
/
Fedilab
mirror of https://codeberg.org/tom79/Fedilab
1
0
Fork 1
Code Issues Packages Projects Releases Wiki Activity

Fix issue #308

Browse Source
pull/320/head
Thomas 2 years ago
parent 7b0ce01fa3
commit a23b788229
1 changed files with 32 additions and 27 deletions
Show Stats Download Patch File Download Diff File

59
app/src/main/java/app/fedilab/android/helper/SpannableHelper.java
Unescape View File

@ -120,7 +120,7 @@ public class SpannableHelper {
while (matcherALink.find()) { while (matcherALink.find()) {
String urlText = matcherALink.group(3); String urlText = matcherALink.group(3);
String url = matcherALink.group(2); String url = matcherALink.group(2);
if (urlText != null) { if (urlText != null && urlText.startsWith(">")) {
urlText = urlText.substring(1); urlText = urlText.substring(1);
} }
if (url != null && urlText != null && !url.equals(urlText) && !urlText.contains("<span")) { if (url != null && urlText != null && !url.equals(urlText) && !urlText.contains("<span")) {
@ -184,6 +184,7 @@ public class SpannableHelper {
private static void linkify(Context context, SpannableStringBuilder content, HashMap<String, String> urlDetails) { private static void linkify(Context context, SpannableStringBuilder content, HashMap<String, String> urlDetails) {
//--- URLs ---- //--- URLs ----
Matcher matcherLink = Patterns.WEB_URL.matcher(content); Matcher matcherLink = Patterns.WEB_URL.matcher(content);
int offSetTruncate = 0; int offSetTruncate = 0;
while (matcherLink.find()) { while (matcherLink.find()) {
int matchStart = matcherLink.start() - offSetTruncate; int matchStart = matcherLink.start() - offSetTruncate;
@ -195,17 +196,9 @@ public class SpannableHelper {
if (content.toString().length() < matchEnd || matchStart < 0 || matchStart > matchEnd) { if (content.toString().length() < matchEnd || matchStart < 0 || matchStart > matchEnd) {
continue; continue;
} }
String url_temp = content.toString().substring(matchStart, matchEnd).replace("…", "");
if (urlDetails.containsValue(url_temp + "…")) {
String originalURL = Helper.getKeyByValue(urlDetails, url_temp + "…"); final String url = content.toString().substring(matchStart, matchEnd);
if (originalURL != null) {
content.replace(matchStart, matchEnd, originalURL);
offSetTruncate += (originalURL.length() - (url_temp.length() + 1));
matchEnd = matchStart + originalURL.length();
url_temp = originalURL;
}
}
final String url = url_temp;
/* if (!url.startsWith("http")) { /* if (!url.startsWith("http")) {
continue; continue;
}*/ }*/
@ -231,14 +224,14 @@ public class SpannableHelper {
content.replace(matchStart, matchEnd, urlText); content.replace(matchStart, matchEnd, urlText);
matchEnd = matchStart + 31; matchEnd = matchStart + 31;
offSetTruncate += (newURL.length() - urlText.length()); offSetTruncate += (newURL.length() - urlText.length());
} else if (urlDetails.containsKey(urlText) && urlDetails.get(urlText) != null) { } /*else if (urlDetails.containsKey(urlText) && urlDetails.get(urlText) != null) {
urlText = urlDetails.get(urlText); urlText = urlDetails.get(urlText);
if (urlText != null) { if (urlText != null) {
content.replace(matchStart, matchEnd, urlText); content.replace(matchStart, matchEnd, urlText);
matchEnd = matchStart + urlText.length(); matchEnd = matchStart + urlText.length();
offSetTruncate += (newURL.length() - urlText.length()); offSetTruncate += (newURL.length() - urlText.length());
} }
} }*/
if (matchEnd <= content.length() && matchEnd >= matchStart) { if (matchEnd <= content.length() && matchEnd >= matchStart) {
@ -251,10 +244,14 @@ public class SpannableHelper {
dialogBuilder.setView(popupLinksBinding.getRoot()); dialogBuilder.setView(popupLinksBinding.getRoot());
AlertDialog alertDialog = dialogBuilder.create(); AlertDialog alertDialog = dialogBuilder.create();
alertDialog.show(); alertDialog.show();
String finalURl = url;
if (urlDetails.containsValue(url)) {
finalURl = Helper.getKeyByValue(urlDetails, url);
}
String finalURl1 = finalURl;
popupLinksBinding.displayFullLink.setOnClickListener(v -> { popupLinksBinding.displayFullLink.setOnClickListener(v -> {
AlertDialog.Builder builder = new AlertDialog.Builder(mContext, Helper.dialogStyle()); AlertDialog.Builder builder = new AlertDialog.Builder(mContext, Helper.dialogStyle());
builder.setMessage(url); builder.setMessage(finalURl1);
builder.setTitle(context.getString(R.string.display_full_link)); builder.setTitle(context.getString(R.string.display_full_link));
builder.setPositiveButton(R.string.close, (dialog, which) -> dialog.dismiss()) builder.setPositiveButton(R.string.close, (dialog, which) -> dialog.dismiss())
.show(); .show();
@ -263,7 +260,7 @@ public class SpannableHelper {
popupLinksBinding.shareLink.setOnClickListener(v -> { popupLinksBinding.shareLink.setOnClickListener(v -> {
Intent sendIntent = new Intent(Intent.ACTION_SEND); Intent sendIntent = new Intent(Intent.ACTION_SEND);
sendIntent.putExtra(Intent.EXTRA_SUBJECT, context.getString(R.string.shared_via)); sendIntent.putExtra(Intent.EXTRA_SUBJECT, context.getString(R.string.shared_via));
sendIntent.putExtra(Intent.EXTRA_TEXT, url); sendIntent.putExtra(Intent.EXTRA_TEXT, finalURl1);
sendIntent.setType("text/plain"); sendIntent.setType("text/plain");
sendIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK); sendIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
Intent intentChooser = Intent.createChooser(sendIntent, context.getString(R.string.share_with)); Intent intentChooser = Intent.createChooser(sendIntent, context.getString(R.string.share_with));
@ -274,7 +271,7 @@ public class SpannableHelper {
popupLinksBinding.openOtherApp.setOnClickListener(v -> { popupLinksBinding.openOtherApp.setOnClickListener(v -> {
Intent intent = new Intent(Intent.ACTION_VIEW); Intent intent = new Intent(Intent.ACTION_VIEW);
intent.setData(Uri.parse(url)); intent.setData(Uri.parse(finalURl1));
intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK); intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
try { try {
context.startActivity(intent); context.startActivity(intent);
@ -286,7 +283,7 @@ public class SpannableHelper {
popupLinksBinding.copyLink.setOnClickListener(v -> { popupLinksBinding.copyLink.setOnClickListener(v -> {
ClipboardManager clipboard = (ClipboardManager) context.getSystemService(Context.CLIPBOARD_SERVICE); ClipboardManager clipboard = (ClipboardManager) context.getSystemService(Context.CLIPBOARD_SERVICE);
ClipData clip = ClipData.newPlainText(Helper.CLIP_BOARD, url); ClipData clip = ClipData.newPlainText(Helper.CLIP_BOARD, finalURl1);
if (clipboard != null) { if (clipboard != null) {
clipboard.setPrimaryClip(clip); clipboard.setPrimaryClip(clip);
Toasty.info(context, context.getString(R.string.clipboard_url), Toast.LENGTH_LONG).show(); Toasty.info(context, context.getString(R.string.clipboard_url), Toast.LENGTH_LONG).show();
@ -297,7 +294,7 @@ public class SpannableHelper {
popupLinksBinding.checkRedirect.setOnClickListener(v -> { popupLinksBinding.checkRedirect.setOnClickListener(v -> {
try { try {
URL finalUrlCheck = new URL(url); URL finalUrlCheck = new URL(finalURl1);
new Thread(() -> { new Thread(() -> {
try { try {
String redirect = null; String redirect = null;
@ -319,7 +316,7 @@ public class SpannableHelper {
} }
} }
httpsURLConnection.getInputStream().close(); httpsURLConnection.getInputStream().close();
if (redirect != null && redirect.compareTo(url) != 0) { if (redirect != null && redirect.compareTo(finalURl1) != 0) {
URL redirectURL = new URL(redirect); URL redirectURL = new URL(redirect);
String host = redirectURL.getHost(); String host = redirectURL.getHost();
String protocol = redirectURL.getProtocol(); String protocol = redirectURL.getProtocol();
@ -332,7 +329,7 @@ public class SpannableHelper {
Runnable myRunnable = () -> { Runnable myRunnable = () -> {
AlertDialog.Builder builder1 = new AlertDialog.Builder(view.getContext(), Helper.dialogStyle()); AlertDialog.Builder builder1 = new AlertDialog.Builder(view.getContext(), Helper.dialogStyle());
if (finalRedirect != null) { if (finalRedirect != null) {
builder1.setMessage(context.getString(R.string.redirect_detected, url, finalRedirect)); builder1.setMessage(context.getString(R.string.redirect_detected, finalURl1, finalRedirect));
builder1.setNegativeButton(R.string.copy_link, (dialog, which) -> { builder1.setNegativeButton(R.string.copy_link, (dialog, which) -> {
ClipboardManager clipboard1 = (ClipboardManager) context.getSystemService(Context.CLIPBOARD_SERVICE); ClipboardManager clipboard1 = (ClipboardManager) context.getSystemService(Context.CLIPBOARD_SERVICE);
ClipData clip1 = ClipData.newPlainText(Helper.CLIP_BOARD, finalRedirect); ClipData clip1 = ClipData.newPlainText(Helper.CLIP_BOARD, finalRedirect);
@ -345,7 +342,7 @@ public class SpannableHelper {
builder1.setNeutralButton(R.string.share_link, (dialog, which) -> { builder1.setNeutralButton(R.string.share_link, (dialog, which) -> {
Intent sendIntent1 = new Intent(Intent.ACTION_SEND); Intent sendIntent1 = new Intent(Intent.ACTION_SEND);
sendIntent1.putExtra(Intent.EXTRA_SUBJECT, context.getString(R.string.shared_via)); sendIntent1.putExtra(Intent.EXTRA_SUBJECT, context.getString(R.string.shared_via));
sendIntent1.putExtra(Intent.EXTRA_TEXT, url); sendIntent1.putExtra(Intent.EXTRA_TEXT, finalURl1);
sendIntent1.setType("text/plain"); sendIntent1.setType("text/plain");
context.startActivity(Intent.createChooser(sendIntent1, context.getString(R.string.share_with))); context.startActivity(Intent.createChooser(sendIntent1, context.getString(R.string.share_with)));
dialog.dismiss(); dialog.dismiss();
@ -375,12 +372,20 @@ public class SpannableHelper {
@Override @Override
public void onClick(@NonNull View textView) { public void onClick(@NonNull View textView) {
String finalURl = newURL;
String finalURl2 = url;
if (urlDetails.containsValue(newURL + "…")) {
finalURl = Helper.getKeyByValue(urlDetails, newURL + "…");
}
if (urlDetails.containsValue(url + "…")) {
finalURl2 = Helper.getKeyByValue(urlDetails, url + "…");
}
textView.setTag(CLICKABLE_SPAN); textView.setTag(CLICKABLE_SPAN);
Pattern link = Pattern.compile("https?://([\\da-z.-]+\\.[a-z.]{2,10})/(@[\\w._-]*[0-9]*)(/[0-9]+)?$"); Pattern link = Pattern.compile("https?://([\\da-z.-]+\\.[a-z.]{2,10})/(@[\\w._-]*[0-9]*)(/[0-9]+)?$");
Matcher matcherLink = link.matcher(url); Matcher matcherLink = link.matcher(finalURl2);
if (matcherLink.find() && !url.contains("medium.com")) { if (matcherLink.find() && !finalURl2.contains("medium.com")) {
if (matcherLink.group(3) != null && Objects.requireNonNull(matcherLink.group(3)).length() > 0) { //It's a toot if (matcherLink.group(3) != null && Objects.requireNonNull(matcherLink.group(3)).length() > 0) { //It's a toot
CrossActionHelper.fetchRemoteStatus(context, currentAccount, url, new CrossActionHelper.Callback() { CrossActionHelper.fetchRemoteStatus(context, currentAccount, finalURl2, new CrossActionHelper.Callback() {
@Override @Override
public void federatedStatus(Status status) { public void federatedStatus(Status status) {
Intent intent = new Intent(context, ContextActivity.class); Intent intent = new Intent(context, ContextActivity.class);
@ -411,7 +416,7 @@ public class SpannableHelper {
}); });
} }
} else { } else {
Helper.openBrowser(context, newURL); Helper.openBrowser(context, finalURl);
} }
} }

Write Preview
Loading…
Cancel
Save