commit c65a5efe6cee046c30f50cfed1e74f78588c56b4
Author: Leszek Koltunski <leszek@koltunski.pl>
Date:   Tue Oct 5 15:40:40 2021 +0200

    Further simplifications.

diff --git a/src/main/java/org/distorted/helpers/MovesController.java b/src/main/java/org/distorted/helpers/MovesController.java
index d4b3acf2..415c67b1 100644
--- a/src/main/java/org/distorted/helpers/MovesController.java
+++ b/src/main/java/org/distorted/helpers/MovesController.java
@@ -26,7 +26,6 @@ import android.view.View;
 import android.widget.ImageButton;
 import android.widget.LinearLayout;
 
-import org.distorted.objectlib.helpers.BlockController;
 import org.distorted.objectlib.helpers.MovesFinished;
 import org.distorted.objectlib.main.ObjectControl;
 
@@ -37,6 +36,7 @@ import org.distorted.main.RubikActivity;
 
 public class MovesController implements MovesFinished
   {
+  private static final int MOVES_PLACE_0 = 100;
   private static final int MILLIS_PER_DEGREE = 6;
 
   private static class Move
@@ -103,7 +103,7 @@ public class MovesController implements MovesFinished
           {
           mCanPrevMove = false;
           mControl = control;
-          mControl.blockTouch(BlockController.MOVES_PLACE_0);
+          mControl.blockTouch(MOVES_PLACE_0);
           mControl.addRotation(this, axis, (1<<move.mRow), -angle, MILLIS_PER_DEGREE);
           }
         else
diff --git a/src/main/java/org/distorted/main/RubikActivity.java b/src/main/java/org/distorted/main/RubikActivity.java
index 0c7f455b..ba14f3e0 100644
--- a/src/main/java/org/distorted/main/RubikActivity.java
+++ b/src/main/java/org/distorted/main/RubikActivity.java
@@ -45,7 +45,6 @@ import org.distorted.library.main.DistortedScreen;
 import org.distorted.objectlib.main.ObjectControl;
 import org.distorted.objectlib.main.TwistyObject;
 import org.distorted.objectlib.main.ObjectType;
-import org.distorted.objectlib.helpers.BlockController;
 import org.distorted.objectlib.effects.BaseEffect;
 
 import org.distorted.dialogs.RubikDialogError;
@@ -223,7 +222,6 @@ public class RubikActivity extends AppCompatActivity
       RubikSurfaceView view = findViewById(R.id.rubikSurfaceView);
       view.onPause();
       DistortedLibrary.onPause(0);
-      BlockController.onPause();
       RubikNetwork.onPause();
       savePreferences();
       }
@@ -235,7 +233,6 @@ public class RubikActivity extends AppCompatActivity
       {
       super.onResume();
       DistortedLibrary.onResume(0);
-      BlockController.onResume();
       RubikSurfaceView view = findViewById(R.id.rubikSurfaceView);
       view.onResume();
       restorePreferences();
diff --git a/src/main/java/org/distorted/main/RubikSurfaceView.java b/src/main/java/org/distorted/main/RubikSurfaceView.java
index bb2a3304..2d9c7c0c 100644
--- a/src/main/java/org/distorted/main/RubikSurfaceView.java
+++ b/src/main/java/org/distorted/main/RubikSurfaceView.java
@@ -29,8 +29,6 @@ import android.view.MotionEvent;
 
 import com.google.firebase.crashlytics.FirebaseCrashlytics;
 
-import org.distorted.library.type.Static4D;
-
 import org.distorted.objectlib.main.ObjectControl;
 
 import org.distorted.screens.ScreenList;
@@ -118,9 +116,11 @@ public class RubikSurfaceView extends GLSurfaceView
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
-    public Static4D getQuat()
+    @Override
+    public void onPause()
       {
-      return mObjectController.getQuat();
+      super.onPause();
+      mObjectController.onPause();
       }
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
@@ -129,7 +129,7 @@ public class RubikSurfaceView extends GLSurfaceView
     public void onResume()
       {
       super.onResume();
-      mObjectController.initialize();
+      mObjectController.onResume();
       }
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
diff --git a/src/main/java/org/distorted/tutorials/TutorialActivity.java b/src/main/java/org/distorted/tutorials/TutorialActivity.java
index bc715585..6b99ad41 100644
--- a/src/main/java/org/distorted/tutorials/TutorialActivity.java
+++ b/src/main/java/org/distorted/tutorials/TutorialActivity.java
@@ -37,7 +37,6 @@ import org.distorted.library.main.DistortedScreen;
 
 import org.distorted.objectlib.main.ObjectControl;
 import org.distorted.objectlib.main.ObjectType;
-import org.distorted.objectlib.helpers.BlockController;
 
 import org.distorted.main.R;
 import org.distorted.dialogs.RubikDialogError;
@@ -190,7 +189,6 @@ public class TutorialActivity extends AppCompatActivity
       if( mWebView!=null ) mWebView.onPause();
 
       DistortedLibrary.onPause(1);
-      BlockController.onPause();
       }
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
@@ -200,7 +198,6 @@ public class TutorialActivity extends AppCompatActivity
       {
       super.onResume();
       DistortedLibrary.onResume(1);
-      BlockController.onResume();
       TutorialSurfaceView view = findViewById(R.id.tutorialSurfaceView);
       view.onResume();
 
diff --git a/src/main/java/org/distorted/tutorials/TutorialSurfaceView.java b/src/main/java/org/distorted/tutorials/TutorialSurfaceView.java
index 8a3b06e6..f4d39a46 100644
--- a/src/main/java/org/distorted/tutorials/TutorialSurfaceView.java
+++ b/src/main/java/org/distorted/tutorials/TutorialSurfaceView.java
@@ -114,13 +114,22 @@ public class TutorialSurfaceView extends GLSurfaceView
         }
       }
 
+///////////////////////////////////////////////////////////////////////////////////////////////////
+
+    @Override
+    public void onPause()
+      {
+      super.onPause();
+      mObjectController.onPause();
+      }
+
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
     @Override
     public void onResume()
       {
       super.onResume();
-      mObjectController.initialize();
+      mObjectController.onResume();
       }
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////