修复申请的权限不在 AndroidManifest 配置文件中时，

仍然显示 RationalMessage 对话框的问题

Author: hupei

README.md

@@ -10,18 +10,21 @@
 
 #使用Gradle构建时添加一下依赖即可:
 ```javascript
-compile 'com.mylhyl:acp:1.0.1'
+compile 'com.mylhyl:acp:1.0.2'
 ```
 
 # 使用说明
 ```java
         Acp.getInstance(this).request(new AcpOptions.Builder()
-                        .setPermissions(Manifest.permission.WRITE_EXTERNAL_STORAGE, Manifest.permission.READ_PHONE_STATE)
-//                .setDeniedMessage()
-//                .setDeniedCloseBtn()
-//                .setDeniedSettingBtn()
-//                .setRationalMessage()
-//                .setRationalBtn()
+                        .setPermissions(Manifest.permission.WRITE_EXTERNAL_STORAGE
+                                , Manifest.permission.READ_PHONE_STATE
+                                , Manifest.permission.SEND_SMS)
+                /*以下为自定义提示语、按钮文字
+                .setDeniedMessage()
+                .setDeniedCloseBtn()
+                .setDeniedSettingBtn()
+                .setRationalMessage()
+                .setRationalBtn()*/
                         .build(),
                 new AcpListener() {
                     @Override
@@ -42,3 +45,7 @@ compile 'com.mylhyl:acp:1.0.1'
 ### [下载APK体验](/preview/sample-debug.apk)
 
 ## QQ交流群:435173211
+
+#### 版本日志
+> 1.0.1 修改 minSdkVersion 14
+> 1.0.2 修复申请的权限不在`AndroidManifest.xml`配置文件时，中仍然显示`RationalMessage`对话框的问题

acp/build.gradle

@@ -1,9 +1,10 @@
 apply plugin: 'com.android.library'
 apply plugin: 'com.github.dcendents.android-maven'
 apply plugin: 'com.jfrog.bintray'
+
 android {
     compileSdkVersion 23
-    buildToolsVersion "23.0.2"
+    buildToolsVersion "23.0.3"
     defaultConfig {
         minSdkVersion 14
         targetSdkVersion 23
@@ -16,41 +17,41 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
-    productFlavors {
+    lintOptions {
+        abortOnError false
     }
 }
-// Git仓库的主页
+
 def siteUrl = 'https://github.com/mylhyl/AndroidAcp'
-// Git仓库的url
 def gitUrl = 'https://github.com/mylhyl/AndroidAcp.git'
-//唯一包名
+
 group = "com.mylhyl"
-//版本号
-version = "1.0.1"
+version = "1.0.2"
 
 install {
     repositories.mavenInstaller {
         pom {
             project {
                 packaging 'aar'
                 artifactId 'acp'
-                name 'Simplify Android 6.0 complex permissions operation' //添加项目描述
+                name 'Simplify Android 6.0 complex permissions operation'
                 url siteUrl
-                //设置开源证书信息
+
                 licenses {
                     license {
                         name 'The Apache Software License, Version 2.0'
                         url 'http://www.apache.org/licenses/LICENSE-2.0.txt'
                     }
                 }
-                //填写开发者基本信息
+
                 developers {
                     developer {
                         id 'mylhyl'
                         name 'mylhylAndroid'
                         email '[email protected]'
                     }
                 }
+
                 scm {
                     connection gitUrl
                     developerConnection gitUrl
@@ -81,25 +82,22 @@ artifacts {
     archives javadocJar
     archives sourcesJar
 }
-//配置上传bintray相关信息
+
 Properties properties = new Properties()
 properties.load(project.rootProject.file('local.properties').newDataInputStream())
 bintray {
-    //读取bintray帐号和密码。
-    //一般的为了保密和安全性，在项目的local.properties文件中添加两行句话即可：
     user = properties.getProperty("BINTRAY_USER")
     key = properties.getProperty("BINTRAY_KEY")
     configurations = ['archives']
     pkg {
-        repo = "maven" //上传的中央仓库名称
-        name = "acp" //上传的项目的名字
+        repo = "maven"
+        name = "acp"
         websiteUrl = siteUrl
         vcsUrl = gitUrl
         licenses = ["Apache-2.0"]
         publish = true //是否发布
     }
 }
 dependencies {
-    compile fileTree(dir: 'libs', include: ['*.jar'])
-    compile 'com.android.support:appcompat-v7:23.1.1'
+    compile 'com.android.support:appcompat-v7:23.4.0'
 }

acp/src/main/java/com/mylhyl/acp/AcpManager.java

@@ -1,17 +1,20 @@
 package com.mylhyl.acp;
 
 import android.app.Activity;
+import android.app.AlertDialog;
 import android.content.ActivityNotFoundException;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
+import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
 import android.net.Uri;
 import android.provider.Settings;
-import android.support.v7.app.AlertDialog;
 
+import java.util.HashSet;
 import java.util.LinkedList;
 import java.util.List;
+import java.util.Set;
 
 /**
  * Created by hupei on 2016/4/26.
@@ -25,12 +28,31 @@ class AcpManager {
     private AcpOptions mOptions;
     private AcpListener mCallback;
     private final List<String> mDeniedPermissions = new LinkedList<>();
+    private final Set<String> mManifestPermissions = new HashSet<>(1);
 
     AcpManager(Context context) {
         mContext = context;
         mService = new AcpService();
+        getManifestPermissions();
     }
 
+    private synchronized void getManifestPermissions() {
+        PackageInfo packageInfo = null;
+        try {
+            packageInfo = mContext.getPackageManager().getPackageInfo(
+                    mContext.getPackageName(), PackageManager.GET_PERMISSIONS);
+        } catch (PackageManager.NameNotFoundException e) {
+            e.printStackTrace();
+        }
+        if (packageInfo != null) {
+            String[] permissions = packageInfo.requestedPermissions;
+            if (permissions != null) {
+                for (String perm : permissions) {
+                    mManifestPermissions.add(perm);
+                }
+            }
+        }
+    }
 
     synchronized void request(AcpOptions options, AcpListener acpListener) {
         mCallback = acpListener;
@@ -42,11 +64,16 @@ private synchronized void checkSelfPermission() {
         mDeniedPermissions.clear();
         String[] permissions = mOptions.getPermissions();
         for (String permission : permissions) {
-            int permissionCheck = mService.checkSelfPermission(mContext, permission);
-            if (permissionCheck == PackageManager.PERMISSION_DENIED) {
-                mDeniedPermissions.add(permission);
+            //检查申请的权限是否在 AndroidManifest.xml 中
+            if (mManifestPermissions.contains(permission)) {
+                int checkSelfPermission = mService.checkSelfPermission(mContext, permission);
+                //如果是拒绝状态则装入拒绝集合中
+                if (checkSelfPermission == PackageManager.PERMISSION_DENIED) {
+                    mDeniedPermissions.add(permission);
+                }
             }
         }
+        //如果没有一个拒绝是响应同意回调
         if (mDeniedPermissions.isEmpty()) {
             mCallback.onGranted();
             onDestroy();
@@ -125,10 +152,16 @@ public void onClick(DialogInterface dialog, int which) {
                 }).show();
     }
 
+    /**
+     * 摧毁本库的 AcpActivity
+     */
     private void onDestroy() {
         if (mActivity != null) mActivity.finish();
     }
 
+    /**
+     * 跳转到设置界面
+     */
     private void startSetting() {
         try {
             Intent intent = new Intent(Settings.ACTION_APPLICATION_DETAILS_SETTINGS)

build.gradle

@@ -1,14 +1,10 @@
-// Top-level build file where you can add configuration options common to all sub-projects/modules.
-
 buildscript {
     repositories {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.0.0'
-        //自动上传至 bintray 平台插件
+        classpath 'com.android.tools.build:gradle:2.1.2'
         classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.2'
-        //自动化 maven 打包插件
         classpath 'com.github.dcendents:android-maven-gradle-plugin:1.3'
     }
 }
@@ -18,7 +14,3 @@ allprojects {
         jcenter()
     }
 }
-
-task clean(type: Delete) {
-    delete rootProject.buildDir
-}

sample/src/main/java/com/mylhyl/acp/sample/MainActivity.java

@@ -33,12 +33,15 @@ public void onClickFragment(View v) {
 
     public void onClickAll(View v) {
         Acp.getInstance(this).request(new AcpOptions.Builder()
-                        .setPermissions(Manifest.permission.WRITE_EXTERNAL_STORAGE, Manifest.permission.READ_PHONE_STATE)
-//                .setDeniedMessage()
-//                .setDeniedCloseBtn()
-//                .setDeniedSettingBtn()
-//                .setRationalMessage()
-//                .setRationalBtn()
+                        .setPermissions(Manifest.permission.WRITE_EXTERNAL_STORAGE
+                                , Manifest.permission.READ_PHONE_STATE
+                                , Manifest.permission.SEND_SMS)
+                /*以下为自定义提示语、按钮文字
+                .setDeniedMessage()
+                .setDeniedCloseBtn()
+                .setDeniedSettingBtn()
+                .setRationalMessage()
+                .setRationalBtn()*/
                         .build(),
                 new AcpListener() {
                     @Override