From 528d1bfce78760adec687dd6cee824f972ceb50f Mon Sep 17 00:00:00 2001
From: FongMi <b8892778@gmail.com>
Date: Tue, 19 Mar 2024 18:29:26 +0800
Subject: [PATCH] Clean code

---
 app/build.gradle                                      |  4 ++--
 .../fongmi/android/tv/ui/activity/LiveActivity.java   | 11 ++---------
 .../java/com/fongmi/android/tv/utils/Biometric.java   |  0
 3 files changed, 4 insertions(+), 11 deletions(-)
 rename app/src/{main => mobile}/java/com/fongmi/android/tv/utils/Biometric.java (100%)

diff --git a/app/build.gradle b/app/build.gradle
index 996a71215..8d828fcc7 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -105,10 +105,9 @@ dependencies {
     implementation project(':media-lib-exoplayer-smoothstreaming')
     implementation project(':media-lib-ui')
     implementation 'androidx.appcompat:appcompat:1.6.1'
-    implementation 'androidx.biometric:biometric:1.1.0'
     implementation 'androidx.lifecycle:lifecycle-viewmodel:2.7.0'
-    implementation 'androidx.room:room-runtime:2.6.1'
     implementation 'androidx.media:media:1.7.0'
+    implementation 'androidx.room:room-runtime:2.6.1'
     implementation 'cat.ereza:customactivityoncrash:2.4.0'
     implementation 'com.github.bassaer:materialdesigncolors:1.0.0'
     implementation 'com.github.bumptech.glide:glide:4.16.0'
@@ -135,6 +134,7 @@ dependencies {
     leanbackImplementation 'androidx.leanback:leanback:1.2.0-alpha04'
     leanbackImplementation 'me.jessyan:autosize:1.2.1'
     mobileImplementation(ext: 'aar', name: 'dlna-dmc', group: 'fongmi', version: 'release')
+    mobileImplementation 'androidx.biometric:biometric:1.1.0'
     mobileImplementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0'
     mobileImplementation 'com.google.android.flexbox:flexbox:3.0.0'
     mobileImplementation('com.journeyapps:zxing-android-embedded:4.3.0') { transitive = false }
diff --git a/app/src/leanback/java/com/fongmi/android/tv/ui/activity/LiveActivity.java b/app/src/leanback/java/com/fongmi/android/tv/ui/activity/LiveActivity.java
index 67308c2c6..0aaeed943 100644
--- a/app/src/leanback/java/com/fongmi/android/tv/ui/activity/LiveActivity.java
+++ b/app/src/leanback/java/com/fongmi/android/tv/ui/activity/LiveActivity.java
@@ -57,7 +57,6 @@ import com.fongmi.android.tv.ui.dialog.TrackDialog;
 import com.fongmi.android.tv.ui.presenter.ChannelPresenter;
 import com.fongmi.android.tv.ui.presenter.EpgDataPresenter;
 import com.fongmi.android.tv.ui.presenter.GroupPresenter;
-import com.fongmi.android.tv.utils.Biometric;
 import com.fongmi.android.tv.utils.Clock;
 import com.fongmi.android.tv.utils.ImgUtil;
 import com.fongmi.android.tv.utils.Notify;
@@ -74,7 +73,7 @@ import java.util.List;
 
 import tv.danmaku.ijk.media.player.ui.IjkVideoView;
 
-public class LiveActivity extends BaseActivity implements GroupPresenter.OnClickListener, ChannelPresenter.OnClickListener, EpgDataPresenter.OnClickListener, CustomKeyDownLive.Listener, CustomLiveListView.Callback, TrackDialog.Listener, Biometric.Callback, PassCallback, LiveCallback, SubtitleCallback {
+public class LiveActivity extends BaseActivity implements GroupPresenter.OnClickListener, ChannelPresenter.OnClickListener, EpgDataPresenter.OnClickListener, CustomKeyDownLive.Listener, CustomLiveListView.Callback, TrackDialog.Listener, PassCallback, LiveCallback, SubtitleCallback {
 
     private ActivityLiveBinding mBinding;
     private ArrayObjectAdapter mChannelAdapter;
@@ -560,8 +559,7 @@ public class LiveActivity extends BaseActivity implements GroupPresenter.OnClick
         mChannelAdapter.setItems(setWidth(item).getChannel(), null);
         mBinding.channel.setSelectedPosition(Math.max(item.getPosition(), 0));
         if (!item.isKeep() || ++count < 5 || mHides.isEmpty()) return;
-        if (Biometric.enable()) Biometric.show(this);
-        else PassDialog.create().show(this);
+        PassDialog.create().show(this);
         App.removeCallbacks(mR4);
         resetPass();
     }
@@ -684,11 +682,6 @@ public class LiveActivity extends BaseActivity implements GroupPresenter.OnClick
         unlock(pass);
     }
 
-    @Override
-    public void onBiometricSuccess() {
-        unlock(null);
-    }
-
     private void unlock(String pass) {
         boolean first = true;
         int position = mGroupAdapter.size();
diff --git a/app/src/main/java/com/fongmi/android/tv/utils/Biometric.java b/app/src/mobile/java/com/fongmi/android/tv/utils/Biometric.java
similarity index 100%
rename from app/src/main/java/com/fongmi/android/tv/utils/Biometric.java
rename to app/src/mobile/java/com/fongmi/android/tv/utils/Biometric.java