From 3fd7fc33a55f199ef057702b3983df1a6edcafc8 Mon Sep 17 00:00:00 2001 From: utzcoz Date: Sat, 22 Aug 2020 15:03:22 +0800 Subject: [PATCH] Extract action to EXTRA_ACTION Test: ./gradlew test Signed-off-by: utzcoz --- app/src/main/java/com/farmerbb/taskbar/service/PowerMenuService.java | 4 +++- app/src/main/java/com/farmerbb/taskbar/util/Constants.java | 1 + app/src/main/java/com/farmerbb/taskbar/util/U.java | 4 ++-- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/com/farmerbb/taskbar/service/PowerMenuService.java b/app/src/main/java/com/farmerbb/taskbar/service/PowerMenuService.java index d90cea7a..9c9d9231 100644 --- a/app/src/main/java/com/farmerbb/taskbar/service/PowerMenuService.java +++ b/app/src/main/java/com/farmerbb/taskbar/service/PowerMenuService.java @@ -22,6 +22,7 @@ import android.content.Intent; import android.view.accessibility.AccessibilityEvent; import com.farmerbb.taskbar.R; +import com.farmerbb.taskbar.util.Constants; import com.farmerbb.taskbar.util.U; import static com.farmerbb.taskbar.util.Constants.*; @@ -31,8 +32,9 @@ public class PowerMenuService extends AccessibilityService { private BroadcastReceiver powerMenuReceiver = new BroadcastReceiver() { @Override public void onReceive(Context context, Intent intent) { - if(!performGlobalAction(intent.getIntExtra("action", -1))) + if (!performGlobalAction(intent.getIntExtra(EXTRA_ACTION, -1))) { U.showToast(PowerMenuService.this, R.string.tb_lock_device_not_supported); + } } }; diff --git a/app/src/main/java/com/farmerbb/taskbar/util/Constants.java b/app/src/main/java/com/farmerbb/taskbar/util/Constants.java index 5f70a38f..aefceb75 100644 --- a/app/src/main/java/com/farmerbb/taskbar/util/Constants.java +++ b/app/src/main/java/com/farmerbb/taskbar/util/Constants.java @@ -248,4 +248,5 @@ public class Constants { public static final String EXTRA_APPWIDGET_ID = "appWidgetId"; public static final String EXTRA_CELL_ID = "cellId"; public static final String EXTRA_CONTEXT_MENU_FIX = "context_menu_fix"; + public static final String EXTRA_ACTION = "action"; } diff --git a/app/src/main/java/com/farmerbb/taskbar/util/U.java b/app/src/main/java/com/farmerbb/taskbar/util/U.java index 983fa07a..07161a8c 100644 --- a/app/src/main/java/com/farmerbb/taskbar/util/U.java +++ b/app/src/main/java/com/farmerbb/taskbar/util/U.java @@ -245,7 +245,7 @@ public class U { new Handler().postDelayed(() -> { Intent intent = new Intent(ACTION_ACCESSIBILITY_ACTION); - intent.putExtra("action", action); + intent.putExtra(EXTRA_ACTION, action); sendBroadcast(context, intent); try { @@ -258,7 +258,7 @@ public class U { }, 100); } else if(isAccessibilityServiceEnabled) { Intent intent = new Intent(ACTION_ACCESSIBILITY_ACTION); - intent.putExtra("action", action); + intent.putExtra(EXTRA_ACTION, action); sendBroadcast(context, intent); if(onComplete != null) onComplete.run(); -- 2.11.0