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

Merge branch 'audiorecorder-2.0.3'

Browse source
This commit is contained in:
Alexey Kuznetsov 2017-06-21 20:24:33 +03:00
commit b239eba7e3
4 changed files with 10 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

6
app/build.gradle
View file

@ -8,8 +8,8 @@ android {
applicationId "com.github.axet.audiorecorder"
minSdkVersion 9
targetSdkVersion 23
versionCode 157
versionName "2.0.2"
versionCode 158
versionName "2.0.3"
}
signingConfigs {
release {
@ -43,5 +43,5 @@ android {
dependencies {
compile fileTree(dir: 'libs', include: ['*.jar'])
testCompile 'junit:junit:4.12'
compile 'com.github.axet:android-audio-library:0.0.61' // compile project(':android-audio-library')
compile 'com.github.axet:android-audio-library:0.0.63' // compile project(':android-audio-library')
}

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

@ -37,6 +37,10 @@ import java.util.Collections;
public class MainActivity extends AppCompatActivity {
public final static String TAG = MainActivity.class.getSimpleName();
public static final String READ_EXTERNAL_STORAGE = "android.permission.READ_EXTERNAL_STORAGE"; // Manifest.permission.READ_EXTERNAL_STORAGE
public static final String[] PERMISSIONS = new String[]{READ_EXTERNAL_STORAGE, Manifest.permission.WRITE_EXTERNAL_STORAGE};
FloatingActionButton fab;
Handler handler = new Handler();
@ -228,7 +232,6 @@ public class MainActivity extends AppCompatActivity {
final SharedPreferences shared = PreferenceManager.getDefaultSharedPreferences(this);
String last = shared.getString(MainApplication.PREFERENCE_LAST, "");
last = last.toLowerCase();
for (int i = 0; i < recordings.getCount(); i++) {
File f = recordings.getItem(i);
String n = f.getName().toLowerCase();
@ -261,14 +264,9 @@ public class MainActivity extends AppCompatActivity {
}
}
public static final String READ_EXTERNAL_STORAGE = "android.permission.READ_EXTERNAL_STORAGE"; // Manifest.permission.READ_EXTERNAL_STORAGE
public static final String[] PERMISSIONS = new String[]{READ_EXTERNAL_STORAGE, Manifest.permission.WRITE_EXTERNAL_STORAGE};
@Override
public void onConfigurationChanged(Configuration newConfig) {
super.onConfigurationChanged(newConfig);
handler.post(new Runnable() {
@Override
public void run() {
@ -292,7 +290,6 @@ public class MainActivity extends AppCompatActivity {
text.setText(MainApplication.formatFree(this, free, sec));
}
public void Error(Throwable e) {
String msg = e.getMessage();
if (msg == null || msg.isEmpty()) {

2
app/src/main/res/xml-ru/pref_general.xml
View file

@ -44,7 +44,7 @@
android:negativeButtonText="@null"
android:positiveButtonText="@null"
android:summary="2015-12-31 22:11:34"
android:title="Имя Нового Файла" />
android:title="Имя нового файла" />
<SwitchPreferenceCompat
android:defaultValue="true"

4
app/src/main/res/xml/pref_general.xml
View file

@ -50,13 +50,13 @@
android:defaultValue="true"
android:key="call"
android:summary="Stop recording on answering and continue on hangup"
android:title="Pause during calls" />
android:title="Pause During Calls" />
<SwitchPreferenceCompat
android:defaultValue="true"
android:key="silence"
android:summary="Put phone in 'silence mode' during recording"
android:title="Silence mode" />
android:title="Silence Mode" />
<SwitchPreferenceCompat
android:defaultValue="false"