cleanup execute()

lint complains about concatenate()

Author: alexcohn

android-ffmpeg/src/main/java/nl/bravobit/ffmpeg/FFmpeg.java

@@ -4,7 +4,6 @@
 import android.os.AsyncTask;
 
 import java.io.File;
-import java.lang.reflect.Array;
 import java.util.Map;
 
 public class FFmpeg implements FFbinaryInterface {
@@ -54,8 +53,9 @@ public boolean isSupported() {
     @Override
     public FFtask execute(Map<String, String> environvenmentVars, String[] cmd, FFcommandExecuteResponseHandler ffmpegExecuteResponseHandler) {
         if (cmd.length != 0) {
-            String[] ffmpegBinary = new String[]{FileUtils.getFFmpeg(context.provide()).getAbsolutePath()};
-            String[] command = concatenate(ffmpegBinary, cmd);
+            final String[] command = new String[cmd.length + 1];
+            command[0] = FileUtils.getFFmpeg(context.provide()).getAbsolutePath();
+            System.arraycopy(cmd, 0, command, 1, cmd.length);
             FFcommandExecuteAsyncTask task = new FFcommandExecuteAsyncTask(command, environvenmentVars, timeout, ffmpegExecuteResponseHandler);
             task.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
             return task;
@@ -64,18 +64,6 @@ public FFtask execute(Map<String, String> environvenmentVars, String[] cmd, FFco
         }
     }
 
-    private static <T> T[] concatenate(T[] a, T[] b) {
-        int aLen = a.length;
-        int bLen = b.length;
-
-        @SuppressWarnings("unchecked")
-        T[] c = (T[]) Array.newInstance(a.getClass().getComponentType(), aLen + bLen);
-        System.arraycopy(a, 0, c, 0, aLen);
-        System.arraycopy(b, 0, c, aLen, bLen);
-
-        return c;
-    }
-
     @Override
     public FFtask execute(String[] cmd, FFcommandExecuteResponseHandler ffmpegExecuteResponseHandler) {
         return execute(null, cmd, ffmpegExecuteResponseHandler);

android-ffmpeg/src/main/java/nl/bravobit/ffmpeg/FFprobe.java

@@ -4,7 +4,6 @@
 import android.os.AsyncTask;
 
 import java.io.File;
-import java.lang.reflect.Array;
 import java.util.Map;
 
 public class FFprobe implements FFbinaryInterface {
@@ -52,8 +51,9 @@ public boolean isSupported() {
     @Override
     public FFtask execute(Map<String, String> environvenmentVars, String[] cmd, FFcommandExecuteResponseHandler ffcommandExecuteResponseHandler) {
         if (cmd.length != 0) {
-            String[] ffprobeBinary = new String[]{FileUtils.getFFprobe(context.provide()).getAbsolutePath()};
-            String[] command = concatenate(ffprobeBinary, cmd);
+            final String[] command = new String[cmd.length + 1];
+            command[0] = FileUtils.getFFprobe(context.provide()).getAbsolutePath();
+            System.arraycopy(cmd, 0, command, 1, cmd.length);
             FFcommandExecuteAsyncTask task = new FFcommandExecuteAsyncTask(command, environvenmentVars, timeout, ffcommandExecuteResponseHandler);
             task.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
             return task;
@@ -62,18 +62,6 @@ public FFtask execute(Map<String, String> environvenmentVars, String[] cmd, FFco
         }
     }
 
-    private static <T> T[] concatenate(T[] a, T[] b) {
-        int aLen = a.length;
-        int bLen = b.length;
-
-        @SuppressWarnings("unchecked")
-        T[] c = (T[]) Array.newInstance(a.getClass().getComponentType(), aLen + bLen);
-        System.arraycopy(a, 0, c, 0, aLen);
-        System.arraycopy(b, 0, c, aLen, bLen);
-
-        return c;
-    }
-
     @Override
     public FFtask execute(String[] cmd, FFcommandExecuteResponseHandler ffcommandExecuteResponseHandler) {
         return execute(null, cmd, ffcommandExecuteResponseHandler);