Skip to content

Commit e13eabc

Browse files
authored
Merge pull request #5 from brarcher/result-reporting
Simplify result reporting
2 parents c714e37 + d6a4799 commit e13eabc

16 files changed

+72
-761
lines changed

app/build.gradle

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,14 +37,10 @@ android {
3737

3838
dependencies {
3939
compile fileTree(dir: 'libs', include: ['*.jar'])
40-
androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
41-
exclude group: 'com.android.support', module: 'support-annotations'
42-
})
4340
compile 'com.android.support:appcompat-v7:27.0.2'
4441
compile 'com.android.support:design:27.0.2'
4542
compile 'com.writingminds:FFmpegAndroid:0.3.2'
4643
compile 'org.florescu.android.rangeseekbar:rangeseekbar-library:0.3.0'
47-
compile 'com.android.support:cardview-v7:27.0.2'
4844
compile 'commons-io:commons-io:2.5'
4945
compile group: 'com.google.guava', name: 'guava', version: '20.0'
5046
testCompile 'junit:junit:4.12'

app/src/main/AndroidManifest.xml

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@
33
package="protect.videotranscoder">
44
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
55
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
6-
<uses-permission android:name="android.permission.RECORD_AUDIO"/>
7-
<uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS"/>
86
<application
97
android:allowBackup="false"
108
android:icon="@mipmap/ic_launcher"
@@ -20,18 +18,6 @@
2018
<category android:name="android.intent.category.LAUNCHER" />
2119
</intent-filter>
2220
</activity>
23-
<activity android:name=".activity.PreviewActivity"
24-
android:screenOrientation="portrait">
25-
26-
</activity>
27-
<activity android:name=".activity.PreviewImageActivity"
28-
android:screenOrientation="portrait">
29-
30-
</activity>
31-
<activity android:name=".activity.AudioPreviewActivity"
32-
android:screenOrientation="portrait">
33-
34-
</activity>
3521
</application>
3622

3723
</manifest>

app/src/main/java/protect/videotranscoder/FFmpegResponseHandler.java

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
import android.app.ProgressDialog;
44
import android.content.Context;
5-
import android.content.Intent;
65
import android.util.Log;
76

87
import com.github.hiteshsondhi88.libffmpeg.ExecuteBinaryResponseHandler;
@@ -12,29 +11,31 @@ public class FFmpegResponseHandler extends ExecuteBinaryResponseHandler
1211
private static final String TAG = "VideoTranscoder";
1312

1413
private final Context _context;
15-
private final Intent _intentToLaunch;
1614
private final long _durationMs;
1715
private final ProgressDialog _progressDialog;
16+
private final ResultCallbackHandler<Boolean> _resultHandler;
1817

19-
public FFmpegResponseHandler(Context context, Intent intent, long durationMs, ProgressDialog progressDialog)
18+
public FFmpegResponseHandler(Context context, long durationMs, ProgressDialog progressDialog,
19+
ResultCallbackHandler<Boolean> resultHandler)
2020
{
2121
_context = context;
22-
_intentToLaunch = intent;
2322
_durationMs = durationMs;
2423
_progressDialog = progressDialog;
24+
_resultHandler = resultHandler;
2525
}
2626

2727
@Override
2828
public void onFailure(String s)
2929
{
3030
Log.d(TAG, "Failed with output : " + s);
31+
_resultHandler.onResult(false);
3132
}
3233

3334
@Override
3435
public void onSuccess(String s)
3536
{
3637
Log.d(TAG, "Success with output : " +s);
37-
_context.startActivity(_intentToLaunch);
38+
_resultHandler.onResult(true);
3839
}
3940

4041
@Override

app/src/main/java/protect/videotranscoder/activity/AudioPreviewActivity.java

Lines changed: 0 additions & 120 deletions
This file was deleted.

0 commit comments

Comments
 (0)