io.appium.settings: recording: Revert SAF update

Signed-off-by: sirmordred <[email protected]>

Author: sirmordred

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

@@ -17,22 +17,15 @@
 package io.appium.settings;
 
 import android.app.Service;
-import android.content.ContentResolver;
-import android.content.ContentValues;
 import android.content.Context;
 import android.content.Intent;
 import android.media.projection.MediaProjection;
 import android.media.projection.MediaProjectionManager;
-import android.net.Uri;
 import android.os.Build;
 import android.os.IBinder;
-import android.provider.MediaStore;
 import android.util.DisplayMetrics;
 import android.util.Log;
 
-import java.io.FileDescriptor;
-import java.io.FileNotFoundException;
-
 import androidx.annotation.Nullable;
 import androidx.annotation.RequiresApi;
 import io.appium.settings.helpers.NotificationHelpers;
@@ -124,16 +117,9 @@ private void startScreenRecord(MediaProjectionManager mediaProjectionManager,
             return;
         }
 
-        String outputFileName = intent.getStringExtra(ACTION_RECORDING_FILENAME);
-        if (outputFileName == null) {
-            Log.i(TAG, "outputFileName is null");
-            return;
-        }
-
-        FileDescriptor outputVideoFd =
-                createOutputVideoDescriptor(getApplicationContext(), outputFileName);
-        if (outputVideoFd == null) {
-            Log.i(TAG, "outputVideoFd is null");
+        String outputFilePath = intent.getStringExtra(ACTION_RECORDING_FILENAME);
+        if (outputFilePath == null) {
+            Log.i(TAG, "outputFilePath is null");
             return;
         }
 
@@ -167,7 +153,7 @@ private void startScreenRecord(MediaProjectionManager mediaProjectionManager,
                     metrics.widthPixels, metrics.heightPixels, rawWidth, rawHeight));
         }
 
-        recorderThread = new RecorderThread(projection, outputVideoFd,
+        recorderThread = new RecorderThread(projection, outputFilePath,
                 rawWidth, rawHeight, recordingRotation);
         recorderThread.startRecording();
     }
@@ -188,21 +174,4 @@ private void showNotification() {
         startForeground(NotificationHelpers.APPIUM_NOTIFICATION_IDENTIFIER,
                 NotificationHelpers.getNotification(this));
     }
-
-    @RequiresApi(api = Build.VERSION_CODES.Q)
-    public FileDescriptor createOutputVideoDescriptor(Context context, String videoFileName) {
-        ContentValues values = new ContentValues();
-        values.put(MediaStore.Video.Media.TITLE, videoFileName);
-        values.put(MediaStore.Video.Media.DISPLAY_NAME, videoFileName);
-        values.put(MediaStore.Video.Media.MIME_TYPE, "video/mp4");
-        ContentResolver resolver = context.getContentResolver();
-        Uri collection = MediaStore.Downloads.EXTERNAL_CONTENT_URI;
-        Uri videoOutputUri = resolver.insert(collection, values);
-        try {
-            return resolver.openFileDescriptor(videoOutputUri, "rw").getFileDescriptor();
-        } catch (FileNotFoundException e) {
-            e.printStackTrace();
-        }
-        return null;
-    }
 }

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

@@ -34,7 +34,6 @@
 import android.util.Log;
 import android.view.Surface;
 
-import java.io.FileDescriptor;
 import java.io.IOException;
 import java.nio.ByteBuffer;
 
@@ -47,7 +46,7 @@ public class RecorderThread implements Runnable {
     private static final String TAG = "RecorderThread";
 
     private final MediaProjection mediaProjection;
-    private final FileDescriptor outputFileFd;
+    private final String outputFilePath;
     private final int videoWidth;
     private final int videoHeight;
     private final int recordingRotation;
@@ -81,10 +80,10 @@ public void onStopped() {
         }
     };
 
-    public RecorderThread(MediaProjection mediaProjection, FileDescriptor outputFileFd,
+    public RecorderThread(MediaProjection mediaProjection, String outputFilePath,
                           int videoWidth, int videoHeight, int recordingRotation) {
         this.mediaProjection = mediaProjection;
-        this.outputFileFd = outputFileFd;
+        this.outputFilePath = outputFilePath;
         this.videoWidth = videoWidth;
         this.videoHeight = videoHeight;
         this.recordingRotation = recordingRotation;
@@ -376,7 +375,7 @@ public void run() {
 
             audioRecord = initAudioRecord(this.mediaProjection, sampleRate);
 
-            muxer = new MediaMuxer(this.outputFileFd,
+            muxer = new MediaMuxer(this.outputFilePath,
                     MediaMuxer.OutputFormat.MUXER_OUTPUT_MPEG_4);
 
             // set output file orientation info

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

@@ -32,6 +32,7 @@
 import android.view.Surface;
 import android.view.WindowManager;
 
+import java.io.File;
 import java.text.SimpleDateFormat;
 import java.util.Arrays;
 import java.util.Date;
@@ -63,7 +64,7 @@
 public class Settings extends Activity {
     private static final String TAG = "APPIUM SETTINGS";
 
-    private String recordingFilename = RecorderConstant.DEFAULT_RECORDING_FILENAME;
+    private String recordingOutputPath = "";
     private int recordingRotation = -1;
 
     @Override
@@ -128,7 +129,7 @@ private void handleRecording(Intent intent) {
             return;
         }
 
-        recordingFilename = intent.getStringExtra(ACTION_RECORDING_FILENAME);
+        String recordingFilename = intent.getStringExtra(ACTION_RECORDING_FILENAME);
 
         if (isValidFileName(recordingFilename)) {
             String timeStamp = new SimpleDateFormat(
@@ -139,6 +140,25 @@ private void handleRecording(Intent intent) {
                     " using default one: " + recordingFilename);
         }
 
+        /*
+        External Storage File Directory for app
+        (i.e /storage/emulated/0/Android/data/io.appium.settings/files) may not be created
+        so we need to call getExternalFilesDir() method twice
+        source:https://www.androidbugfix.com/2021/10/getexternalfilesdirnull-returns-null-in.html
+         */
+        File externalStorageFile = getExternalFilesDir(null);
+        if (externalStorageFile == null) {
+            externalStorageFile = getExternalFilesDir(null);
+        }
+        // if path is still null despite calling method twice, early exit
+        if (externalStorageFile == null) {
+            Log.e(TAG, "handleRecording: external storage file path returns null");
+            finishActivity();
+            return;
+        }
+        recordingOutputPath = externalStorageFile.getAbsolutePath()
+                + File.separator + recordingFilename;
+
         Display display = ((WindowManager) getSystemService(WINDOW_SERVICE)).getDefaultDisplay();
 
         if (display != null) {
@@ -268,7 +288,7 @@ protected void onActivityResult(final int requestCode, final int resultCode, fin
         final Intent intent = new Intent(this, RecorderService.class);
         intent.setAction(ACTION_RECORDING_START);
         intent.putExtra(ACTION_RECORDING_RESULT_CODE, resultCode);
-        intent.putExtra(ACTION_RECORDING_FILENAME, recordingFilename);
+        intent.putExtra(ACTION_RECORDING_FILENAME, recordingOutputPath);
         intent.putExtra(ACTION_RECORDING_ROTATION, recordingRotation);
         intent.putExtras(data);