From 6c92bf726aff231123a50b225539e236f11efd4c Mon Sep 17 00:00:00 2001 From: FongMi Date: Fri, 20 Oct 2023 11:40:33 +0800 Subject: [PATCH] Clean code --- app/src/main/java/com/fongmi/android/tv/player/Players.java | 3 +-- .../java/com/fongmi/android/tv/receiver/ActionReceiver.java | 3 +-- app/src/main/java/com/fongmi/android/tv/utils/Utils.java | 6 ------ 3 files changed, 2 insertions(+), 10 deletions(-) diff --git a/app/src/main/java/com/fongmi/android/tv/player/Players.java b/app/src/main/java/com/fongmi/android/tv/player/Players.java index ee657b7b2..9f5dd8495 100644 --- a/app/src/main/java/com/fongmi/android/tv/player/Players.java +++ b/app/src/main/java/com/fongmi/android/tv/player/Players.java @@ -31,7 +31,6 @@ import com.fongmi.android.tv.impl.SessionCallback; import com.fongmi.android.tv.utils.Notify; import com.fongmi.android.tv.utils.ResUtil; import com.fongmi.android.tv.utils.UrlUtil; -import com.fongmi.android.tv.utils.Utils; import com.github.catvod.utils.Path; import com.github.catvod.utils.Util; import com.google.common.net.HttpHeaders; @@ -103,7 +102,7 @@ public class Players implements Player.Listener, IMediaPlayer.Listener, Analytic session.setMediaButtonReceiver(null); session.setCallback(SessionCallback.create(this)); session.setFlags(MediaSessionCompat.FLAG_HANDLES_MEDIA_BUTTONS | MediaSessionCompat.FLAG_HANDLES_TRANSPORT_CONTROLS); - session.setSessionActivity(PendingIntent.getActivity(App.get(), 99, new Intent(App.get(), activity.getClass()), Utils.getPendingFlag())); + session.setSessionActivity(PendingIntent.getActivity(App.get(), 99, new Intent(App.get(), activity.getClass()), PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_IMMUTABLE)); MediaControllerCompat.setMediaController(activity, session.getController()); } diff --git a/app/src/main/java/com/fongmi/android/tv/receiver/ActionReceiver.java b/app/src/main/java/com/fongmi/android/tv/receiver/ActionReceiver.java index b254d8c15..dd2bc178a 100644 --- a/app/src/main/java/com/fongmi/android/tv/receiver/ActionReceiver.java +++ b/app/src/main/java/com/fongmi/android/tv/receiver/ActionReceiver.java @@ -6,12 +6,11 @@ import android.content.Context; import android.content.Intent; import com.fongmi.android.tv.event.ActionEvent; -import com.fongmi.android.tv.utils.Utils; public class ActionReceiver extends BroadcastReceiver { public static PendingIntent getPendingIntent(Context context, String action) { - return PendingIntent.getBroadcast(context, 100, new Intent(action).setPackage(context.getPackageName()), Utils.getPendingFlag()); + return PendingIntent.getBroadcast(context, 100, new Intent(action).setPackage(context.getPackageName()), PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_IMMUTABLE); } @Override 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 3cd02867b..ce2af2d3c 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 @@ -2,10 +2,8 @@ package com.fongmi.android.tv.utils; import android.Manifest; import android.app.Activity; -import android.app.PendingIntent; import android.content.ClipboardManager; import android.content.Context; -import android.os.Build; import android.os.IBinder; import android.provider.Settings; import android.view.View; @@ -57,10 +55,6 @@ public class Utils { return ((ClipboardManager) App.get().getSystemService(Context.CLIPBOARD_SERVICE)).getText(); } - public static int getPendingFlag() { - return Build.VERSION.SDK_INT >= Build.VERSION_CODES.M ? PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_IMMUTABLE : PendingIntent.FLAG_UPDATE_CURRENT; - } - public static int getDigit(String text) { try { if (text.startsWith("上") || text.startsWith("下")) return -1;