Merge branch 'audiorecorder-1.4.8'
This commit is contained in:
commit
65b16f4c7c
4 changed files with 7 additions and 7 deletions
|
|
@ -8,8 +8,8 @@ android {
|
|||
applicationId "com.github.axet.audiorecorder"
|
||||
minSdkVersion 9
|
||||
targetSdkVersion 23
|
||||
versionCode 109
|
||||
versionName "1.4.7"
|
||||
versionCode 110
|
||||
versionName "1.4.8"
|
||||
}
|
||||
signingConfigs {
|
||||
release {
|
||||
|
|
|
|||
|
|
@ -223,7 +223,7 @@ public class MainActivity extends AppCompatActivity {
|
|||
public static final String[] PERMISSIONS = new String[]{READ_EXTERNAL_STORAGE, Manifest.permission.WRITE_EXTERNAL_STORAGE};
|
||||
|
||||
boolean permitted(String[] ss) {
|
||||
if (Build.VERSION.SDK_INT < 11)
|
||||
if (Build.VERSION.SDK_INT < 15)
|
||||
return true;
|
||||
for (String s : ss) {
|
||||
if (ContextCompat.checkSelfPermission(this, s) != PackageManager.PERMISSION_GRANTED) {
|
||||
|
|
@ -234,7 +234,7 @@ public class MainActivity extends AppCompatActivity {
|
|||
}
|
||||
|
||||
boolean permitted() {
|
||||
if (Build.VERSION.SDK_INT < 11)
|
||||
if (Build.VERSION.SDK_INT < 15)
|
||||
return true;
|
||||
for (String s : PERMISSIONS) {
|
||||
if (ContextCompat.checkSelfPermission(this, s) != PackageManager.PERMISSION_GRANTED) {
|
||||
|
|
|
|||
|
|
@ -744,7 +744,7 @@ public class RecordingActivity extends AppCompatActivity {
|
|||
};
|
||||
|
||||
boolean permitted(String[] ss) {
|
||||
if (Build.VERSION.SDK_INT < 11)
|
||||
if (Build.VERSION.SDK_INT < 15)
|
||||
return true;
|
||||
for (String s : ss) {
|
||||
if (ContextCompat.checkSelfPermission(this, s) != PackageManager.PERMISSION_GRANTED) {
|
||||
|
|
@ -755,7 +755,7 @@ public class RecordingActivity extends AppCompatActivity {
|
|||
}
|
||||
|
||||
boolean permitted() {
|
||||
if (Build.VERSION.SDK_INT < 11)
|
||||
if (Build.VERSION.SDK_INT < 15)
|
||||
return true;
|
||||
for (String s : PERMISSIONS) {
|
||||
if (ContextCompat.checkSelfPermission(this, s) != PackageManager.PERMISSION_GRANTED) {
|
||||
|
|
|
|||
|
|
@ -239,7 +239,7 @@ public class SettingsActivity extends AppCompatPreferenceActivity implements Sha
|
|||
public static final String[] PERMISSIONS = new String[]{Manifest.permission.READ_EXTERNAL_STORAGE, Manifest.permission.WRITE_EXTERNAL_STORAGE};
|
||||
|
||||
public static boolean permitted(Context context, String[] ss) {
|
||||
if (Build.VERSION.SDK_INT < 11)
|
||||
if (Build.VERSION.SDK_INT < 15)
|
||||
return true;
|
||||
for (String s : ss) {
|
||||
if (ContextCompat.checkSelfPermission(context, s) != PackageManager.PERMISSION_GRANTED) {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue