No need for homeActivityUIhost flag to be a function

diff --git a/app/src/main/java/com/farmerbb/taskbar/activity/HomeActivityDelegate.java b/app/src/main/java/com/farmerbb/taskbar/activity/HomeActivityDelegate.java
index 0e1876e..0a617cd 100644 (file)
--- a/app/src/main/java/com/farmerbb/taskbar/activity/HomeActivityDelegate.java
+++ b/app/src/main/java/com/farmerbb/taskbar/activity/HomeActivityDelegate.java
@@ -274,7 +274,7 @@ public class HomeActivityDelegate extends AppCompatActivity implements UIHost {
 
         lbm.registerReceiver(freeformToggleReceiver, intentFilter);
 
-        if(FeatureFlags.homeActivityUIHost())
+        if(FeatureFlags.homeActivityUIHost)
             lbm.registerReceiver(restartReceiver, new IntentFilter("com.farmerbb.taskbar.RESTART"));
 
         if(U.isDesktopIconsEnabled(this)) {
@@ -363,7 +363,7 @@ public class HomeActivityDelegate extends AppCompatActivity implements UIHost {
                     null);
         }
 
-        if(FeatureFlags.homeActivityUIHost()) {
+        if(FeatureFlags.homeActivityUIHost) {
             // Stop any currently running services and switch to using HomeActivityDelegate as UI host
             stopService(new Intent(this, TaskbarService.class));
             stopService(new Intent(this, StartMenuService.class));
@@ -406,7 +406,7 @@ public class HomeActivityDelegate extends AppCompatActivity implements UIHost {
             LauncherHelper.getInstance().setOnHomeScreen(false);
             LocalBroadcastManager.getInstance(this).sendBroadcast(new Intent("com.farmerbb.taskbar.TEMP_HIDE_TASKBAR"));
 
-            if(FeatureFlags.homeActivityUIHost()) {
+            if(FeatureFlags.homeActivityUIHost) {
                 if(taskbarController != null) taskbarController.onDestroyHost(this);
                 if(startMenuController != null) startMenuController.onDestroyHost(this);
                 if(dashboardController != null) dashboardController.onDestroyHost(this);
@@ -446,7 +446,7 @@ public class HomeActivityDelegate extends AppCompatActivity implements UIHost {
         lbm.unregisterReceiver(forceTaskbarStartReceiver);
         lbm.unregisterReceiver(freeformToggleReceiver);
 
-        if(FeatureFlags.homeActivityUIHost())
+        if(FeatureFlags.homeActivityUIHost)
             lbm.unregisterReceiver(restartReceiver);
 
         if(U.isDesktopIconsEnabled(this)) {
@@ -474,7 +474,7 @@ public class HomeActivityDelegate extends AppCompatActivity implements UIHost {
     private void killHomeActivity() {
         LauncherHelper.getInstance().setOnHomeScreen(false);
 
-        if(FeatureFlags.homeActivityUIHost()) {
+        if(FeatureFlags.homeActivityUIHost) {
             if(taskbarController != null) taskbarController.onDestroyHost(this);
             if(startMenuController != null) startMenuController.onDestroyHost(this);
             if(dashboardController != null) dashboardController.onDestroyHost(this);

diff --git a/app/src/main/java/com/farmerbb/taskbar/util/FeatureFlags.java b/app/src/main/java/com/farmerbb/taskbar/util/FeatureFlags.java
index bab3299..d807c88 100644 (file)
--- a/app/src/main/java/com/farmerbb/taskbar/util/FeatureFlags.java
+++ b/app/src/main/java/com/farmerbb/taskbar/util/FeatureFlags.java
@@ -19,7 +19,5 @@ public class FeatureFlags {
 
     private FeatureFlags() {}
 
-    public static boolean homeActivityUIHost() {
-        return false;
-    }
+    public static boolean homeActivityUIHost = false;
 }
\ No newline at end of file

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 6937451..fab9e31 100644 (file)
--- a/app/src/main/java/com/farmerbb/taskbar/util/U.java
+++ b/app/src/main/java/com/farmerbb/taskbar/util/U.java
@@ -915,7 +915,7 @@ public class U {
 
     public static boolean isServiceRunning(Context context, Class<? extends Service> cls) {
         if(LauncherHelper.getInstance().isOnHomeScreen()
-                && FeatureFlags.homeActivityUIHost()
+                && FeatureFlags.homeActivityUIHost
                 && (cls.equals(TaskbarService.class)
                 || cls.equals(StartMenuService.class)
                 || cls.equals(DashboardService.class)))
@@ -958,7 +958,7 @@ public class U {
 
     @TargetApi(Build.VERSION_CODES.M)
     public static boolean canDrawOverlays(Context context, boolean forHomeScreen) {
-        return (forHomeScreen && FeatureFlags.homeActivityUIHost() && !canBootToFreeform(context))
+        return (forHomeScreen && FeatureFlags.homeActivityUIHost && !canBootToFreeform(context))
                 || Build.VERSION.SDK_INT < Build.VERSION_CODES.M
                 || Settings.canDrawOverlays(context);
     }