Clean code

app/src/leanback/java/com/fongmi/android/tv/ui/activity/DetailActivity.java

@@ -487,7 +487,10 @@ public class DetailActivity extends BaseActivity implements CustomKeyDown.Listen
     }
 
     private void updateHistory() {
-        if (mHistory != null) mHistory.update();
+        if (mHistory != null) {
+            mHistory.update(Players.get().getCurrentPosition());
+            RefreshEvent.history();
+        }
     }
 
     private final Runnable mHideCenter = new Runnable() {
@@ -550,7 +553,6 @@ public class DetailActivity extends BaseActivity implements CustomKeyDown.Listen
         mBinding.widget.progress.getRoot().setVisibility(View.GONE);
         mBinding.widget.error.setVisibility(View.VISIBLE);
         mBinding.widget.text.setText(msg);
-        Clock.get().setCallback(null);
         Players.get().stop();
     }
 
@@ -603,17 +605,16 @@ public class DetailActivity extends BaseActivity implements CustomKeyDown.Listen
     @Override
     protected void onResume() {
         super.onResume();
-        onPlay(0);
         Clock.start(mBinding.widget.time);
+        onPlay(0);
     }
 
     @Override
     protected void onPause() {
         super.onPause();
-        onPause(false);
-        updateHistory();
-        RefreshEvent.history();
         Clock.get().release();
+        updateHistory();
+        onPause(false);
     }
 
     @Override

app/src/leanback/java/com/fongmi/android/tv/ui/activity/HomeActivity.java

@@ -287,12 +287,13 @@ public class HomeActivity extends BaseActivity implements CustomTitleView.Listen
             Notify.show(R.string.app_exit);
             mHandler.postDelayed(() -> mConfirmExit = false, 1000);
         } else {
-            destroy();
             super.onBackPressed();
         }
     }
 
-    private void destroy() {
+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
         Server.get().stop();
         Players.get().release();
         EventBus.getDefault().unregister(this);

app/src/main/java/com/fongmi/android/tv/bean/History.java

@@ -172,7 +172,8 @@ public class History {
         AppDatabase.get().getHistoryDao().delete(id);
     }
 
-    public History update() {
+    public History update(long duration) {
+        setDuration(duration);
         AppDatabase.get().getHistoryDao().insertOrUpdate(this);
         return this;
     }

app/src/main/java/com/fongmi/android/tv/player/Players.java

@@ -70,8 +70,7 @@ public class Players implements Player.Listener, ParseTask.Callback {
 
     public void addSpeed() {
         float speed = exo().getPlaybackParameters().speed;
-        float addon = speed >= 2 ? 1f : 0.25f;
-        speed = speed >= 5 ? 0.5f : speed + addon;
+        speed = speed == 2 ? 0.25f : speed + 0.25f;
         exo().setPlaybackSpeed(speed);
     }
 
@@ -161,11 +160,9 @@ public class Players implements Player.Listener, ParseTask.Callback {
         if (exoPlayer != null) {
             exoPlayer.removeListener(this);
             exoPlayer.release();
-            exoPlayer = null;
         }
         if (webView != null) {
             webView.destroy();
-            webView = null;
         }
     }
 

app/src/main/java/com/fongmi/android/tv/utils/Clock.java

@@ -62,10 +62,6 @@ public class Clock {
 
     public void release() {
         if (timer != null) timer.cancel();
-        formatter = null;
-        handler = null;
-        timer = null;
-        date = null;
     }
 
     public interface Callback {