commit 7e97ea4577b14f5e269c96fea8c9bcb6e7112ba1
Author: Leszek Koltunski <leszek@koltunski.pl>
Date:   Wed Nov 23 08:41:12 2022 +0100

    Switch off marking objects as free and bought in RubikObjectList
    Up compileSdkVerion to 32 (dependency forces us to do so)

diff --git a/build.gradle b/build.gradle
index 43c8caa8..939546d5 100644
--- a/build.gradle
+++ b/build.gradle
@@ -9,12 +9,12 @@ android {
             keyAlias = 'distorted'
         }
     }
-    compileSdkVersion 31
+    compileSdkVersion 32
 
     defaultConfig {
         applicationId "org.distorted.magic"
         minSdkVersion 21
-        targetSdkVersion 31
+        targetSdkVersion 32
         versionCode 62
         versionName "1.11.4"
     }
@@ -43,9 +43,9 @@ dependencies {
     implementation 'com.google.firebase:firebase-crashlytics'
     implementation 'com.google.firebase:firebase-inappmessaging-display'
     implementation 'com.google.android.play:core:1.10.3'
-    implementation 'androidx.appcompat:appcompat:1.4.2'
+    implementation 'androidx.appcompat:appcompat:1.5.1'
     implementation "androidx.work:work-runtime:2.7.1"
-    implementation 'com.google.android.material:material:1.6.1'
+    implementation 'com.google.android.material:material:1.7.0'
     implementation project(path: ':distorted-puzzle-jsons')
     implementation project(path: ':distorted-puzzle-dmesh')
 }
diff --git a/src/main/java/org/distorted/objects/RubikObjectList.java b/src/main/java/org/distorted/objects/RubikObjectList.java
index b6fde42f..e17888a9 100644
--- a/src/main/java/org/distorted/objects/RubikObjectList.java
+++ b/src/main/java/org/distorted/objects/RubikObjectList.java
@@ -16,7 +16,7 @@ import android.content.Context;
 import android.content.SharedPreferences;
 
 import org.distorted.external.RubikFiles;
-import org.distorted.external.RubikScores;
+//import org.distorted.external.RubikScores;
 import org.distorted.main.RubikActivity;
 import org.distorted.objectlib.main.ObjectSignatures;
 import org.distorted.objectlib.main.ObjectType;
@@ -24,7 +24,7 @@ import org.distorted.objectlib.main.ObjectType;
 import static org.distorted.objectlib.main.TwistyObject.MESH_NICE;
 import static org.distorted.objectlib.main.ObjectType.NUM_OBJECTS;
 import static org.distorted.main.RubikActivity.SHOW_DOWNLOADED_DEBUG;
-import static org.distorted.main.RubikActivity.SHOW_SOLVED_DEBUG;
+//import static org.distorted.main.RubikActivity.SHOW_SOLVED_DEBUG;
 import static org.distorted.screens.RubikScreenPlay.LEVELS_SHOWN;
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
@@ -60,17 +60,18 @@ public class RubikObjectList
     }
 
   private static ArrayList<DownloadedObject> mDownloadedObjects;
+  /*
   private static String mFreeSolvedObjects;
   private static String mFreeBoughtObjects;
   private static int mNumFreeSolved;
-
+  */
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
   private RubikObjectList()
     {
     mNumObjects    = 0;
     mNumExtras     = 0;
-    mNumFreeSolved = 0;
+    //mNumFreeSolved = 0;
 
     mObjects           = new ArrayList<>();
     mDownloadedObjects = new ArrayList<>();
@@ -120,7 +121,7 @@ public class RubikObjectList
     RubikObject obj = new RubikObject(object);
     mObjects.add(obj);
     mNumObjects++;
-
+    /*
     int numUnclaimed = getNumUnclaimedSolves();
 
     if( numUnclaimed>0 && !obj.isFree() )
@@ -129,7 +130,7 @@ public class RubikObjectList
       if( SHOW_SOLVED_DEBUG ) android.util.Log.e("D", "downloadedObject: "+objname+" making it solved. Unclaimed: "+numUnclaimed);
       solveObject(obj,objname);
       }
-
+    */
     if( SHOW_DOWNLOADED_DEBUG ) android.util.Log.e("D", "creating downloaded object "+obj.getUpperName() );
 
     if( obj.hasExtras() )
@@ -155,7 +156,7 @@ public class RubikObjectList
     }
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
-
+/*
   private static void restoreFreedObjects(SharedPreferences preferences)
     {
     mFreeSolvedObjects = preferences.getString("rol_freeSolved", "");
@@ -268,7 +269,7 @@ public class RubikObjectList
 
     return false;
     }
-
+*/
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 // PUBLIC API
 
@@ -357,7 +358,7 @@ public class RubikObjectList
         }
       }
     }
-
+/*
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
   public static boolean allAlreadyBought()
@@ -425,7 +426,7 @@ public class RubikObjectList
     RubikObject object = getObject(shortName);
     return solveObject(object,shortName);
     }
-
+*/
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
   public static void savePreferences(SharedPreferences.Editor editor)
@@ -469,7 +470,7 @@ public class RubikObjectList
       {
       editor.putString("rol_downloaded", "" );
       }
-
+/*
     editor.putString("rol_freeSolved", mFreeSolvedObjects);
     editor.putString("rol_freeBought", mFreeBoughtObjects);
 
@@ -478,6 +479,7 @@ public class RubikObjectList
       android.util.Log.e("D", "saving solved objects: "+mFreeSolvedObjects);
       android.util.Log.e("D", "saving bought objects: "+mFreeBoughtObjects);
       }
+ */
     }
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
@@ -529,7 +531,7 @@ public class RubikObjectList
     mObject = getOrdinal(objName);
     if( mObject<0 || mObject>=mNumObjects ) mObject = DEF_OBJECT;
 
-    if( justStarted) restoreFreedObjects(preferences);
+//    if( justStarted) restoreFreedObjects(preferences);
     }
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
@@ -550,7 +552,7 @@ public class RubikObjectList
     }
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
-
+/*
   public static void setObjectFreeState()
     {
     int numUnclaimed = getNumUnclaimedSolves();
@@ -562,7 +564,7 @@ public class RubikObjectList
       if( stillUnclaimed>0) markAsFree(stillUnclaimed);
       }
     }
-
+*/
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
   public static boolean setCurrObject(int ordinal)
