Merge pull request #12253 from Profpatsch/popup-overlay-alert-dialog

Overlay Permission: display explanatory dialog for Android > R

Author: TobiGr

app/src/main/java/org/schabi/newpipe/util/PermissionHelper.java

@@ -9,9 +9,11 @@
 import android.net.Uri;
 import android.os.Build;
 import android.provider.Settings;
+import android.text.Html;
 import android.widget.Toast;
 
 import androidx.annotation.RequiresApi;
+import androidx.appcompat.app.AlertDialog;
 import androidx.core.app.ActivityCompat;
 import androidx.core.content.ContextCompat;
 
@@ -113,14 +115,47 @@ public static boolean checkPostNotificationsPermission(final Activity activity,
     @RequiresApi(api = Build.VERSION_CODES.M)
     public static boolean checkSystemAlertWindowPermission(final Context context) {
         if (!Settings.canDrawOverlays(context)) {
-            final Intent i = new Intent(Settings.ACTION_MANAGE_OVERLAY_PERMISSION,
-                    Uri.parse("package:" + context.getPackageName()));
-            i.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-            try {
-                context.startActivity(i);
-            } catch (final ActivityNotFoundException ignored) {
+            if (Build.VERSION.SDK_INT < Build.VERSION_CODES.R) {
+                final Intent i = new Intent(Settings.ACTION_MANAGE_OVERLAY_PERMISSION,
+                        Uri.parse("package:" + context.getPackageName()));
+                i.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+                try {
+                    context.startActivity(i);
+                } catch (final ActivityNotFoundException ignored) {
+                }
+                return false;
+            // from Android R the ACTION_MANAGE_OVERLAY_PERMISSION will only point to the menu,
+            // so let’s add a dialog that points the user to the right setting.
+            } else {
+                final String appName = context.getApplicationInfo()
+                        .loadLabel(context.getPackageManager()).toString();
+                final String title = context.getString(R.string.permission_display_over_apps);
+                final String permissionName =
+                        context.getString(R.string.permission_display_over_apps_permission_name);
+                final String appNameItalic = "<i>" + appName + "</i>";
+                final String permissionNameItalic = "<i>" + permissionName + "</i>";
+                final String message =
+                        context.getString(R.string.permission_display_over_apps_message,
+                                appNameItalic,
+                                permissionNameItalic
+                        );
+                new AlertDialog.Builder(context)
+                        .setTitle(title)
+                        .setMessage(Html.fromHtml(message, Html.FROM_HTML_MODE_COMPACT))
+                        .setPositiveButton("OK", (dialog, which) -> {
+                            // we don’t need the package name here, since it won’t do anything on >R
+                            final Intent intent =
+                                    new Intent(Settings.ACTION_MANAGE_OVERLAY_PERMISSION);
+                            try {
+                                context.startActivity(intent);
+                            } catch (final ActivityNotFoundException ignored) {
+                            }
+                        })
+                        .setCancelable(true)
+                        .show();
+                return false;
             }
-            return false;
+
         } else {
             return true;
         }

app/src/main/res/values/strings.xml

@@ -257,6 +257,8 @@
     <string name="restore_defaults">Restore defaults</string>
     <string name="restore_defaults_confirmation">Do you want to restore defaults?</string>
     <string name="permission_display_over_apps">Give permission to display over other apps</string>
+    <string name="permission_display_over_apps_message">In order to use the Popup Player, please select %1$s in the following Android settings menu and enable %2$s.</string>
+    <string name="permission_display_over_apps_permission_name">“Allow display over other apps”</string>
     <!-- error activity -->
     <string name="error_report_notification_title">NewPipe encountered an error, tap to report</string>
     <string name="error_report_notification_toast">An error occurred, see the notification</string>