From 8aab35a70dcd384e5505db263a293a79ef647241 Mon Sep 17 00:00:00 2001 From: "Jason A. Donenfeld" Date: Mon, 4 Jun 2018 16:42:38 +0200 Subject: [PATCH] BaseActivity: invalidate icon cache on Android P Signed-off-by: Jason A. Donenfeld --- .../android/activity/BaseActivity.java | 27 +++++++++---------- .../android/activity/SettingsActivity.java | 3 ++- 2 files changed, 15 insertions(+), 15 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 7b6923f9..3cce412d 100644 --- a/app/src/main/java/com/wireguard/android/activity/BaseActivity.java +++ b/app/src/main/java/com/wireguard/android/activity/BaseActivity.java @@ -121,21 +121,20 @@ public abstract class BaseActivity extends AppCompatActivity implements Topic.Su @Override public void onTopicPublished(Topic topic) { - try { - Field f = getResources().getClass().getDeclaredField("mResourcesImpl"); - f.setAccessible(true); - Object o = f.get(getResources()); - f = o.getClass().getDeclaredField("mDrawableCache"); - f.setAccessible(true); - o = f.get(o); - f = o.getClass().getSuperclass().getDeclaredField("mThemedEntries"); - f.setAccessible(true); - o = f.get(o); - o.getClass().getMethod("clear").invoke(o); - } catch (Exception e) { - Log.e(TAG, "Failed to flush icon cache", e); + if (topic == Application.getComponent().getThemeChangeTopic()) { + try { + Field f = getResources().getClass().getDeclaredField("mResourcesImpl"); + f.setAccessible(true); + Object o = f.get(getResources()); + 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); + } + recreate(); } - recreate(); } @Override diff --git a/app/src/main/java/com/wireguard/android/activity/SettingsActivity.java b/app/src/main/java/com/wireguard/android/activity/SettingsActivity.java index ed7c5457..d7238b96 100644 --- a/app/src/main/java/com/wireguard/android/activity/SettingsActivity.java +++ b/app/src/main/java/com/wireguard/android/activity/SettingsActivity.java @@ -101,7 +101,8 @@ public class SettingsActivity extends AppCompatActivity implements Topic.Subscri @Override public void onTopicPublished(final Topic topic) { - recreate(); + if (topic == Application.getComponent().getThemeChangeTopic()) + recreate(); } @Override