commit 9333086d906aa27527edbc54f72eb8ec05295395
Author: Leszek Koltunski <leszek@koltunski.pl>
Date:   Fri Oct 1 22:01:28 2021 +0200

    Correct a recently introduced bug with restoring records.
    Slightely simplify ObjectType.

diff --git a/src/main/java/org/distorted/network/RubikScores.java b/src/main/java/org/distorted/network/RubikScores.java
index 8abdafe5..5d9d103b 100644
--- a/src/main/java/org/distorted/network/RubikScores.java
+++ b/src/main/java/org/distorted/network/RubikScores.java
@@ -59,11 +59,11 @@ public class RubikScores
     mRecords   = new long[NUM_OBJECTS][MAX_LEVEL];
     mSubmitted = new int [NUM_OBJECTS][MAX_LEVEL];
 
-    for(int i=0; i<NUM_OBJECTS; i++)
-      for(int j=0; j<MAX_LEVEL; j++)
+    for(int object=0; object<NUM_OBJECTS; object++)
+      for(int level=0; level<MAX_LEVEL; level++)
         {
-        mRecords[i][j]   = NO_RECORD;
-        mSubmitted[i][j] = 0;
+        mRecords[object][level]   = NO_RECORD;
+        mSubmitted[object][level] = 0;
         }
 
     mName = "";
@@ -103,10 +103,10 @@ public class RubikScores
     {
     mNameIsVerified = true;
 
-    for(int i=0; i<NUM_OBJECTS; i++)
-      for(int j=0; j<MAX_LEVEL; j++)
+    for(int object=0; object<NUM_OBJECTS; object++)
+      for(int level=0; level<MAX_LEVEL; level++)
         {
-        mSubmitted[i][j]=1;
+        mSubmitted[object][level]=1;
         }
     }
 
@@ -122,12 +122,10 @@ public class RubikScores
   synchronized boolean thereAreUnsubmittedRecords()
     {
     for(int object=0; object<NUM_OBJECTS; object++)
-      {
       for(int level=0; level<MAX_LEVEL; level++)
         {
         if( mSubmitted[object][level]==0 && mRecords[object][level]<NO_RECORD ) return true;
         }
-      }
 
     return false;
     }
@@ -155,10 +153,7 @@ public class RubikScores
             builderLvl.append(',');
             builderTim.append(',');
             }
-          else
-            {
-            first=false;
-            }
+          first=false;
 
           builderObj.append(name);
           builderLvl.append(level);
@@ -179,13 +174,6 @@ public class RubikScores
     return (obj>=0 && obj<NUM_OBJECTS && level>=0 && level<MAX_LEVEL) ? mRecords[obj][level] : -1;
     }
 
-///////////////////////////////////////////////////////////////////////////////////////////////////
-
-  public synchronized boolean isSubmitted(int obj, int level)
-    {
-    return obj>=0 && obj<NUM_OBJECTS && level>=0 && level<MAX_LEVEL && mSubmitted[obj][level]==1;
-    }
-
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
   public boolean isVerified()
@@ -293,11 +281,7 @@ public class RubikScores
 
   public static RubikScores getInstance()
     {
-    if( mThis==null )
-      {
-      mThis = new RubikScores();
-      }
-
+    if( mThis==null ) mThis = new RubikScores();
     return mThis;
     }
 
@@ -338,8 +322,8 @@ public class RubikScores
 
   public synchronized void restorePreferences(SharedPreferences preferences)
     {
-    String recordStr, subStr, nameStr, sizeStr, timeStr, submStr, errorStr="";
-    int start, end, equals, underscore, comma, object, subm;
+    String recordStr, subStr, nameStr, timeStr, submStr, errorStr="";
+    int start, end, equals, comma, object, subm;
     long time;
     boolean thereWasError = false;
 
@@ -357,14 +341,12 @@ public class RubikScores
 
         start = end+1;
 
-        underscore = subStr.indexOf("_");
         equals = subStr.indexOf("=");
-        comma = subStr.indexOf(",");
+        comma  = subStr.indexOf(",");
 
-        if( underscore>=0 && equals>=0 && comma>=0 )
+        if( equals>=0 && comma>=0 )
           {
-          nameStr = subStr.substring(0,underscore);
-          sizeStr = subStr.substring(underscore+1, equals);
+          nameStr = subStr.substring(0,equals);
           timeStr = subStr.substring(equals+1,comma);
           submStr = subStr.substring(comma+1);
 
@@ -382,13 +364,13 @@ public class RubikScores
               }
             else
               {
-              errorStr += ("error1: subm="+subm+" obj: "+nameStr+" size: "+sizeStr+"\n");
+              errorStr += ("error1: subm="+subm+" obj: "+nameStr+"\n");
               thereWasError= true;
               }
             }
           else
             {
-            errorStr += ("error2: object="+object+" obj: "+nameStr+" size: "+sizeStr+"\n");
+            errorStr += ("error2: object="+object+" obj: "+nameStr+"\n");
             thereWasError = true;
             }
           }