Merge pull request #30 from tverona1/misc

Fix loading VectorDrawable icons
tverona1 · Dec 15, 2019 · c74cfd0 · c74cfd0
2 parents dd9d94f + f0838f5
commit c74cfd0
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 6 deletions.
diff --git a/Assets/Plugins/Android/AppInfo.java b/Assets/Plugins/Android/AppInfo.java
@@ -31,6 +31,8 @@
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
 import android.graphics.drawable.BitmapDrawable;
+import android.graphics.drawable.Drawable;
+import android.graphics.Canvas;
 import android.graphics.Color;
 import java.util.List;
 import java.util.LinkedList;
@@ -119,12 +121,26 @@ public boolean is2DApp(int i)
     }
 
     public byte[] getIcon(int i) {
-        BitmapDrawable icon = (BitmapDrawable)this.getPackageManager().getApplicationIcon(installedApps.get(i).app);
-        Bitmap bmp = icon.getBitmap();
-        ByteArrayOutputStream stream = new ByteArrayOutputStream();
-        bmp.compress(Bitmap.CompressFormat.JPEG, 100, stream);
-        byte[] byteArray = stream.toByteArray();
-        return byteArray;
+        try {
+            Drawable drawable = this.getPackageManager().getApplicationIcon(installedApps.get(i).app);
+            Bitmap bmp = null;
+            if (drawable instanceof BitmapDrawable) {
+                bmp = ((BitmapDrawable)drawable).getBitmap();
+            } else {
+                bmp = Bitmap.createBitmap(drawable.getIntrinsicWidth(), drawable.getIntrinsicHeight(), Bitmap.Config.ARGB_8888);
+                final Canvas canvas = new Canvas(bmp);
+                drawable.setBounds(0, 0, canvas.getWidth(), canvas.getHeight());
+                drawable.draw(canvas);
+            }
+            ByteArrayOutputStream stream = new ByteArrayOutputStream();
+            bmp.compress(Bitmap.CompressFormat.JPEG, 100, stream);
+            byte[] byteArray = stream.toByteArray();
+            return byteArray;
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+
+        return null;
     }
 
     public boolean hasUsageStatsPermissions() {

diff --git a/Assets/Scripts/AppEntry.cs b/Assets/Scripts/AppEntry.cs
@@ -106,6 +106,12 @@ public async Task LoadIcon()
 
             Texture2D texture = null;
 
+            if (null == image)
+            {
+                Debug.LogFormat("Error loading icon: Path: {0}, Index: {1}", this.externalIconPath, this.installedApkIndex);
+                return;
+            }
+
             // Set the icon image
             if (imageWidth == 0 || imageHeight == 0)
             {