From c0a3a6c54f10023db927fd8475851a69b77fe83a Mon Sep 17 00:00:00 2001 From: gdlbo <41114720+gdlbo@users.noreply.github.com> Date: Fri, 24 Jun 2022 19:41:08 +0300 Subject: [PATCH] getDrawableFromUrl fix --- .../vtosters/lite/ui/fragments/VTSettings.java | 4 ++-- .../java/ru/vtosters/lite/utils/Globals.java | 18 +++++++++++++++++- 2 files changed, 19 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/ru/vtosters/lite/ui/fragments/VTSettings.java b/app/src/main/java/ru/vtosters/lite/ui/fragments/VTSettings.java index e6a8afe11..1053fc301 100644 --- a/app/src/main/java/ru/vtosters/lite/ui/fragments/VTSettings.java +++ b/app/src/main/java/ru/vtosters/lite/ui/fragments/VTSettings.java @@ -5,7 +5,7 @@ import static ru.vtosters.lite.f0x1d.VTVerifications.vtverif; import static ru.vtosters.lite.utils.About.getBuildNumber; import static ru.vtosters.lite.utils.About.getCommitLink; import static ru.vtosters.lite.utils.CacheUtils.humanReadableByteCountBin; -import static ru.vtosters.lite.utils.Globals.drawableFromUrl; +import static ru.vtosters.lite.utils.Globals.getAvatarDrawable; import static ru.vtosters.lite.utils.Globals.edit; import static ru.vtosters.lite.utils.Globals.getIdentifier; import static ru.vtosters.lite.utils.Globals.getPrefsValue; @@ -117,7 +117,7 @@ public class VTSettings extends MaterialPreferenceToolbarFragment{ int vtosterXml = getIdentifier("empty", "xml"); this.addPreferencesFromResource(vtosterXml); - PreferencesUtil.addPreferenceDrawable(this, "", "Аккаунты", getUsername() + (hasVerification() ? Globals.getString("thanksfordonate") : Globals.getString("getdonate")), drawableFromUrl(getUserPhoto()), preference -> { + PreferencesUtil.addPreferenceDrawable(this, "", "Аккаунты", getUsername() + (hasVerification() ? Globals.getString("thanksfordonate") : Globals.getString("getdonate")), getAvatarDrawable(getUserPhoto()), preference -> { AuthBridge.logout(); restartApplication(); return false; diff --git a/app/src/main/java/ru/vtosters/lite/utils/Globals.java b/app/src/main/java/ru/vtosters/lite/utils/Globals.java index 3c9dc7899..fd84273fb 100644 --- a/app/src/main/java/ru/vtosters/lite/utils/Globals.java +++ b/app/src/main/java/ru/vtosters/lite/utils/Globals.java @@ -138,8 +138,24 @@ public class Globals{ return extendedUserProfile.a; } + public static Drawable getDrawableFromUrl(String url){ + try { + URL aryURI = new URL(url); + StrictMode.ThreadPolicy policy = new StrictMode.ThreadPolicy.Builder().permitAll().build(); + StrictMode.setThreadPolicy(policy); + + URLConnection conn = aryURI.openConnection(); + InputStream is = conn.getInputStream(); + Bitmap bmp = BitmapFactory.decodeStream(is); + + return new BitmapDrawable(getResources(), bmp); + } catch (Exception e) { + return null; + } + } + @SuppressWarnings("deprecation") - public static Drawable drawableFromUrl(String url){ + public static Drawable getAvatarDrawable(String url){ try { URL aryURI = new URL(url); StrictMode.ThreadPolicy policy = new StrictMode.ThreadPolicy.Builder().permitAll().build();