TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-06-19 08:38:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove CameraView usage of JobManager.

Browse Source 
WorkManager flat-out can't handle anonymous implementations of Worker
classes due to it using reflection to instantiate them.
This commit is contained in:
Greyson Parrelli 2018-09-27 19:57:55 -07:00
parent 87e6aa48bb
commit 2f530dc970
1 changed files with 14 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
src/org/thoughtcrime/securesms/components/camera/CameraView.java
View File

@ -485,60 +485,40 @@ public class CameraView extends ViewGroup {
} }
private void enqueueTask(SerialAsyncTask job) { private void enqueueTask(SerialAsyncTask job) {
ApplicationContext.getInstance(getContext()).getJobManager().add(job); AsyncTask.SERIAL_EXECUTOR.execute(job);
} }
private static abstract class SerialAsyncTask<Result> extends Job { public static abstract class SerialAsyncTask<Result> implements Runnable {
public SerialAsyncTask() { @Override
super(JobParameters.newBuilder().withGroupId(CameraView.class.getSimpleName()).create()); public final void run() {
} if (!onWait()) {
@Override public void onAdded() {}
@Override public final void onRun() {
try {
onWait();
Util.runOnMainSync(new Runnable() {
@Override public void run() {
onPreMain();
}
});
final Result result = onRunBackground();
Util.runOnMainSync(new Runnable() {
@Override public void run() {
onPostMain(result);
}
});
} catch (PreconditionsNotMetException e) {
Log.w(TAG, "skipping task, preconditions not met in onWait()"); Log.w(TAG, "skipping task, preconditions not met in onWait()");
} return;
} }
@Override public boolean onShouldRetry(Exception e) { Util.runOnMainSync(this::onPreMain);
return false; final Result result = onRunBackground();
Util.runOnMainSync(() -> onPostMain(result));
} }
@Override public void onCanceled() { } protected boolean onWait() { return true; }
protected void onWait() throws PreconditionsNotMetException {}
protected void onPreMain() {} protected void onPreMain() {}
protected Result onRunBackground() { return null; } protected Result onRunBackground() { return null; }
protected void onPostMain(Result result) {} protected void onPostMain(Result result) {}
} }
private abstract class PostInitializationTask<Result> extends SerialAsyncTask<Result> { private abstract class PostInitializationTask<Result> extends SerialAsyncTask<Result> {
@Override protected void onWait() throws PreconditionsNotMetException { @Override protected boolean onWait() {
synchronized (CameraView.this) { synchronized (CameraView.this) {
if (!camera.isPresent()) { if (!camera.isPresent()) {
throw new PreconditionsNotMetException(); return false;
} }
while (getMeasuredHeight() <= 0 || getMeasuredWidth() <= 0 || !surface.isReady()) { while (getMeasuredHeight() <= 0 || getMeasuredWidth() <= 0 || !surface.isReady()) {
Log.i(TAG, String.format("waiting. surface ready? %s", surface.isReady())); Log.i(TAG, String.format("waiting. surface ready? %s", surface.isReady()));
Util.wait(CameraView.this, 0); Util.wait(CameraView.this, 0);
} }
return true;
} }
} }
} }