tt/AutoJs6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

release 2.0.14 Beta

Browse Source
This commit is contained in:
hyb1996
2017-07-12 14:31:32 +08:00
parent 24f0043a0f
commit b65fda984d
4 changed files with 2 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/build.gradle
View File

@@ -9,7 +9,7 @@ android {
applicationId "com.stardust.scriptdroid" applicationId "com.stardust.scriptdroid"
minSdkVersion 17 minSdkVersion 17
targetSdkVersion 23 targetSdkVersion 23
versionCode 146 versionCode 147
versionName "2.0.14 Beta" versionName "2.0.14 Beta"
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
multiDexEnabled true multiDexEnabled true

6
app/src/main/java/com/stardust/scriptdroid/ui/BaseActivity.java
View File

@@ -30,7 +30,6 @@ public abstract class BaseActivity extends AppCompatActivity {
protected static final int PERMISSION_REQUEST_CODE = 11186; protected static final int PERMISSION_REQUEST_CODE = 11186;
private static boolean isRequestingPermissions = false;
private BackPressedHandler.Observer mBackPressObserver = new BackPressedHandler.Observer(); private BackPressedHandler.Observer mBackPressObserver = new BackPressedHandler.Observer();
@Override @Override
@@ -66,12 +65,8 @@ public abstract class BaseActivity extends AppCompatActivity {
protected void checkPermission(String... permissions) { protected void checkPermission(String... permissions) {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) { if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
if (isRequestingPermissions) {
return;
}
String[] requestPermissions = getRequestPermissions(permissions); String[] requestPermissions = getRequestPermissions(permissions);
if (requestPermissions.length > 0) { if (requestPermissions.length > 0) {
isRequestingPermissions = true;
requestPermissions(requestPermissions, PERMISSION_REQUEST_CODE); requestPermissions(requestPermissions, PERMISSION_REQUEST_CODE);
} }
} else { } else {
@@ -127,6 +122,5 @@ public abstract class BaseActivity extends AppCompatActivity {
@Override @Override
public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) { public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
super.onRequestPermissionsResult(requestCode, permissions, grantResults); super.onRequestPermissionsResult(requestCode, permissions, grantResults);
isRequestingPermissions = false;
} }
} }

2
app/src/main/java/com/stardust/scriptdroid/ui/main/MainActivity.java
View File

@@ -152,7 +152,7 @@ public class MainActivity extends BaseActivity implements OnActivityResultDelega
} }
private void checkPermissions() { private void checkPermissions() {
checkPermission(Manifest.permission.READ_EXTERNAL_STORAGE); checkPermission(Manifest.permission.READ_PHONE_STATE, Manifest.permission.READ_EXTERNAL_STORAGE);
showAccessibilitySettingPromptIfDisabled(); showAccessibilitySettingPromptIfDisabled();
} }

2
app/src/main/java/com/stardust/scriptdroid/ui/splash/SplashActivity.java
View File

@@ -59,9 +59,7 @@ public class SplashActivity extends BaseActivity {
boolean forceShowAd = getIntent().getBooleanExtra(FORCE_SHOW_AD, false); boolean forceShowAd = getIntent().getBooleanExtra(FORCE_SHOW_AD, false);
if (!forceShowAd && !Pref.shouldShowAd()) { if (!forceShowAd && !Pref.shouldShowAd()) {
enterNextActivity(); enterNextActivity();
return;
} }
checkPermission(Manifest.permission.READ_PHONE_STATE, Manifest.permission.WRITE_EXTERNAL_STORAGE);
} }
@AfterViews @AfterViews