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

Merge branch 'audiorecorder-1.1.53'

Browse source
This commit is contained in:
Alexey Kuznetsov 2016-09-25 18:30:17 +03:00
commit 35c76e38b9
3 changed files with 12 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/build.gradle
View file

@ -8,8 +8,8 @@ android {
applicationId "com.github.axet.audiorecorder"
minSdkVersion 16
targetSdkVersion 23
versionCode 74
versionName "1.1.52"
versionCode 75
versionName "1.1.53"
}
signingConfigs {
release {

5
app/src/main/java/com/github/axet/audiorecorder/activities/RecordingActivity.java
View file

@ -815,7 +815,10 @@ public class RecordingActivity extends AppCompatActivity {
builder.setTitle("Error");
String msg = encoder.getException().getMessage();
if (msg.isEmpty()) {
msg = encoder.getException().getClass().getSimpleName();
Throwable t = encoder.getException();
while (t.getCause() != null)
t = t.getCause();
msg = t.getClass().getSimpleName();
}
builder.setMessage(msg);
builder.setOnCancelListener(new DialogInterface.OnCancelListener() {

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

@ -250,12 +250,14 @@ public class SettingsActivity extends AppCompatPreferenceActivity implements Sha
Preference rate = findPreference(MainApplication.PREFERENCE_ENCODING);
Map<String, MediaCodecInfo> mime = MuxerMP4.findEncoder("audio/mp4");
if (Build.VERSION.SDK_INT < 21 || mime.isEmpty()) {
if (Build.VERSION.SDK_INT < 21) {
getPreferenceScreen().removePreference(rate);
} else {
bindPreferenceSummaryToValue(rate);
Map<String, MediaCodecInfo> mime = MuxerMP4.findEncoder("audio/mp4");
if (mime.isEmpty())
getPreferenceScreen().removePreference(rate);
else
bindPreferenceSummaryToValue(rate);
}
bindPreferenceSummaryToValue(findPreference(MainApplication.PREFERENCE_RATE));