Make settings dialog non-closable and survive rotation (#75)

Author: SUPERCILEX

README.md

@@ -7,7 +7,7 @@ Android M or higher.
 
 EasyPermissions is installed by adding the following dependency to your `build.gradle` file:
 
-```java
+```groovy
 dependencies {
     compile 'pub.devrel:easypermissions:0.2.1'
 }
@@ -74,8 +74,7 @@ Optionally, for a finer control, you can have your `Activity` / `Fragment` imple
 the `PermissionCallbacks` interface.
 
 ```java
-public class MainActivity extends AppCompatActivity
-    implements EasyPermissions.PermissionCallbacks {
+public class MainActivity extends AppCompatActivity implements EasyPermissions.PermissionCallbacks {
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -124,8 +123,7 @@ public void onPermissionsDenied(int requestCode, List<String> perms) {
         new AppSettingsDialog.Builder(this, getString(R.string.rationale_ask_again))
                 .setTitle(getString(R.string.title_settings_dialog))
                 .setPositiveButton(getString(R.string.setting))
-                .setNegativeButton(getString(R.string.cancel), null /* click listener */)
-                .setRequestCode(RC_SETTINGS_SCREEN)
+                .setNegativeButton(getString(R.string.cancel))
                 .build()
                 .show();
     }
@@ -135,7 +133,7 @@ public void onPermissionsDenied(int requestCode, List<String> perms) {
 public void onActivityResult(int requestCode, int resultCode, Intent data) {
     super.onActivityResult(requestCode, resultCode, data);
 
-    if (requestCode == RC_SETTINGS_SCREEN) {
+    if (requestCode == AppSettingsDialog.DEFAULT_SETTINGS_REQ_CODE) {
         // Do something after user returned from app settings screen, like showing a Toast.
         Toast.makeText(this, R.string.returned_from_app_settings_to_activity, Toast.LENGTH_SHORT)
                 .show();

app/src/main/java/pub/devrel/easypermissions/sample/MainActivity.java

@@ -36,7 +36,6 @@ public class MainActivity extends AppCompatActivity implements EasyPermissions.P
 
     private static final int RC_CAMERA_PERM = 123;
     private static final int RC_LOCATION_CONTACTS_PERM = 124;
-    private static final int RC_SETTINGS_SCREEN = 125;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -60,17 +59,6 @@ public void onClick(View v) {
         });
     }
 
-    @Override
-    public void onActivityResult(int requestCode, int resultCode, Intent data) {
-        super.onActivityResult(requestCode, resultCode, data);
-
-        if (requestCode == RC_SETTINGS_SCREEN) {
-            // Do something after user returned from app settings screen, like showing a Toast.
-            Toast.makeText(this, R.string.returned_from_app_settings_to_activity, Toast.LENGTH_SHORT)
-                    .show();
-        }
-    }
-
     @AfterPermissionGranted(RC_CAMERA_PERM)
     public void cameraTask() {
         if (EasyPermissions.hasPermissions(this, Manifest.permission.CAMERA)) {
@@ -119,10 +107,20 @@ public void onPermissionsDenied(int requestCode, List<String> perms) {
             new AppSettingsDialog.Builder(this, getString(R.string.rationale_ask_again))
                     .setTitle(getString(R.string.title_settings_dialog))
                     .setPositiveButton(getString(R.string.setting))
-                    .setNegativeButton(getString(R.string.cancel), null /* click listener */)
-                    .setRequestCode(RC_SETTINGS_SCREEN)
+                    .setNegativeButton(getString(R.string.cancel))
                     .build()
                     .show();
         }
     }
+
+    @Override
+    public void onActivityResult(int requestCode, int resultCode, Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+
+        if (requestCode == AppSettingsDialog.DEFAULT_SETTINGS_REQ_CODE) {
+            // Do something after user returned from app settings screen, like showing a Toast.
+            Toast.makeText(this, R.string.returned_from_app_settings_to_activity, Toast.LENGTH_SHORT)
+                    .show();
+        }
+    }
 }

easypermissions/src/main/AndroidManifest.xml

@@ -1,3 +1,14 @@
-<manifest package="com.google.example.easypermissions">
-    <application/>
+<?xml version="1.0" encoding="utf-8"?>
+<manifest
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    package="pub.devrel.easypermissions">
+
+    <application>
+        <activity
+            android:name="pub.devrel.easypermissions.AppSettingsDialogHolderActivity"
+            android:exported="false"
+            android:label=""
+            android:theme="@style/EasyPermissions.Transparent"/>
+    </application>
+
 </manifest>