From 12f910c32ddd280109dfa1b33a3cbeacac0d7ac3 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Wed, 30 Jun 2021 03:57:34 +0500
Subject: [PATCH] Move Termux app specific logic out of PermissionUtils

---
 .../main/java/com/termux/app/TermuxService.java  |  7 ++++++-
 app/src/main/res/values/strings.xml              |  5 +++++
 .../termux/shared/packages/PermissionUtils.java  | 16 +++++-----------
 termux-shared/src/main/res/values/strings.xml    |  1 -
 4 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/app/src/main/java/com/termux/app/TermuxService.java b/app/src/main/java/com/termux/app/TermuxService.java
index d79f8e5c..fe0b9a5b 100644
--- a/app/src/main/java/com/termux/app/TermuxService.java
+++ b/app/src/main/java/com/termux/app/TermuxService.java
@@ -640,8 +640,13 @@ public final class TermuxService extends Service implements TermuxTask.TermuxTas
         // For android >= 10, apps require Display over other apps permission to start foreground activities
         // from background (services). If it is not granted, then TermuxSessions that are started will
         // show in Termux notification but will not run until user manually clicks the notification.
-        if (PermissionUtils.validateDisplayOverOtherAppsPermissionForPostAndroid10(this)) {
+        if (PermissionUtils.validateDisplayOverOtherAppsPermissionForPostAndroid10(this, true)) {
             TermuxActivity.startTermuxActivity(this);
+        } else {
+            TermuxAppSharedPreferences preferences = TermuxAppSharedPreferences.build(this);
+            if (preferences == null) return;
+            if (preferences.arePluginErrorNotificationsEnabled())
+                Logger.showToast(this, this.getString(R.string.error_display_over_other_apps_permission_not_granted), true);
         }
     }
 
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index c226924c..5f396302 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -91,6 +91,11 @@
 
 
 
+    <!-- TermuxService -->
+    <string name="error_display_over_other_apps_permission_not_granted">&TERMUX_APP_NAME; requires \"Display over other apps\" permission to start terminal sessions from background on Android >= 10. Grants it from Settings -> Apps -> &TERMUX_APP_NAME; -> Advanced</string>
+
+
+
     <!-- Termux RunCommandService -->
     <string name="error_run_command_service_invalid_intent_action">Invalid intent action to RunCommandService: `%1$s`</string>
     <string name="error_run_command_service_mandatory_extra_missing">Mandatory extra missing to RunCommandService: \"%1$s\"</string>
diff --git a/termux-shared/src/main/java/com/termux/shared/packages/PermissionUtils.java b/termux-shared/src/main/java/com/termux/shared/packages/PermissionUtils.java
index ddd36b7a..6311ed24 100644
--- a/termux-shared/src/main/java/com/termux/shared/packages/PermissionUtils.java
+++ b/termux-shared/src/main/java/com/termux/shared/packages/PermissionUtils.java
@@ -13,9 +13,7 @@ import android.provider.Settings;
 import androidx.core.content.ContextCompat;
 
 import com.termux.shared.R;
-import com.termux.shared.termux.TermuxConstants;
 import com.termux.shared.logger.Logger;
-import com.termux.shared.settings.preferences.TermuxAppSharedPreferences;
 
 import java.util.Arrays;
 
@@ -81,20 +79,16 @@ public class PermissionUtils {
         context.startActivityForResult(intent, requestCode);
     }
 
-    public static boolean validateDisplayOverOtherAppsPermissionForPostAndroid10(Context context) {
+    public static boolean validateDisplayOverOtherAppsPermissionForPostAndroid10(Context context, boolean logResults) {
         if (Build.VERSION.SDK_INT < Build.VERSION_CODES.Q) return true;
         
         if (!PermissionUtils.checkDisplayOverOtherAppsPermission(context)) {
-            Logger.logWarn(LOG_TAG, TermuxConstants.TERMUX_APP_NAME + " App does not have Display over other apps (SYSTEM_ALERT_WINDOW) permission");
-
-            TermuxAppSharedPreferences preferences = TermuxAppSharedPreferences.build(context);
-            if (preferences == null) return false;
-
-            if (preferences.arePluginErrorNotificationsEnabled())
-                Logger.showToast(context, context.getString(R.string.error_display_over_other_apps_permission_not_granted), true);
+            if (logResults)
+                Logger.logWarn(LOG_TAG, context.getPackageName() + " does not have Display over other apps (SYSTEM_ALERT_WINDOW) permission");
             return false;
         } else {
-            Logger.logDebug(LOG_TAG, TermuxConstants.TERMUX_APP_NAME + " App already has Display over other apps (SYSTEM_ALERT_WINDOW) permission");
+            if (logResults)
+                Logger.logDebug(LOG_TAG, context.getPackageName() + " already has Display over other apps (SYSTEM_ALERT_WINDOW) permission");
             return true;
         }
     }
diff --git a/termux-shared/src/main/res/values/strings.xml b/termux-shared/src/main/res/values/strings.xml
index 21a85046..b6efd5c5 100644
--- a/termux-shared/src/main/res/values/strings.xml
+++ b/termux-shared/src/main/res/values/strings.xml
@@ -25,7 +25,6 @@
 
     <!-- PermissionUtils -->
     <string name="message_sudo_please_grant_permissions">Please grant permissions on next screen</string>
-    <string name="error_display_over_other_apps_permission_not_granted">&TERMUX_APP_NAME; requires \"Display over other apps\" permission to start terminal sessions from background on Android >= 10. Grants it from Settings -> Apps -> &TERMUX_APP_NAME; -> Advanced</string>