Fixed singleton context issue and kill process bug (hopefully)

Author: diegoperini

FFmpegAndroid/build.gradle

@@ -28,6 +28,7 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
+    buildToolsVersion '25.0.0'
 }
 
 dependencies {

FFmpegAndroid/src/main/java/com/github/hiteshsondhi88/libffmpeg/FFmpeg.java

@@ -12,7 +12,7 @@
 @SuppressWarnings("unused")
 public class FFmpeg implements FFmpegInterface {
 
-    private final Context context;
+    private final FFmpegContextProvider context;
     private FFmpegExecuteAsyncTask ffmpegExecuteAsyncTask;
     private FFmpegLoadLibraryAsyncTask ffmpegLoadLibraryAsyncTask;
 
@@ -21,14 +21,14 @@ public class FFmpeg implements FFmpegInterface {
 
     private static FFmpeg instance = null;
 
-    private FFmpeg(Context context) {
-        this.context = context.getApplicationContext();
-        Log.setDEBUG(Util.isDebug(this.context));
+    private FFmpeg(FFmpegContextProvider contextProvider) {
+        this.context = contextProvider;
+        Log.setDEBUG(Util.isDebug(this.context.provide()));
     }
 
-    public static FFmpeg getInstance(Context context) {
+    public static FFmpeg getInstance(FFmpegContextProvider contextProvider) {
         if (instance == null) {
-            instance = new FFmpeg(context);
+            instance = new FFmpeg(contextProvider);
         }
         return instance;
     }
@@ -63,7 +63,7 @@ public void execute(Map<String, String> environvenmentVars, String[] cmd, FFmpeg
             throw new FFmpegCommandAlreadyRunningException("FFmpeg command is already running, you are only allowed to run single command at a time");
         }
         if (cmd.length != 0) {
-            String[] ffmpegBinary = new String[] { FileUtils.getFFmpeg(context, environvenmentVars) };
+            String[] ffmpegBinary = new String[] { FileUtils.getFFmpeg(context.provide(), environvenmentVars) };
             String[] command = concatenate(ffmpegBinary, cmd);
             ffmpegExecuteAsyncTask = new FFmpegExecuteAsyncTask(command , timeout, ffmpegExecuteResponseHandler);
             ffmpegExecuteAsyncTask.execute();
@@ -92,7 +92,7 @@ public void execute(String[] cmd, FFmpegExecuteResponseHandler ffmpegExecuteResp
     @Override
     public String getDeviceFFmpegVersion() throws FFmpegCommandAlreadyRunningException {
         ShellCommand shellCommand = new ShellCommand();
-        CommandResult commandResult = shellCommand.runWaitFor(new String[] { FileUtils.getFFmpeg(context), "-version" });
+        CommandResult commandResult = shellCommand.runWaitFor(new String[] { FileUtils.getFFmpeg(context.provide()), "-version" });
         if (commandResult.success) {
             return commandResult.output.split(" ")[2];
         }
@@ -102,7 +102,7 @@ public String getDeviceFFmpegVersion() throws FFmpegCommandAlreadyRunningExcepti
 
     @Override
     public String getLibraryFFmpegVersion() {
-        return context.getString(R.string.shipped_ffmpeg_version);
+        return context.provide().getString(R.string.shipped_ffmpeg_version);
     }
 
     @Override

FFmpegAndroid/src/main/java/com/github/hiteshsondhi88/libffmpeg/FFmpegContextProvider.java

@@ -0,0 +1,7 @@
+package com.github.hiteshsondhi88.libffmpeg;
+
+import android.content.Context;
+
+interface FFmpegContextProvider {
+    Context provide();
+}

FFmpegAndroid/src/main/java/com/github/hiteshsondhi88/libffmpeg/FFmpegExecuteAsyncTask.java

@@ -90,6 +90,7 @@ private void checkAndUpdateProcess() throws TimeoutException, InterruptedExcepti
                 BufferedReader reader = new BufferedReader(new InputStreamReader(process.getErrorStream()));
                 while ((line = reader.readLine()) != null) {
                     if (isCancelled()) {
+                        process.destroy();
                         return;
                     }
 

FFmpegAndroid/src/main/java/com/github/hiteshsondhi88/libffmpeg/FFmpegLoadLibraryAsyncTask.java

@@ -9,22 +9,22 @@ class FFmpegLoadLibraryAsyncTask extends AsyncTask<Void, Void, Boolean> {
 
     private final String cpuArchNameFromAssets;
     private final FFmpegLoadBinaryResponseHandler ffmpegLoadBinaryResponseHandler;
-    private final Context context;
+    private final FFmpegContextProvider context;
 
-    FFmpegLoadLibraryAsyncTask(Context context, String cpuArchNameFromAssets, FFmpegLoadBinaryResponseHandler ffmpegLoadBinaryResponseHandler) {
+    FFmpegLoadLibraryAsyncTask(FFmpegContextProvider context, String cpuArchNameFromAssets, FFmpegLoadBinaryResponseHandler ffmpegLoadBinaryResponseHandler) {
         this.context = context;
         this.cpuArchNameFromAssets = cpuArchNameFromAssets;
         this.ffmpegLoadBinaryResponseHandler = ffmpegLoadBinaryResponseHandler;
     }
 
     @Override
     protected Boolean doInBackground(Void... params) {
-        File ffmpegFile = new File(FileUtils.getFFmpeg(context));
+        File ffmpegFile = new File(FileUtils.getFFmpeg(context.provide()));
         if (ffmpegFile.exists() && isDeviceFFmpegVersionOld() && !ffmpegFile.delete()) {
             return false;
         }
         if (!ffmpegFile.exists()) {
-            boolean isFileCopied = FileUtils.copyBinaryFromAssetsToData(context,
+            boolean isFileCopied = FileUtils.copyBinaryFromAssetsToData(context.provide(),
                     cpuArchNameFromAssets + File.separator + FileUtils.ffmpegFileName,
                     FileUtils.ffmpegFileName);
 
@@ -58,6 +58,6 @@ protected void onPostExecute(Boolean isSuccess) {
     }
 
     private boolean isDeviceFFmpegVersionOld() {
-        return CpuArch.fromString(FileUtils.SHA1(FileUtils.getFFmpeg(context))).equals(CpuArch.NONE);
+        return CpuArch.fromString(FileUtils.SHA1(FileUtils.getFFmpeg(context.provide()))).equals(CpuArch.NONE);
     }
 }

FFmpegAndroid/src/main/java/com/github/hiteshsondhi88/libffmpeg/Util.java

@@ -53,8 +53,13 @@ static String convertInputStreamToString(InputStream inputStream) {
     }
 
     static void destroyProcess(Process process) {
-        if (process != null)
-            process.destroy();
+        if (process != null) {
+            try {
+                process.destroy();
+            } catch (Exception e) {
+                Log.e("process destroy error", e);
+            }
+        }
     }
 
     static boolean killAsync(AsyncTask asyncTask) {

app/build.gradle

@@ -28,6 +28,7 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
+    buildToolsVersion '25.0.0'
 }
 
 dependencies {

build.gradle

@@ -5,8 +5,8 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.1.0-beta3'
-        classpath 'com.github.dcendents:android-maven-gradle-plugin:1.3'
+        classpath 'com.android.tools.build:gradle:3.0.0-alpha7'
+        classpath 'com.github.dcendents:android-maven-gradle-plugin:1.4.1'
         classpath "com.jfrog.bintray.gradle:gradle-bintray-plugin:1.1"
 
         // NOTE: Do not place your application dependencies here; they belong

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Wed Apr 20 11:52:28 GMT+05:30 2016
+#Wed Jul 19 16:37:50 EET 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.10-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-milestone-1-all.zip