Merge pull request ypresto#13 from ypresto/generify-future

Generify Future type

Author: ypresto

example/src/main/java/net/ypresto/androidtranscoder/example/TranscoderActivity.java

@@ -28,7 +28,7 @@ public class TranscoderActivity extends Activity {
     private static final String TAG = "TranscoderActivity";
     private static final int REQUEST_CODE_PICK = 1;
     private static final int PROGRESS_BAR_MAX = 1000;
-    private Future mFuture;
+    private Future<Void> mFuture;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {

lib/src/main/java/net/ypresto/androidtranscoder/MediaTranscoder.java

@@ -74,7 +74,7 @@ public static MediaTranscoder getInstance() {
      * @deprecated Use {@link #transcodeVideo(FileDescriptor, String, MediaFormatStrategy, MediaTranscoder.Listener)} which accepts output video format.
      */
     @Deprecated
-    public Future transcodeVideo(final FileDescriptor inFileDescriptor, final String outPath, final Listener listener) {
+    public Future<Void> transcodeVideo(final FileDescriptor inFileDescriptor, final String outPath, final Listener listener) {
         return transcodeVideo(inFileDescriptor, outPath, new MediaFormatStrategy() {
             @Override
             public MediaFormat createVideoOutputFormat(MediaFormat inputFormat) {
@@ -98,7 +98,7 @@ public MediaFormat createAudioOutputFormat(MediaFormat inputFormat) {
      * @param listener          Listener instance for callback.
      * @throws IOException if input file could not be read.
      */
-    public Future transcodeVideo(final String inPath, final String outPath, final MediaFormatStrategy outFormatStrategy, final Listener listener) throws IOException {
+    public Future<Void> transcodeVideo(final String inPath, final String outPath, final MediaFormatStrategy outFormatStrategy, final Listener listener) throws IOException {
         FileInputStream fileInputStream = null;
         FileDescriptor inFileDescriptor;
         try {
@@ -158,11 +158,11 @@ private void closeStream() {
      * @param outFormatStrategy Strategy for output video format.
      * @param listener          Listener instance for callback.
      */
-    public Future transcodeVideo(final FileDescriptor inFileDescriptor, final String outPath, final MediaFormatStrategy outFormatStrategy, final Listener listener) {
+    public Future<Void> transcodeVideo(final FileDescriptor inFileDescriptor, final String outPath, final MediaFormatStrategy outFormatStrategy, final Listener listener) {
         Looper looper = Looper.myLooper();
         if (looper == null) looper = Looper.getMainLooper();
         final Handler handler = new Handler(looper);
-        final AtomicReference<Future> futureReference = new AtomicReference<>();
+        final AtomicReference<Future<Void>> futureReference = new AtomicReference<>();
         final Future<Void> createdFuture = mExecutor.submit(new Callable<Void>() {
             @Override
             public Void call() throws Exception {
@@ -201,7 +201,7 @@ public void run() {
                         if (exception == null) {
                             listener.onTranscodeCompleted();
                         } else {
-                            Future future = futureReference.get();
+                            Future<Void> future = futureReference.get();
                             if (future != null && future.isCancelled()) {
                                 listener.onTranscodeCanceled();
                             } else {