bitPickups/android-audio-recorder
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'audiorecorder-1.4.9'

Browse source
This commit is contained in:
Alexey Kuznetsov 2017-03-15 09:40:41 +03:00
commit 732c7b7f4c
4 changed files with 7 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

8
app/build.gradle
View file

@ -8,8 +8,8 @@ android {
applicationId "com.github.axet.audiorecorder"
minSdkVersion 9
targetSdkVersion 23
versionCode 110
versionName "1.4.8"
versionCode 111
versionName "1.4.9"
}
signingConfigs {
release {
@ -43,7 +43,5 @@ android {
dependencies {
compile fileTree(dir: 'libs', include: ['*.jar'])
testCompile 'junit:junit:4.12'
compile 'com.android.support:appcompat-v7:25.2.0'
compile 'com.android.support:support-v4:25.2.0'
compile 'com.github.axet:android-audio-library:0.0.9' // compile project(':android-audio-library')
compile 'com.github.axet:android-audio-library:0.0.10' // compile project(':android-audio-library')
}

4
app/src/main/java/com/github/axet/audiorecorder/activities/MainActivity.java
View file

@ -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 < 15)
if (Build.VERSION.SDK_INT < 16)
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 < 15)
if (Build.VERSION.SDK_INT < 16)
return true;
for (String s : PERMISSIONS) {
if (ContextCompat.checkSelfPermission(this, s) != PackageManager.PERMISSION_GRANTED) {

2
app/src/main/java/com/github/axet/audiorecorder/activities/SettingsActivity.java
View file

@ -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 < 15)
if (Build.VERSION.SDK_INT < 16)
return true;
for (String s : ss) {
if (ContextCompat.checkSelfPermission(context, s) != PackageManager.PERMISSION_GRANTED) {

2
settings.gradle
View file

@ -1 +1 @@
include ':app', ':android-library', ':jebml', ':android-audio-library'
include ':app', ':android-library', ':jebml', ':android-audio-library', ':android-vorbis', ':android-vorbis:libvorbis', ':android-vorbis:libogg'