diff --git a/app/src/main/java/com/termux/app/terminal/TermuxTerminalViewClient.java b/app/src/main/java/com/termux/app/terminal/TermuxTerminalViewClient.java index 700173ed..f520a1d4 100644 --- a/app/src/main/java/com/termux/app/terminal/TermuxTerminalViewClient.java +++ b/app/src/main/java/com/termux/app/terminal/TermuxTerminalViewClient.java @@ -2,13 +2,11 @@ package com.termux.app.terminal; import android.annotation.SuppressLint; import android.app.AlertDialog; -import android.content.ActivityNotFoundException; import android.content.ClipData; import android.content.ClipboardManager; import android.content.Context; import android.content.Intent; import android.media.AudioManager; -import android.net.Uri; import android.os.Environment; import android.text.TextUtils; import android.view.Gravity; @@ -22,7 +20,6 @@ import android.widget.Toast; import com.termux.R; import com.termux.app.TermuxActivity; -import com.termux.shared.data.UrlUtils; import com.termux.shared.file.FileUtils; import com.termux.shared.interact.MessageDialogUtils; import com.termux.shared.interact.ShareUtils; @@ -40,10 +37,10 @@ import com.termux.shared.data.DataUtils; import com.termux.shared.logger.Logger; import com.termux.shared.markdown.MarkdownUtils; import com.termux.shared.termux.TermuxUtils; +import com.termux.shared.termux.data.TermuxUrlUtils; import com.termux.shared.view.KeyboardUtils; import com.termux.shared.view.ViewUtils; import com.termux.terminal.KeyHandler; -import com.termux.terminal.TerminalBuffer; import com.termux.terminal.TerminalEmulator; import com.termux.terminal.TerminalSession; @@ -179,7 +176,7 @@ public class TermuxTerminalViewClient extends TermuxTerminalViewClientBase { if (mActivity.getProperties().shouldOpenTerminalTranscriptURLOnClick()) { int[] columnAndRow = mActivity.getTerminalView().getColumnAndRow(e, true); String wordAtTap = term.getScreen().getWordAtLocation(columnAndRow[0], columnAndRow[1]); - LinkedHashSet urlSet = UrlUtils.extractUrls(wordAtTap); + LinkedHashSet urlSet = TermuxUrlUtils.extractUrls(wordAtTap); if (!urlSet.isEmpty()) { String url = (String) urlSet.iterator().next(); @@ -665,7 +662,7 @@ public class TermuxTerminalViewClient extends TermuxTerminalViewClientBase { String text = ShellUtils.getTerminalSessionTranscriptText(session, true, true); - LinkedHashSet urlSet = UrlUtils.extractUrls(text); + LinkedHashSet urlSet = TermuxUrlUtils.extractUrls(text); if (urlSet.isEmpty()) { new AlertDialog.Builder(mActivity).setMessage(R.string.title_select_url_none_found).show(); return; diff --git a/app/src/test/java/com/termux/app/TermuxActivityTest.java b/app/src/test/java/com/termux/app/TermuxActivityTest.java index 27613829..bcb80f2c 100644 --- a/app/src/test/java/com/termux/app/TermuxActivityTest.java +++ b/app/src/test/java/com/termux/app/TermuxActivityTest.java @@ -1,6 +1,6 @@ package com.termux.app; -import com.termux.shared.data.UrlUtils; +import com.termux.shared.termux.data.TermuxUrlUtils; import org.junit.Assert; import org.junit.Test; @@ -13,7 +13,7 @@ public class TermuxActivityTest { private void assertUrlsAre(String text, String... urls) { LinkedHashSet expected = new LinkedHashSet<>(); Collections.addAll(expected, urls); - Assert.assertEquals(expected, UrlUtils.extractUrls(text)); + Assert.assertEquals(expected, TermuxUrlUtils.extractUrls(text)); } @Test diff --git a/termux-shared/src/main/java/com/termux/shared/data/UrlUtils.java b/termux-shared/src/main/java/com/termux/shared/termux/data/TermuxUrlUtils.java similarity index 98% rename from termux-shared/src/main/java/com/termux/shared/data/UrlUtils.java rename to termux-shared/src/main/java/com/termux/shared/termux/data/TermuxUrlUtils.java index 29f3a8c0..6eabde8e 100644 --- a/termux-shared/src/main/java/com/termux/shared/data/UrlUtils.java +++ b/termux-shared/src/main/java/com/termux/shared/termux/data/TermuxUrlUtils.java @@ -1,10 +1,10 @@ -package com.termux.shared.data; +package com.termux.shared.termux.data; import java.util.LinkedHashSet; import java.util.regex.Matcher; import java.util.regex.Pattern; -public class UrlUtils { +public class TermuxUrlUtils { public static Pattern URL_MATCH_REGEX;