am 3dfb1097: am 31fe68d9: [FM] Recording name is saved abnormally after discarding it in FM
* commit '3dfb1097a899e563a5f38427863d504853fadaa4':
[FM] Recording name is saved abnormally after discarding it in FM
diff --git a/src/com/android/fmradio/FmRecordActivity.java b/src/com/android/fmradio/FmRecordActivity.java
index f82bf29..a625250 100644
--- a/src/com/android/fmradio/FmRecordActivity.java
+++ b/src/com/android/fmradio/FmRecordActivity.java
@@ -505,13 +505,14 @@
}
String sdcard = FmService.getRecordingSdcard();
String recordingName = mService.getRecordingName();
+ String saveName = null;
if (TextUtils.isEmpty(mStationName.getText())) {
- recordingName = FmRecorder.RECORDING_FILE_PREFIX + "_" + recordingName;
+ saveName = FmRecorder.RECORDING_FILE_PREFIX + "_" + recordingName;
} else {
- recordingName = FmRecorder.RECORDING_FILE_PREFIX + "_" + mStationName.getText() + "_"
+ saveName = FmRecorder.RECORDING_FILE_PREFIX + "_" + mStationName.getText() + "_"
+ recordingName;
}
- FmSaveDialog newFragment = new FmSaveDialog(sdcard, recordingName, recordingName);
+ FmSaveDialog newFragment = new FmSaveDialog(sdcard, recordingName, saveName);
newFragment.show(mFragmentManager, TAG_SAVE_RECORDINGD);
mFragmentManager.executePendingTransactions();
mHandler.removeMessages(FmListener.MSGID_REFRESH);
diff --git a/src/com/android/fmradio/dialogs/FmSaveDialog.java b/src/com/android/fmradio/dialogs/FmSaveDialog.java
index 1e9078f..d1ddf1e 100644
--- a/src/com/android/fmradio/dialogs/FmSaveDialog.java
+++ b/src/com/android/fmradio/dialogs/FmSaveDialog.java
@@ -62,6 +62,8 @@
private String mRecordingFileName = null;
+ private String mTempRecordingName = null;
+
/**
* FM record dialog fragment, because fragment manager need empty
* constructor to instantiated this dialog fragment when configuration
@@ -79,7 +81,8 @@
*/
public FmSaveDialog(String sdcard, String defaultName, String recordingName) {
mRecordingSdcard = sdcard;
- mDefaultRecordingName = defaultName;
+ mTempRecordingName = defaultName + FmRecorder.RECORDING_FILE_EXTENSION;
+ mDefaultRecordingName = recordingName;
mRecordingNameToSave = recordingName;
}
@@ -205,12 +208,13 @@
@Override
public void onClick(View v) {
+ File recordingFolderPath = new File(mRecordingSdcard, "FM Recording");
+
switch (v.getId()) {
case R.id.save_dialog_button_save:
String msg = null;
// Check the recording name whether exist
mRecordingNameToSave = mRecordingNameEditText.getText().toString().trim();
- File recordingFolderPath = new File(mRecordingSdcard, "FM Recording");
File recordingFileToSave = new File(recordingFolderPath, mRecordingNameToSave
+ FmRecorder.RECORDING_FILE_EXTENSION);
@@ -234,6 +238,11 @@
case R.id.save_dialog_button_discard:
dismissAllowingStateLoss();
+ // here need delete discarded recording file
+ File needToDelete = new File(recordingFolderPath, mTempRecordingName);
+ if (needToDelete.exists()) {
+ needToDelete.delete();
+ }
break;
default: