Skip to content

Commit f6624c5

Browse files
committed
io.appium.settings: recording: Do not modify recording file name in case of invalid file name
* simply return error and exit, because providing alternative/default name causes confusion on users while pulling file Signed-off-by: sirmordred <[email protected]>
1 parent 1f0d2a0 commit f6624c5

File tree

2 files changed

+3
-10
lines changed

2 files changed

+3
-10
lines changed

app/src/main/java/io/appium/settings/RecorderConstant.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ public class RecorderConstant {
2424
public static final String ACTION_RECORDING_RESULT_CODE = "result_code";
2525
public static final String ACTION_RECORDING_FILENAME = "recording_filename";
2626
public static final String ACTION_RECORDING_ROTATION = "recording_rotation";
27-
public static final String DEFAULT_RECORDING_FILENAME = "AppiumScreenRecord";
2827
public static final float BITRATE_MULTIPLIER = 0.25f;
2928
public static final int AUDIO_CODEC_SAMPLE_RATE_HZ = 44100;
3029
public static final int AUDIO_CODEC_CHANNEL_COUNT = 1;

app/src/main/java/io/appium/settings/Settings.java

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,8 @@
3333
import android.view.WindowManager;
3434

3535
import java.io.File;
36-
import java.text.SimpleDateFormat;
3736
import java.util.Arrays;
38-
import java.util.Date;
3937
import java.util.List;
40-
import java.util.Locale;
4138

4239
import androidx.core.app.ActivityCompat;
4340
import io.appium.settings.receivers.AnimationSettingReceiver;
@@ -132,12 +129,9 @@ private void handleRecording(Intent intent) {
132129
String recordingFilename = intent.getStringExtra(ACTION_RECORDING_FILENAME);
133130

134131
if (isValidFileName(recordingFilename)) {
135-
String timeStamp = new SimpleDateFormat(
136-
"yyyy-MM-dd_HH-mm-ss", Locale.US).format(new Date());
137-
recordingFilename = RecorderConstant.DEFAULT_RECORDING_FILENAME +
138-
"_" + timeStamp + ".mp4";
139-
Log.w(TAG, "handleRecording: Invalid filename passed by user," +
140-
" using default one: " + recordingFilename);
132+
Log.e(TAG, "handleRecording: Invalid filename passed by user");
133+
finishActivity();
134+
return;
141135
}
142136

143137
/*

0 commit comments

Comments
 (0)