From b65fda984d88cb0af364f6c7e61c7bca95853fbe Mon Sep 17 00:00:00 2001
From: hyb1996 <946994919@qq.com>
Date: Wed, 12 Jul 2017 14:31:32 +0800
Subject: [PATCH] release 2.0.14 Beta

---
 app/build.gradle                                            | 2 +-
 .../main/java/com/stardust/scriptdroid/ui/BaseActivity.java | 6 ------
 .../java/com/stardust/scriptdroid/ui/main/MainActivity.java | 2 +-
 .../com/stardust/scriptdroid/ui/splash/SplashActivity.java  | 2 --
 4 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 84b91f85..d71b6250 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -9,7 +9,7 @@ android {
         applicationId "com.stardust.scriptdroid"
         minSdkVersion 17
         targetSdkVersion 23
-        versionCode 146
+        versionCode 147
         versionName "2.0.14 Beta"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
         multiDexEnabled true
diff --git a/app/src/main/java/com/stardust/scriptdroid/ui/BaseActivity.java b/app/src/main/java/com/stardust/scriptdroid/ui/BaseActivity.java
index 5ad9d5c6..b03d0762 100644
--- a/app/src/main/java/com/stardust/scriptdroid/ui/BaseActivity.java
+++ b/app/src/main/java/com/stardust/scriptdroid/ui/BaseActivity.java
@@ -30,7 +30,6 @@ public abstract class BaseActivity extends AppCompatActivity {
 
 
     protected static final int PERMISSION_REQUEST_CODE = 11186;
-    private static boolean isRequestingPermissions = false;
     private BackPressedHandler.Observer mBackPressObserver = new BackPressedHandler.Observer();
 
     @Override
@@ -66,12 +65,8 @@ public abstract class BaseActivity extends AppCompatActivity {
 
     protected void checkPermission(String... permissions) {
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-            if (isRequestingPermissions) {
-                return;
-            }
             String[] requestPermissions = getRequestPermissions(permissions);
             if (requestPermissions.length > 0) {
-                isRequestingPermissions = true;
                 requestPermissions(requestPermissions, PERMISSION_REQUEST_CODE);
             }
         } else {
@@ -127,6 +122,5 @@ public abstract class BaseActivity extends AppCompatActivity {
     @Override
     public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
         super.onRequestPermissionsResult(requestCode, permissions, grantResults);
-        isRequestingPermissions = false;
     }
 }
diff --git a/app/src/main/java/com/stardust/scriptdroid/ui/main/MainActivity.java b/app/src/main/java/com/stardust/scriptdroid/ui/main/MainActivity.java
index 3c263cca..4093757c 100644
--- a/app/src/main/java/com/stardust/scriptdroid/ui/main/MainActivity.java
+++ b/app/src/main/java/com/stardust/scriptdroid/ui/main/MainActivity.java
@@ -152,7 +152,7 @@ public class MainActivity extends BaseActivity implements OnActivityResultDelega
     }
 
     private void checkPermissions() {
-        checkPermission(Manifest.permission.READ_EXTERNAL_STORAGE);
+        checkPermission(Manifest.permission.READ_PHONE_STATE, Manifest.permission.READ_EXTERNAL_STORAGE);
         showAccessibilitySettingPromptIfDisabled();
     }
 
diff --git a/app/src/main/java/com/stardust/scriptdroid/ui/splash/SplashActivity.java b/app/src/main/java/com/stardust/scriptdroid/ui/splash/SplashActivity.java
index 8d2d81cb..83412ffc 100644
--- a/app/src/main/java/com/stardust/scriptdroid/ui/splash/SplashActivity.java
+++ b/app/src/main/java/com/stardust/scriptdroid/ui/splash/SplashActivity.java
@@ -59,9 +59,7 @@ public class SplashActivity extends BaseActivity {
         boolean forceShowAd = getIntent().getBooleanExtra(FORCE_SHOW_AD, false);
         if (!forceShowAd && !Pref.shouldShowAd()) {
             enterNextActivity();
-            return;
         }
-        checkPermission(Manifest.permission.READ_PHONE_STATE, Manifest.permission.WRITE_EXTERNAL_STORAGE);
     }
 
     @AfterViews