From fb0edf5b13c6d75fd6fb450af16da85df157f77e Mon Sep 17 00:00:00 2001
From: Sergey Solovyev <se.solovyev@gmail.com>
Date: Mon, 18 Sep 2023 09:37:07 +0200
Subject: [PATCH] Revert "Request new POST_NOTIFICATIONS permissions"

This reverts commit 308b5504bd65c112a1f02ea27d8ceb71cadc5794.
---
 app/src/main/AndroidManifest.xml              |  1 -
 .../floating/FloatingCalculatorActivity.java  | 47 ++++---------------
 2 files changed, 8 insertions(+), 40 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 20b537d0..3fc57077 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -5,7 +5,6 @@
 
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
-    <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
     <uses-permission android:name="com.android.vending.BILLING" />
     <uses-permission android:name="android.permission.VIBRATE" />
 
diff --git a/app/src/main/java/org/solovyev/android/calculator/floating/FloatingCalculatorActivity.java b/app/src/main/java/org/solovyev/android/calculator/floating/FloatingCalculatorActivity.java
index 135af6db..730b8d52 100644
--- a/app/src/main/java/org/solovyev/android/calculator/floating/FloatingCalculatorActivity.java
+++ b/app/src/main/java/org/solovyev/android/calculator/floating/FloatingCalculatorActivity.java
@@ -22,17 +22,15 @@
 
 package org.solovyev.android.calculator.floating;
 
-import android.Manifest;
 import android.annotation.TargetApi;
 import android.content.DialogInterface;
-import android.content.pm.PackageManager;
 import android.os.Build;
 import android.os.Bundle;
 import android.provider.Settings;
 import androidx.annotation.NonNull;
+
 import androidx.appcompat.app.AlertDialog;
 import androidx.appcompat.app.AppCompatActivity;
-import androidx.core.app.ActivityCompat;
 import androidx.fragment.app.FragmentActivity;
 import org.solovyev.android.Check;
 import org.solovyev.android.calculator.App;
@@ -41,8 +39,6 @@ import org.solovyev.android.calculator.R;
 
 public class FloatingCalculatorActivity extends AppCompatActivity {
 
-    private static int PERMISSION_REQUEST_CODE = 1;
-
     @TargetApi(Build.VERSION_CODES.M)
     public static final class MyFragment extends BaseDialogFragment {
 
@@ -84,44 +80,17 @@ public class FloatingCalculatorActivity extends AppCompatActivity {
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
-        if (!FloatingCalculatorView.isOverlayPermissionGranted(this)) {
-            Check.isTrue(Build.VERSION.SDK_INT >= Build.VERSION_CODES.M);
-            if (savedInstanceState == null) {
-                App.showDialog(new MyFragment(), "no-overlay-permission-dialog",
-                        getSupportFragmentManager());
-            }
+        if (FloatingCalculatorView.isOverlayPermissionGranted(this)) {
+            FloatingCalculatorService.show(this);
+            finish();
             return;
         }
-        tryStartingService(true);
-    }
 
-    @Override
-    public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
-        super.onRequestPermissionsResult(requestCode, permissions, grantResults);
-        if (requestCode == PERMISSION_REQUEST_CODE) {
-            tryStartingService(false);
+        Check.isTrue(Build.VERSION.SDK_INT >= Build.VERSION_CODES.M);
+        if (savedInstanceState == null) {
+            App.showDialog(new MyFragment(), "no-overlay-permission-dialog",
+                    getSupportFragmentManager());
         }
     }
 
-    private void tryStartingService(boolean requirePermission) {
-        if (requirePermission && !requestNotificationPermission()) return;
-
-        FloatingCalculatorService.show(this);
-        finish();
-    }
-
-    private boolean requestNotificationPermission() {
-        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.TIRAMISU) return true;
-        final String permission = Manifest.permission.POST_NOTIFICATIONS;
-        if (ActivityCompat.checkSelfPermission(this, permission) == PackageManager.PERMISSION_GRANTED)
-            return true;
-
-        // Notification permission is not essential and if the user hasn't granted it, let's show the floating calculator
-        // anyway.
-        if (ActivityCompat.shouldShowRequestPermissionRationale(this, permission))
-            return true;
-
-        requestPermissions(new String[]{permission}, PERMISSION_REQUEST_CODE);
-        return false;
-    }
 }