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

fix startActivityForResult, enable foreground encoding

Browse source
This commit is contained in:
Alexey Kuznetsov 2020-12-01 21:47:35 +03:00
commit abfa26da8c
6 changed files with 153 additions and 56 deletions
Download patch file Download diff file Expand all files Collapse all files

12
app/build.gradle
View file

@ -9,15 +9,15 @@ android {
applicationId "com.github.axet.audiorecorder"
minSdkVersion 9
targetSdkVersion 29
versionCode 347
versionName "3.3.22"
versionCode 347
versionName "3.3.22"
}
signingConfigs {
release {
storeFile file(prop('RELEASE_STORE_FILE')?:'none')
storePassword prop('RELEASE_STORE_PASSWORD')
keyAlias prop('RELEASE_KEY_ALIAS')
keyPassword prop('RELEASE_KEY_PASSWORD')
storeFile file(project.findProperty('RELEASE_STORE_FILE')?:'none')
storePassword project.findProperty('RELEASE_STORE_PASSWORD')
keyAlias project.findProperty('RELEASE_KEY_ALIAS')
keyPassword project.findProperty('RELEASE_KEY_PASSWORD')
}
}
buildTypes {

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

@ -40,6 +40,7 @@ import com.github.axet.androidlibrary.widgets.ErrorDialog;
import com.github.axet.androidlibrary.widgets.OpenFileDialog;
import com.github.axet.androidlibrary.widgets.SearchView;
import com.github.axet.audiolibrary.app.RawSamples;
import com.github.axet.audiolibrary.encoders.FormatWAV;
import com.github.axet.audiorecorder.R;
import com.github.axet.audiorecorder.app.AudioApplication;
import com.github.axet.audiorecorder.app.EncodingStorage;
@ -108,6 +109,7 @@ public class MainActivity extends AppCompatThemeActivity {
setProgressStyle(ProgressDialog.STYLE_HORIZONTAL);
setIndeterminate(false);
setMax(100);
setTitle(R.string.encoding_title);
this.info = info;
}
@ -181,16 +183,15 @@ public class MainActivity extends AppCompatThemeActivity {
}
}
public class EncodingDialog extends Handler {
public static class ProgressHandler extends Handler {
Context context;
Snackbar snackbar;
ProgressEncoding progress;
long cur;
long total;
Storage storage;
EncodingStorage encodings;
public EncodingDialog() {
public ProgressHandler() {
}
public void registerReceiver(Context context) {
@ -238,52 +239,25 @@ public class MainActivity extends AppCompatThemeActivity {
} catch (JSONException e) {
throw new RuntimeException(e);
}
if (progress != null)
progress.setProgress(cur, total);
if (snackbar == null || !snackbar.isShownOrQueued()) {
snackbar = Snackbar.make(fab, printEncodings(targetUri), Snackbar.LENGTH_LONG);
snackbar.setDuration(Snackbar.LENGTH_INDEFINITE);
snackbar.getView().setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
progress = new ProgressEncoding(context, info);
progress.setTitle(R.string.encoding_title);
progress.setMessage(".../" + Storage.getName(context, targetUri));
progress.show();
progress.setProgress(cur, total);
EncodingService.startIfPending(context);
}
});
snackbar.show();
} else {
snackbar.setText(printEncodings(targetUri));
snackbar.show();
}
onUpdate(targetUri, info);
}
if (msg.what == EncodingStorage.DONE) {
Intent intent = (Intent) msg.obj;
final Uri targetUri = intent.getParcelableExtra("targetUri");
if (progress != null) {
progress.dismiss();
progress = null;
}
final Uri targetUri = intent.getParcelableExtra("targetUri");
recordings.load(false, null);
if (snackbar != null && snackbar.isShownOrQueued()) {
snackbar.setText(printEncodings(targetUri));
snackbar.setDuration(Snackbar.LENGTH_SHORT);
snackbar.show();
}
RecordingService.startIfPending(context);
onDone(targetUri);
}
if (msg.what == EncodingStorage.EXIT) {
if (progress != null) {
progress.dismiss();
progress = null;
}
hide();
RecordingService.startIfPending(context);
onExit();
}
if (msg.what == EncodingStorage.ERROR) {
Intent intent = (Intent) msg.obj;
@ -299,11 +273,34 @@ public class MainActivity extends AppCompatThemeActivity {
throw new RuntimeException(e);
}
Throwable e = (Throwable) intent.getSerializableExtra("e");
Error(in, info, e);
RecordingService.startIfPending(context);
onError(in, info, e);
}
}
public void onUpdate(Uri targetUri, RawSamples.Info info) {
}
public void onError(File in, RawSamples.Info info, Throwable e) {
Error(in, info, e);
RecordingService.startIfPending(context);
}
public void onExit() {
hide();
RecordingService.startIfPending(context);
}
public void onDone(Uri targetUri) {
RecordingService.startIfPending(context);
}
public void show(Uri targetUri, RawSamples.Info info) {
progress = new ProgressEncoding(context, info);
progress.setMessage(".../" + Storage.getName(context, targetUri));
progress.show();
progress.setProgress(cur, total);
}
public void onPause() {
if (progress != null)
progress.onPause(cur);
@ -334,7 +331,8 @@ public class MainActivity extends AppCompatThemeActivity {
d.setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
EncodingService.saveAsWAV(context, in, d.getCurrentPath(), info);
File to = storage.getNewFile(d.getCurrentPath(), FormatWAV.EXT);
EncodingService.saveAsWAV(context, in, to, info);
}
});
d.show();
@ -345,6 +343,62 @@ public class MainActivity extends AppCompatThemeActivity {
}
public void hide() {
if (progress != null) {
progress.dismiss();
progress = null;
}
}
}
public class EncodingDialog extends ProgressHandler {
Snackbar snackbar;
public EncodingDialog() {
}
@Override
public void handleMessage(Message msg) {
super.handleMessage(msg);
if (msg.what == EncodingStorage.UPDATE) {
Intent intent = (Intent) msg.obj;
final Uri targetUri = intent.getParcelableExtra("targetUri");
final RawSamples.Info info;
try {
info = new RawSamples.Info(intent.getStringExtra("info"));
} catch (JSONException e) {
throw new RuntimeException(e);
}
if (snackbar == null || !snackbar.isShownOrQueued()) {
snackbar = Snackbar.make(fab, printEncodings(targetUri), Snackbar.LENGTH_LONG);
snackbar.setDuration(Snackbar.LENGTH_INDEFINITE);
snackbar.getView().setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
show(targetUri, info);
EncodingService.startIfPending(context);
}
});
snackbar.show();
} else {
snackbar.setText(printEncodings(targetUri));
snackbar.show();
}
}
if (msg.what == EncodingStorage.DONE) {
Intent intent = (Intent) msg.obj;
final Uri targetUri = intent.getParcelableExtra("targetUri");
recordings.load(false, null);
if (snackbar != null && snackbar.isShownOrQueued()) {
snackbar.setText(printEncodings(targetUri));
snackbar.setDuration(Snackbar.LENGTH_SHORT);
snackbar.show();
}
}
}
@Override
public void hide() {
super.hide();
if (snackbar != null) {
snackbar.dismiss();
snackbar = null;

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

@ -45,7 +45,6 @@ import com.github.axet.androidlibrary.widgets.Toast;
import com.github.axet.audiolibrary.app.RawSamples;
import com.github.axet.audiolibrary.app.Sound;
import com.github.axet.audiolibrary.encoders.Factory;
import com.github.axet.audiolibrary.encoders.FormatWAV;
import com.github.axet.audiolibrary.widgets.PitchView;
import com.github.axet.audiorecorder.BuildConfig;
import com.github.axet.audiorecorder.R;
@ -100,6 +99,8 @@ public class RecordingActivity extends AppCompatThemeActivity {
RecordingReceiver receiver;
MainActivity.ProgressHandler progress;
AlertDialog muted;
Handler handler = new Handler() {
@Override
@ -324,10 +325,15 @@ public class RecordingActivity extends AppCompatThemeActivity {
public void Error(Throwable e) {
Log.e(TAG, "error", e);
Error(toMessage(e));
Error(recording.storage.getTempRecording(), toMessage(e));
}
public void Error(String msg) {
public void Error(File in, Throwable e) {
Log.e(TAG, "error", e);
Error(in, toMessage(e));
}
public void Error(File in, String msg) {
ErrorDialog builder = new ErrorDialog(this, msg);
builder.setOnCancelListener(new DialogInterface.OnCancelListener() {
@Override
@ -341,7 +347,6 @@ public class RecordingActivity extends AppCompatThemeActivity {
finish();
}
});
final File in = recording.storage.getTempRecording();
if (in.length() > 0) {
builder.setNeutralButton(R.string.save_as_wav, new DialogInterface.OnClickListener() {
@Override
@ -350,7 +355,9 @@ public class RecordingActivity extends AppCompatThemeActivity {
d.setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
EncodingService.saveAsWAV(RecordingActivity.this, recording.storage.getTempRecording(), d.getCurrentPath(), recording.getInfo());
File to = new File(d.getCurrentPath(), Storage.getName(RecordingActivity.this, recording.targetUri));
recording.targetUri = Uri.fromFile(to);
EncodingService.saveAsWAV(RecordingActivity.this, recording.storage.getTempRecording(), to, recording.getInfo());
}
});
d.show();
@ -624,6 +631,9 @@ public class RecordingActivity extends AppCompatThemeActivity {
if (editSample != -1)
edit(true, false);
}
if (progress != null)
progress.onResume();
}
@Override
@ -633,6 +643,8 @@ public class RecordingActivity extends AppCompatThemeActivity {
recording.updateBufferSize(true);
editPlay(false);
pitch.stop();
if (progress != null)
progress.onPause();
}
void stopRecording(String status) {
@ -887,6 +899,11 @@ public class RecordingActivity extends AppCompatThemeActivity {
receiver = null;
}
if (progress != null) {
progress.close();
progress = null;
}
RecordingService.stopRecording(this);
if (pscl != null) {
@ -985,9 +1002,39 @@ public class RecordingActivity extends AppCompatThemeActivity {
return;
}
EncodingService.startEncoding(this, in, recording.targetUri, recording.getInfo());
final File encoding = EncodingService.startEncoding(this, in, recording.targetUri, recording.getInfo());
finish();
if (recordSoundIntent != null) {
if (progress != null)
progress.close();
progress = new MainActivity.ProgressHandler() {
@Override
public void onDone(Uri targetUri) {
super.onDone(targetUri);
if (targetUri.equals(recording.targetUri))
done.run();
}
@Override
public void onExit() {
super.onExit();
done.run();
}
@Override
public void onError(File in, RawSamples.Info info, Throwable e) {
if (in.equals(encoding))
RecordingActivity.this.Error(encoding, e); // show error for current encoding
else
Error(in, info, e); // show error for any encoding
}
};
progress.registerReceiver(this);
progress.show(recording.targetUri, recording.getInfo());
progress.progress.setCancelable(false);
} else {
done.run();
}
}
@Override

1
app/src/main/java/com/github/axet/audiorecorder/app/EncodingStorage.java
View file

@ -219,7 +219,6 @@ public class EncodingStorage extends HashMap<File, EncodingStorage.Info> {
}
public void saveAsWAV(File in, File out, RawSamples.Info info) {
out = storage.getNewFile(out, FormatWAV.EXT);
OnFlyEncoding fly = new OnFlyEncoding(storage, out, info);
encoder = new FileEncoder(storage.getContext(), in, fly);
encoding(encoder, fly, info, new Runnable() {

3
app/src/main/java/com/github/axet/audiorecorder/services/EncodingService.java
View file

@ -89,7 +89,7 @@ public class EncodingService extends PersistentService {
stop(context, new Intent(context, EncodingService.class));
}
public static void startEncoding(Context context, File in, Uri targetUri, RawSamples.Info info) {
public static File startEncoding(Context context, File in, Uri targetUri, RawSamples.Info info) {
try {
EncodingStorage encodings = ((AudioApplication) context.getApplicationContext()).encodings;
in = encodings.save(in, targetUri, info);
@ -98,6 +98,7 @@ public class EncodingService extends PersistentService {
.putExtra("targetUri", targetUri)
.putExtra("info", info.save().toString())
);
return in;
} catch (JSONException e) {
throw new RuntimeException(e);
}

4
build.gradle
View file

@ -21,7 +21,3 @@ allprojects {
task clean(type: Delete) {
delete rootProject.buildDir
}
def prop(String name) {
project.hasProperty(name) ? project.getProperty(name) : null
}