From 006277bdf2e8f7c644e50a7d5c462666ec0dce95 Mon Sep 17 00:00:00 2001 From: anasofiagribeiro Date: Fri, 24 Jul 2020 15:06:13 +0100 Subject: [PATCH 1/2] Refactor4Green - Cache EP --- .../receiver/TaskerConditionReceiver.java | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/app/src/playstore/java/com/farmerbb/taskbar/receiver/TaskerConditionReceiver.java b/app/src/playstore/java/com/farmerbb/taskbar/receiver/TaskerConditionReceiver.java index 7c4f1833..0456e44c 100644 --- a/app/src/playstore/java/com/farmerbb/taskbar/receiver/TaskerConditionReceiver.java +++ b/app/src/playstore/java/com/farmerbb/taskbar/receiver/TaskerConditionReceiver.java @@ -26,17 +26,23 @@ import com.farmerbb.taskbar.util.U; public final class TaskerConditionReceiver extends BroadcastReceiver { + private Bundle lastbundle = null; + @Override public void onReceive(Context context, Intent intent) { if(U.isExternalAccessDisabled(context)) return; + if (lastbundle.equals(intent.getBundleExtra(com.twofortyfouram.locale.api.Intent.EXTRA_BUNDLE))) { + return; + } + updateValues(intent); + BundleScrubber.scrub(intent); - final Bundle bundle = intent.getBundleExtra(com.twofortyfouram.locale.api.Intent.EXTRA_BUNDLE); - BundleScrubber.scrub(bundle); + BundleScrubber.scrub(lastbundle); - if(PluginBundleManager.isBundleValid(bundle)) { - String action = bundle.getString(PluginBundleManager.BUNDLE_EXTRA_STRING_MESSAGE); + if(PluginBundleManager.isBundleValid(lastbundle)) { + String action = lastbundle.getString(PluginBundleManager.BUNDLE_EXTRA_STRING_MESSAGE); if(action != null) switch(action) { case "tasker_on": @@ -54,4 +60,8 @@ public void onReceive(Context context, Intent intent) { } } } + + private void updateValues(Intent intent) { + lastbundle = intent.getBundleExtra(com.twofortyfouram.locale.api.Intent.EXTRA_BUNDLE); + } } \ No newline at end of file From e315bfc929b693b28ff2e05b5f1f43cbef98ae14 Mon Sep 17 00:00:00 2001 From: anasofiagribeiro Date: Fri, 24 Jul 2020 15:50:35 +0100 Subject: [PATCH 2/2] Refactor4Green - added comment --- .../com/farmerbb/taskbar/receiver/TaskerConditionReceiver.java | 1 + 1 file changed, 1 insertion(+) diff --git a/app/src/playstore/java/com/farmerbb/taskbar/receiver/TaskerConditionReceiver.java b/app/src/playstore/java/com/farmerbb/taskbar/receiver/TaskerConditionReceiver.java index 0456e44c..43585d43 100644 --- a/app/src/playstore/java/com/farmerbb/taskbar/receiver/TaskerConditionReceiver.java +++ b/app/src/playstore/java/com/farmerbb/taskbar/receiver/TaskerConditionReceiver.java @@ -33,6 +33,7 @@ public void onReceive(Context context, Intent intent) { if(U.isExternalAccessDisabled(context)) return; if (lastbundle.equals(intent.getBundleExtra(com.twofortyfouram.locale.api.Intent.EXTRA_BUNDLE))) { + // bundle hasn't changed: we can safely return return; } updateValues(intent);