From fd4e1968c758496956a4c00358332a1a9f04c972 Mon Sep 17 00:00:00 2001 From: FongMi Date: Tue, 21 Feb 2023 18:45:30 +0800 Subject: [PATCH 1/2] [mobile] add url check --- app/src/main/java/com/fongmi/android/tv/utils/Utils.java | 4 ++-- .../java/com/fongmi/android/tv/ui/activity/MainActivity.java | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/com/fongmi/android/tv/utils/Utils.java b/app/src/main/java/com/fongmi/android/tv/utils/Utils.java index 22741bd51..f34390c50 100644 --- a/app/src/main/java/com/fongmi/android/tv/utils/Utils.java +++ b/app/src/main/java/com/fongmi/android/tv/utils/Utils.java @@ -166,9 +166,9 @@ public class Utils { return text; } - public static CharSequence getClip() { + public static String getClip() { ClipboardManager cm = (ClipboardManager) App.get().getSystemService(Context.CLIPBOARD_SERVICE); - return cm.getText(); + return cm.getText() == null ? "" : cm.getText().toString(); } public static void clearClip() { diff --git a/app/src/mobile/java/com/fongmi/android/tv/ui/activity/MainActivity.java b/app/src/mobile/java/com/fongmi/android/tv/ui/activity/MainActivity.java index bbb9e38d1..059617015 100644 --- a/app/src/mobile/java/com/fongmi/android/tv/ui/activity/MainActivity.java +++ b/app/src/mobile/java/com/fongmi/android/tv/ui/activity/MainActivity.java @@ -1,7 +1,7 @@ package com.fongmi.android.tv.ui.activity; import android.content.Intent; -import android.text.TextUtils; +import android.util.Patterns; import android.view.MenuItem; import androidx.annotation.NonNull; @@ -100,9 +100,10 @@ public class MainActivity extends BaseActivity implements NavigationBarView.OnIt private void checkAction(Intent intent) { if (ApiConfig.get().getSite("push_agent") == null) return; + boolean hasClip = Patterns.WEB_URL.matcher(Utils.getClip()).matches(); boolean hasAction = intent.getAction() != null && intent.getAction().equals(Intent.ACTION_SEND) && intent.getType().equals("text/plain"); if (hasAction) DetailActivity.start(this, "push_agent", intent.getStringExtra(Intent.EXTRA_TEXT), ""); - else if (!TextUtils.isEmpty(Utils.getClip())) showDialog(Utils.getClip().toString()); + else if (hasClip) showDialog(Utils.getClip()); } private void showDialog(String text) {