From 0c0c1acc3bee09671e40b1bc19798e053f56aaf9 Mon Sep 17 00:00:00 2001 From: "Jason A. Donenfeld" Date: Mon, 4 Jun 2018 18:35:18 +0200 Subject: [PATCH] BaseActivity: support android 5 and 6 when clearing drawable cache Signed-off-by: Jason A. Donenfeld --- .../android/activity/BaseActivity.java | 22 +++++++++++++------ 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/app/src/main/java/com/wireguard/android/activity/BaseActivity.java b/app/src/main/java/com/wireguard/android/activity/BaseActivity.java index 3cce412d..2ebb6e90 100644 --- a/app/src/main/java/com/wireguard/android/activity/BaseActivity.java +++ b/app/src/main/java/com/wireguard/android/activity/BaseActivity.java @@ -120,18 +120,26 @@ public abstract class BaseActivity extends AppCompatActivity implements Topic.Su } @Override - public void onTopicPublished(Topic topic) { + public void onTopicPublished(final Topic topic) { if (topic == Application.getComponent().getThemeChangeTopic()) { try { - Field f = getResources().getClass().getDeclaredField("mResourcesImpl"); - f.setAccessible(true); - Object o = f.get(getResources()); + Field f; + Object o = getResources(); + try { + f = o.getClass().getDeclaredField("mResourcesImpl"); + f.setAccessible(true); + o = f.get(o); + } catch (final Exception ignored) { } f = o.getClass().getDeclaredField("mDrawableCache"); f.setAccessible(true); o = f.get(o); - o.getClass().getMethod("onConfigurationChange", int.class).invoke(o, -1); - } catch (Exception e) { - Log.e(TAG, "Failed to flush icon cache", e); + try { + o.getClass().getMethod("onConfigurationChange", int.class).invoke(o, -1); + } catch (final Exception ignored) { + o.getClass().getMethod("clear").invoke(o); + } + } catch (final Exception e) { + Log.e(TAG, "Failed to flush drawable cache", e); } recreate(); }