prevent leak caused by ScheduledExecutorService.

DroidKaigi · Feb 13, 2017 · 9bfd0be · 9bfd0be
1 parent ff39dca
commit 9bfd0be
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 2 deletions.
diff --git a/app/src/main/java/io/github/droidkaigi/confsched2017/view/activity/SplashActivity.java b/app/src/main/java/io/github/droidkaigi/confsched2017/view/activity/SplashActivity.java
@@ -10,6 +10,7 @@
 
 import java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.ScheduledFuture;
 import java.util.concurrent.TimeUnit;
 
 import io.github.droidkaigi.confsched2017.R;
@@ -21,6 +22,7 @@ public class SplashActivity extends AppCompatActivity {
 
     private ActivitySplashBinding binding;
     private final ScheduledExecutorService scheduledExecutorService = Executors.newSingleThreadScheduledExecutor();
+    private ScheduledFuture<?> scheduledFuture;
     private final Handler handler = new Handler();
     private final Runnable moveActivityRunnable = () -> {
         scheduledExecutorService.shutdown();
@@ -37,7 +39,7 @@ protected void onCreate(Bundle savedInstanceState) {
                     View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN | View.SYSTEM_UI_FLAG_LAYOUT_STABLE);
         }
 
-        scheduledExecutorService.scheduleAtFixedRate(
+        scheduledFuture = scheduledExecutorService.scheduleAtFixedRate(
                 () -> binding.particleAnimationView.postInvalidate(),
                 0L,
                 40L,
@@ -52,4 +54,9 @@ protected void onStop() {
         handler.removeCallbacks(moveActivityRunnable);
     }
 
+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
+        scheduledFuture.cancel(true);
+    }
 }
diff --git a/app/src/main/java/io/github/droidkaigi/confsched2017/view/activity/SplashViewActivity.java b/app/src/main/java/io/github/droidkaigi/confsched2017/view/activity/SplashViewActivity.java
@@ -8,6 +8,7 @@
 
 import java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.ScheduledFuture;
 import java.util.concurrent.TimeUnit;
 
 import io.github.droidkaigi.confsched2017.R;
@@ -19,6 +20,7 @@ public class SplashViewActivity extends AppCompatActivity {
 
     private ActivitySplashBinding binding;
     private final ScheduledExecutorService scheduledExecutorService = Executors.newSingleThreadScheduledExecutor();
+    private ScheduledFuture<?> scheduledFuture;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -30,11 +32,16 @@ protected void onCreate(Bundle savedInstanceState) {
                     View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN | View.SYSTEM_UI_FLAG_LAYOUT_STABLE);
         }
 
-        scheduledExecutorService.scheduleAtFixedRate(
+        scheduledFuture = scheduledExecutorService.scheduleAtFixedRate(
                 () -> binding.particleAnimationView.postInvalidate(),
                 0L,
                 40L,
                 TimeUnit.MILLISECONDS);
     }
 
+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
+        scheduledFuture.cancel(true);
+    }
 }