commit 9eeb9c88022113bdbd650bdeb6d9e6a63cf983d2
Author: Leszek Koltunski <leszek@koltunski.pl>
Date:   Wed Feb 2 17:00:02 2022 +0100

    Make sure we always display some icon in the Popup dialog, even if we fail to download one (improvement)

diff --git a/src/main/java/org/distorted/main/RubikActivity.java b/src/main/java/org/distorted/main/RubikActivity.java
index 29e498bc..563894b6 100644
--- a/src/main/java/org/distorted/main/RubikActivity.java
+++ b/src/main/java/org/distorted/main/RubikActivity.java
@@ -65,7 +65,7 @@ import static org.distorted.objectlib.main.TwistyObject.MESH_NICE;
 
 public class RubikActivity extends AppCompatActivity
 {
-    public static final boolean SHOW_DOWNLOADED_DEBUG = false;
+    public static final boolean SHOW_DOWNLOADED_DEBUG = true;
 
     public static final float PADDING             = 0.01f;
     public static final float SMALL_MARGIN        = 0.004f;
diff --git a/src/main/java/org/distorted/objects/RubikObject.java b/src/main/java/org/distorted/objects/RubikObject.java
index 4492aab8..f1d66079 100644
--- a/src/main/java/org/distorted/objects/RubikObject.java
+++ b/src/main/java/org/distorted/objects/RubikObject.java
@@ -102,17 +102,7 @@ public class RubikObject
     mMeshID        =  0;
     mJsonID        = -1;
     mExtrasID      = -1;
-
-    if( object.icon )  // icon successfully downloaded
-      {
-      if( SHOW_DOWNLOADED_DEBUG ) android.util.Log.e("D", object.shortName+" : icon downloaded");
-      mIconID = -1;  // i.e. look for the icon in local per-app storage
-      }
-    else
-      {
-      if( SHOW_DOWNLOADED_DEBUG ) android.util.Log.e("D", object.shortName+" : icon failed to download");
-      mIconID = R.drawable.unknown_icon;
-      }
+    mIconID        = -1;
     }
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
@@ -156,7 +146,8 @@ public class RubikObject
       {
       RubikFiles files = RubikFiles.getInstance();
       Bitmap bmp = files.getIcon(act,mLowerName+".png");
-      mStaticIconD = new BitmapDrawable(act.getResources(), bmp);
+      if( bmp==null ) mStaticIconD = act.getDrawable(R.drawable.unknown_icon);
+      else            mStaticIconD = new BitmapDrawable(act.getResources(), bmp);
       }
     }
 
@@ -172,7 +163,8 @@ public class RubikObject
       {
       RubikFiles files = RubikFiles.getInstance();
       Bitmap bmp = files.getIcon(act,mLowerName+".png");
-      mRescaledIconD = new BitmapDrawable(act.getResources(), bmp);
+      if( bmp==null ) mRescaledIconD = act.getDrawable(R.drawable.unknown_icon);
+      else            mRescaledIconD = new BitmapDrawable(act.getResources(), bmp);
       }
     }