From 4d1db81b0436276f0f0b2dd7c8cfd21a50278c1c Mon Sep 17 00:00:00 2001 From: Duy Tran Khanh Date: Mon, 1 Mar 2021 19:07:14 +0700 Subject: [PATCH] Temporary fix NetworkOnMainThreadException Offline acc currently become no avatar --- .../java/net/kdt/pojavlaunch/PojavLoginActivity.java | 11 ++++++----- .../net/kdt/pojavlaunch/value/MinecraftAccount.java | 2 +- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/PojavLoginActivity.java b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/PojavLoginActivity.java index b3b2a3f03..4798d70ae 100644 --- a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/PojavLoginActivity.java +++ b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/PojavLoginActivity.java @@ -654,12 +654,13 @@ public class PojavLoginActivity extends BaseActivity String accNameStr = s.substring(0, s.length() - 5); String skinFaceBase64 = MinecraftAccount.load(accNameStr).skinFaceBase64; - byte[] faceIconBytes = Base64.decode(skinFaceBase64, Base64.DEFAULT); - Bitmap bitmap = BitmapFactory.decodeByteArray(faceIconBytes, 0, faceIconBytes.length); + if (skinFaceBase64 != null) { + byte[] faceIconBytes = Base64.decode(skinFaceBase64, Base64.DEFAULT); + Bitmap bitmap = BitmapFactory.decodeByteArray(faceIconBytes, 0, faceIconBytes.length); - accountName.setCompoundDrawablesWithIntrinsicBounds(new BitmapDrawable(getResources(), - bitmap), - null, null, null); + accountName.setCompoundDrawablesWithIntrinsicBounds(new BitmapDrawable(getResources(), + bitmap), null, null, null); + } accountName.setText(accNameStr); accountListLayout.addView(child); diff --git a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/value/MinecraftAccount.java b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/value/MinecraftAccount.java index 422afe521..1b0dbff2a 100644 --- a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/value/MinecraftAccount.java +++ b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/value/MinecraftAccount.java @@ -72,7 +72,7 @@ public class MinecraftAccount acc.msaRefreshToken = "0"; } if (acc.skinFaceBase64 == null) { - acc.updateSkinFace("MHF_Steve"); + // acc.updateSkinFace("MHF_Steve"); } return acc; } catch(IOException e) {