From 08f66206dc49920ffb2057fd5190382bf1297de2 Mon Sep 17 00:00:00 2001 From: FongMi Date: Wed, 19 Apr 2023 13:22:49 +0800 Subject: [PATCH] Clean code --- .../com/fongmi/android/tv/model/LiveViewModel.java | 11 ++++++----- .../com/fongmi/android/tv/model/SiteViewModel.java | 7 ++++--- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/app/src/main/java/com/fongmi/android/tv/model/LiveViewModel.java b/app/src/main/java/com/fongmi/android/tv/model/LiveViewModel.java index c8bcb753c..b21e02565 100644 --- a/app/src/main/java/com/fongmi/android/tv/model/LiveViewModel.java +++ b/app/src/main/java/com/fongmi/android/tv/model/LiveViewModel.java @@ -58,13 +58,14 @@ public class LiveViewModel extends ViewModel { executor = Executors.newFixedThreadPool(2); executor.execute(() -> { try { - if (!Thread.interrupted() && type == LIVE) live.postValue((Live) executor.submit(callable).get(Constant.TIMEOUT_HTTP, TimeUnit.MILLISECONDS)); - if (!Thread.interrupted() && type == CHANNEL) channel.postValue((Channel) executor.submit(callable).get(Constant.TIMEOUT_LIVE, TimeUnit.MILLISECONDS)); + if (Thread.interrupted()) return; + if (type == LIVE) live.postValue((Live) executor.submit(callable).get(Constant.TIMEOUT_HTTP, TimeUnit.MILLISECONDS)); + if (type == CHANNEL) channel.postValue((Channel) executor.submit(callable).get(Constant.TIMEOUT_LIVE, TimeUnit.MILLISECONDS)); } catch (Throwable e) { + if (e instanceof InterruptedException || Thread.interrupted()) return; + if (type == LIVE) live.postValue(new Live()); + if (type == CHANNEL) channel.postValue(new Channel()); e.printStackTrace(); - if (e instanceof InterruptedException) return; - if (!Thread.interrupted() && type == LIVE) live.postValue(new Live()); - if (!Thread.interrupted() && type == CHANNEL) channel.postValue(new Channel()); } }); } diff --git a/app/src/main/java/com/fongmi/android/tv/model/SiteViewModel.java b/app/src/main/java/com/fongmi/android/tv/model/SiteViewModel.java index 7f961c110..5f2dbad3f 100644 --- a/app/src/main/java/com/fongmi/android/tv/model/SiteViewModel.java +++ b/app/src/main/java/com/fongmi/android/tv/model/SiteViewModel.java @@ -195,11 +195,12 @@ public class SiteViewModel extends ViewModel { executor = Executors.newFixedThreadPool(2); executor.execute(() -> { try { - if (!Thread.interrupted()) result.postValue(executor.submit(callable).get(Constant.TIMEOUT_VOD, TimeUnit.MILLISECONDS)); + if (Thread.interrupted()) return; + result.postValue(executor.submit(callable).get(Constant.TIMEOUT_VOD, TimeUnit.MILLISECONDS)); } catch (Throwable e) { + if (e instanceof InterruptedException || Thread.interrupted()) return; + result.postValue(Result.empty()); e.printStackTrace(); - if (e instanceof InterruptedException) return; - if (!Thread.interrupted()) result.postValue(Result.empty()); } }); }