TnSb/android-calculatorpp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "Request new POST_NOTIFICATIONS permissions"

Browse Source 
This reverts commit 308b5504bd.
This commit is contained in:
Sergey Solovyev 2023-09-18 09:37:07 +02:00
parent 308b5504bd
commit fb0edf5b13
2 changed files with 8 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/src/main/AndroidManifest.xml
View File

@ -5,7 +5,6 @@
<uses-permission android:name="android.permission.INTERNET" /> <uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" /> <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="com.android.vending.BILLING" />
<uses-permission android:name="android.permission.VIBRATE" /> <uses-permission android:name="android.permission.VIBRATE" />

45
app/src/main/java/org/solovyev/android/calculator/floating/FloatingCalculatorActivity.java
View File

@ -22,17 +22,15 @@
package org.solovyev.android.calculator.floating; package org.solovyev.android.calculator.floating;
import android.Manifest;
import android.annotation.TargetApi; import android.annotation.TargetApi;
import android.content.DialogInterface; import android.content.DialogInterface;
import android.content.pm.PackageManager;
import android.os.Build; import android.os.Build;
import android.os.Bundle; import android.os.Bundle;
import android.provider.Settings; import android.provider.Settings;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
import androidx.appcompat.app.AlertDialog; import androidx.appcompat.app.AlertDialog;
import androidx.appcompat.app.AppCompatActivity; import androidx.appcompat.app.AppCompatActivity;
import androidx.core.app.ActivityCompat;
import androidx.fragment.app.FragmentActivity; import androidx.fragment.app.FragmentActivity;
import org.solovyev.android.Check; import org.solovyev.android.Check;
import org.solovyev.android.calculator.App; import org.solovyev.android.calculator.App;
@ -41,8 +39,6 @@ import org.solovyev.android.calculator.R;
public class FloatingCalculatorActivity extends AppCompatActivity { public class FloatingCalculatorActivity extends AppCompatActivity {
private static int PERMISSION_REQUEST_CODE = 1;
@TargetApi(Build.VERSION_CODES.M) @TargetApi(Build.VERSION_CODES.M)
public static final class MyFragment extends BaseDialogFragment { public static final class MyFragment extends BaseDialogFragment {
@ -84,44 +80,17 @@ public class FloatingCalculatorActivity extends AppCompatActivity {
protected void onCreate(Bundle savedInstanceState) { protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
if (!FloatingCalculatorView.isOverlayPermissionGranted(this)) { if (FloatingCalculatorView.isOverlayPermissionGranted(this)) {
FloatingCalculatorService.show(this);
finish();
return;
}
Check.isTrue(Build.VERSION.SDK_INT >= Build.VERSION_CODES.M); Check.isTrue(Build.VERSION.SDK_INT >= Build.VERSION_CODES.M);
if (savedInstanceState == null) { if (savedInstanceState == null) {
App.showDialog(new MyFragment(), "no-overlay-permission-dialog", App.showDialog(new MyFragment(), "no-overlay-permission-dialog",
getSupportFragmentManager()); getSupportFragmentManager());
} }
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);
}
}
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;
}
} }