Restructured lifecycle callbacks, cancel autoplay on destroy to preve…

…nt runtime exceptions
janheinrichmerker · Jun 23, 2016 · d784107 · d784107
1 parent e009231
commit d784107
Showing 1 changed file with 17 additions and 10 deletions.
diff --git a/library/src/main/java/com/heinrichreimersoftware/materialintro/app/IntroActivity.java b/library/src/main/java/com/heinrichreimersoftware/materialintro/app/IntroActivity.java
@@ -178,6 +178,19 @@ protected void onResume() {
         updateFullscreen();
     }
 
+    @Override
+    public void onUserInteraction() {
+        if (isAutoplaying())
+            cancelAutoplay();
+    }
+
+    @Override
+    public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions,
+            @NonNull int[] grantResults) {
+        super.onRequestPermissionsResult(requestCode, permissions, grantResults);
+        updateButtonCta();
+    }
+
     @Override
     protected void onSaveInstanceState(Bundle outState) {
         super.onSaveInstanceState(outState);
@@ -197,10 +210,10 @@ public void onBackPressed() {
     }
 
     @Override
-    public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions,
-                                           @NonNull int[] grantResults) {
-        super.onRequestPermissionsResult(requestCode, permissions, grantResults);
-        updateButtonCta();
+    protected void onDestroy() {
+        if (isAutoplaying())
+            cancelAutoplay();
+        super.onDestroy();
     }
 
     private void setSystemUiFlags(int flags, boolean value){
@@ -743,12 +756,6 @@ public boolean isAutoplaying() {
         return autoplayCallback != null;
     }
 
-    @Override
-    public void onUserInteraction() {
-        if (isAutoplaying())
-            cancelAutoplay();
-    }
-
     @SuppressWarnings("unused")
     public boolean isFullscreen() {
         return fullscreen;