Extract SHOW_TASKBAR to TaskbarIntent constant

Signed-off-by: utzcoz <utzcoz@outlook.com>

diff --git a/app/src/main/java/com/farmerbb/taskbar/activity/AbstractSelectAppActivity.java b/app/src/main/java/com/farmerbb/taskbar/activity/AbstractSelectAppActivity.java
index 79427a1..6b7fbf2 100644 (file)
--- a/app/src/main/java/com/farmerbb/taskbar/activity/AbstractSelectAppActivity.java
+++ b/app/src/main/java/com/farmerbb/taskbar/activity/AbstractSelectAppActivity.java
@@ -90,12 +90,15 @@ public abstract class AbstractSelectAppActivity extends AppCompatActivity {
 
     @Override
     public void finish() {
-        if(appListGenerator != null && appListGenerator.getStatus() == AsyncTask.Status.RUNNING)
+        if (appListGenerator != null && appListGenerator.getStatus() == AsyncTask.Status.RUNNING) {
             appListGenerator.cancel(true);
+        }
 
-        if(!isCollapsed)
-            LocalBroadcastManager.getInstance(this).sendBroadcast(new Intent("com.farmerbb.taskbar.SHOW_TASKBAR"));
-
+        if (!isCollapsed) {
+            LocalBroadcastManager
+                    .getInstance(this)
+                    .sendBroadcast(new Intent(TaskbarIntent.ACTION_SHOW_TASKBAR));
+        }
         super.finish();
     }
 

diff --git a/app/src/main/java/com/farmerbb/taskbar/activity/InvisibleActivityFreeform.java b/app/src/main/java/com/farmerbb/taskbar/activity/InvisibleActivityFreeform.java
index 5f51a8d..4efbff2 100644 (file)
--- a/app/src/main/java/com/farmerbb/taskbar/activity/InvisibleActivityFreeform.java
+++ b/app/src/main/java/com/farmerbb/taskbar/activity/InvisibleActivityFreeform.java
@@ -166,11 +166,15 @@ public class InvisibleActivityFreeform extends Activity {
         super.onResume();
 
         // Show the taskbar when activity is resumed (no other freeform windows are active)
-        if(showTaskbar)
-            LocalBroadcastManager.getInstance(this).sendBroadcast(new Intent("com.farmerbb.taskbar.SHOW_TASKBAR"));
+        if (showTaskbar) {
+            LocalBroadcastManager
+                    .getInstance(this)
+                    .sendBroadcast(new Intent(TaskbarIntent.ACTION_SHOW_TASKBAR));
+        }
 
-        if(!isInMultiWindowMode() && !initialLaunch)
+        if (!isInMultiWindowMode() && !initialLaunch) {
             reallyFinish();
+        }
 
         initialLaunch = false;
     }
@@ -224,13 +228,22 @@ public class InvisibleActivityFreeform extends Activity {
                 pref.edit().putBoolean("taskbar_active", false).apply();
 
             // Show the taskbar when activity is started
-            if(showTaskbar)
-                new Handler().postDelayed(() -> LocalBroadcastManager.getInstance(this).sendBroadcast(new Intent("com.farmerbb.taskbar.SHOW_TASKBAR")), 100);
+            if (showTaskbar) {
+                new Handler().postDelayed(() ->
+                        LocalBroadcastManager
+                                .getInstance(this)
+                                .sendBroadcast(new Intent(TaskbarIntent.ACTION_SHOW_TASKBAR)),
+                        100
+                );
+            }
         }
 
         // Show the taskbar when activity is started
-        if(showTaskbar)
-            LocalBroadcastManager.getInstance(this).sendBroadcast(new Intent("com.farmerbb.taskbar.SHOW_TASKBAR"));
+        if (showTaskbar) {
+            LocalBroadcastManager
+                    .getInstance(this)
+                    .sendBroadcast(new Intent(TaskbarIntent.ACTION_SHOW_TASKBAR));
+        }
     }
 
     @Override

diff --git a/app/src/main/java/com/farmerbb/taskbar/activity/SelectAppActivity.java b/app/src/main/java/com/farmerbb/taskbar/activity/SelectAppActivity.java
index 9536fb5..6c3155a 100644 (file)
--- a/app/src/main/java/com/farmerbb/taskbar/activity/SelectAppActivity.java
+++ b/app/src/main/java/com/farmerbb/taskbar/activity/SelectAppActivity.java
@@ -151,9 +151,11 @@ public class SelectAppActivity extends AppCompatActivity {
         if(appListGenerator != null && appListGenerator.getStatus() == AsyncTask.Status.RUNNING)
             appListGenerator.cancel(true);
 
-        if(!isCollapsed)
-            LocalBroadcastManager.getInstance(this).sendBroadcast(new Intent("com.farmerbb.taskbar.SHOW_TASKBAR"));
-
+        if (!isCollapsed) {
+            LocalBroadcastManager
+                    .getInstance(this)
+                    .sendBroadcast(new Intent(TaskbarIntent.ACTION_SHOW_TASKBAR));
+        }
         super.finish();
     }
 

diff --git a/app/src/main/java/com/farmerbb/taskbar/content/TaskbarIntent.java b/app/src/main/java/com/farmerbb/taskbar/content/TaskbarIntent.java
index 39d370d..0d73511 100644 (file)
--- a/app/src/main/java/com/farmerbb/taskbar/content/TaskbarIntent.java
+++ b/app/src/main/java/com/farmerbb/taskbar/content/TaskbarIntent.java
@@ -22,6 +22,7 @@ public class TaskbarIntent {
     }
 
     public static final String ACTION_HIDE_TASKBAR = "com.farmerbb.taskbar.HIDE_TASKBAR";
+    public static final String ACTION_SHOW_TASKBAR = "com.farmerbb.taskbar.SHOW_TASKBAR";
     public static final String ACTION_TEMP_HIDE_TASKBAR = "com.farmerbb.taskbar.TEMP_HIDE_TASKBAR";
     public static final String ACTION_TEMP_SHOW_TASKBAR = "com.farmerbb.taskbar.TEMP_SHOW_TASKBAR";
     public static final String ACTION_HIDE_START_MENU = "com.farmerbb.taskbar.HIDE_START_MENU";

diff --git a/app/src/main/java/com/farmerbb/taskbar/ui/TaskbarController.java b/app/src/main/java/com/farmerbb/taskbar/ui/TaskbarController.java
index dbdabd4..bd04260 100644 (file)
--- a/app/src/main/java/com/farmerbb/taskbar/ui/TaskbarController.java
+++ b/app/src/main/java/com/farmerbb/taskbar/ui/TaskbarController.java
@@ -639,7 +639,7 @@ public class TaskbarController implements UIController {
         lbm.unregisterReceiver(startMenuAppearReceiver);
         lbm.unregisterReceiver(startMenuDisappearReceiver);
 
-        lbm.registerReceiver(showReceiver, new IntentFilter("com.farmerbb.taskbar.SHOW_TASKBAR"));
+        lbm.registerReceiver(showReceiver, new IntentFilter(TaskbarIntent.ACTION_SHOW_TASKBAR));
         lbm.registerReceiver(hideReceiver, new IntentFilter(TaskbarIntent.ACTION_HIDE_TASKBAR));
         lbm.registerReceiver(
                 tempShowReceiver,

diff --git a/app/src/playstore/java/com/farmerbb/taskbar/receiver/TaskerActionReceiver.java b/app/src/playstore/java/com/farmerbb/taskbar/receiver/TaskerActionReceiver.java
index 713bdad..be5256c 100644 (file)
--- a/app/src/playstore/java/com/farmerbb/taskbar/receiver/TaskerActionReceiver.java
+++ b/app/src/playstore/java/com/farmerbb/taskbar/receiver/TaskerActionReceiver.java
@@ -61,7 +61,7 @@ public final class TaskerActionReceiver extends BroadcastReceiver {
             case "tasker_off":
                 return new Intent("com.farmerbb.taskbar.QUIT");
             case "show_taskbar":
-                return new Intent("com.farmerbb.taskbar.SHOW_TASKBAR");
+                return new Intent(TaskbarIntent.ACTION_SHOW_TASKBAR);
             case "hide_taskbar":
                 return new Intent(TaskbarIntent.ACTION_HIDE_TASKBAR);
             case "toggle_start_menu":