commit 43c2812a18abcc3759434844877fd63711769e81
Author: Leszek Koltunski <leszek@koltunski.pl>
Date:   Tue Feb 1 15:11:30 2022 +0100

    Downloaded Objects: bugfixes

diff --git a/src/main/java/org/distorted/dialogs/RubikDialogUpdateView.java b/src/main/java/org/distorted/dialogs/RubikDialogUpdateView.java
index 3c8c0b58..eb1215a5 100644
--- a/src/main/java/org/distorted/dialogs/RubikDialogUpdateView.java
+++ b/src/main/java/org/distorted/dialogs/RubikDialogUpdateView.java
@@ -165,8 +165,7 @@ public class RubikDialogUpdateView implements RubikNetwork.Downloadee
         android.util.Log.e("D", "Saving JSON "+name+" to a file "+oSuccess);
 
         JsonReader reader = JsonReader.getInstance();
-        reader.parseJsonFileMetadata(act,name);
-        mInfo.mNumScrambles = reader.getNumScrambles();
+        mInfo.mNumScrambles = reader.readNumScrambles(act,name);
 
         android.util.Log.e("D", "Read from JSON numScrambles="+mInfo.mNumScrambles);
         }
diff --git a/src/main/java/org/distorted/main/RubikActivity.java b/src/main/java/org/distorted/main/RubikActivity.java
index db4d212c..d30bdfc8 100644
--- a/src/main/java/org/distorted/main/RubikActivity.java
+++ b/src/main/java/org/distorted/main/RubikActivity.java
@@ -43,8 +43,6 @@ import androidx.appcompat.app.AppCompatActivity;
 import com.google.firebase.analytics.FirebaseAnalytics;
 
 import org.distorted.config.ConfigActivity;
-import org.distorted.dmesh.ObjectMesh;
-import org.distorted.jsons.ObjectJson;
 import org.distorted.library.main.DistortedLibrary;
 
 import org.distorted.objectlib.main.ObjectControl;
diff --git a/src/main/java/org/distorted/objects/RubikObject.java b/src/main/java/org/distorted/objects/RubikObject.java
index b098b2d0..5d6a38fa 100644
--- a/src/main/java/org/distorted/objects/RubikObject.java
+++ b/src/main/java/org/distorted/objects/RubikObject.java
@@ -51,7 +51,7 @@ public class RubikObject
   private int mNumScramble;
   private int mMeshState;
   private int mExtrasOrdinal;
-  private Drawable mIconD;
+  private Drawable mStaticIconD, mRescaledIconD;
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
@@ -77,7 +77,8 @@ public class RubikObject
     mObjectMinor = JsonWriter.VERSION_OBJECT_MINOR;
     mExtrasMinor = JsonWriter.VERSION_EXTRAS_MINOR;
 
-    mIconD = null;
+    mStaticIconD  = null;
+    mRescaledIconD= null;
     }
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
@@ -86,7 +87,6 @@ public class RubikObject
     {
     android.util.Log.e("D", "new downloaded RubikObject "+object.shortName+" added");
 
-
     mLowerName     = object.shortName;
     mUpperName     = object.shortName.toUpperCase();
     mNumScramble   = object.numScrambles;
@@ -134,17 +134,33 @@ public class RubikObject
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
-  private void createIconDrawable(Activity act)
+  private void createStaticIconDrawable(Activity act)
+    {
+    if( mIconID>0 )
+      {
+      mStaticIconD = act.getDrawable(mIconID);
+      }
+    else
+      {
+      RubikFiles files = RubikFiles.getInstance();
+      Bitmap bmp = files.getIcon(act,mLowerName+".png");
+      mStaticIconD = new BitmapDrawable(act.getResources(), bmp);
+      }
+    }
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+
+  private void createRescaledIconDrawable(Activity act)
     {
     if( mIconID>0 )
       {
-      mIconD = act.getDrawable(mIconID);
+      mRescaledIconD = act.getDrawable(mIconID);
       }
     else
       {
       RubikFiles files = RubikFiles.getInstance();
       Bitmap bmp = files.getIcon(act,mLowerName+".png");
-      mIconD = new BitmapDrawable(act.getResources(), bmp);
+      mRescaledIconD = new BitmapDrawable(act.getResources(), bmp);
       }
     }
 
@@ -216,16 +232,16 @@ public class RubikObject
 
   public void setIconTo(Activity act,ImageButton button)
     {
-    if( mIconD==null ) createIconDrawable(act);
-    button.setBackground(mIconD);
+    if( mStaticIconD==null ) createStaticIconDrawable(act);
+    button.setBackground(mStaticIconD);
     }
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
   public void setIconTo(Activity act,ImageView view)
     {
-    if( mIconD==null ) createIconDrawable(act);
-    view.setImageDrawable(mIconD);
+    if( mRescaledIconD==null ) createRescaledIconDrawable(act);
+    view.setImageDrawable(mRescaledIconD);
     }
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////