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

Merge branch 'audiorecorder-3.4.2'

Browse source
This commit is contained in:
Alexey Kuznetsov 2020-12-18 18:44:46 +03:00
commit 344a55b71d
4 changed files with 10 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

6
app/build.gradle
View file

@ -9,8 +9,8 @@ android {
applicationId "com.github.axet.audiorecorder"
minSdkVersion 9
targetSdkVersion 29
versionCode 351
versionName "3.4.1"
versionCode 352
versionName "3.4.2"
}
signingConfigs {
release {
@ -53,7 +53,7 @@ android {
dependencies {
testImplementation 'junit:junit:4.12'
implementation 'com.github.axet:android-audio-library:1.0.179' // implementation project(':android-audio-library')
implementation 'com.github.axet:android-audio-library:1.0.180' // implementation project(':android-audio-library')
implementation ('com.github.axet:wget:1.7.0') { exclude group: 'org.json', module: 'json' }
assets('com.google.android.exoplayer:exoplayer:2.7.3') { exclude group: 'com.android.support' }
}

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

@ -69,8 +69,7 @@ public class MainActivity extends AppCompatThemeActivity {
EncodingDialog encoding;
public static void startActivity(Context context) {
Intent i = new Intent(context, MainActivity.class);
context.startActivity(i);
context.startActivity(new Intent(context, MainActivity.class).addFlags(Intent.FLAG_ACTIVITY_NEW_TASK));
}
public static class SpeedInfo extends com.github.axet.wget.SpeedInfo {
@ -533,7 +532,7 @@ public class MainActivity extends AppCompatThemeActivity {
switch (item.getItemId()) {
case R.id.action_settings:
startActivity(new Intent(this, SettingsActivity.class));
SettingsActivity.startActivity(this);
return true;
case R.id.action_about:
AboutPreferenceCompat.showDialog(this, R.raw.about);

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

@ -149,7 +149,7 @@ public class RecordingActivity extends AppCompatThemeActivity {
public static void startActivity(Context context, boolean pause) {
Log.d(TAG, "startActivity");
Intent i = new Intent(context, RecordingActivity.class);
Intent i = new Intent(context, RecordingActivity.class).addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
if (pause)
i.setAction(RecordingActivity.START_PAUSE);
context.startActivity(i);

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

@ -46,6 +46,10 @@ public class SettingsActivity extends AppCompatSettingsThemeActivity implements
public static String[] PREMS = new String[]{Manifest.permission.READ_PHONE_STATE};
public static void startActivity(Context context) {
context.startActivity(new Intent(context, SettingsActivity.class).addFlags(Intent.FLAG_ACTIVITY_NEW_TASK));
}
@SuppressWarnings("unchecked")
public static <T> T[] removeElement(Class<T> c, T[] aa, int i) {
List<T> ll = Arrays.asList(aa);