mudhorn/zxing
1
0
Fork 0
mirror of https://github.com/zxing/zxing.git synced 2024-09-20 05:27:32 -07:00
Code Issues Actions Packages Projects Releases Wiki Activity

Remove last usages of Runnable/Timer in favor of AsyncTask

Browse source 
git-svn-id: https://zxing.googlecode.com/svn/trunk@2378 59b500cc-1b3d-0410-9834-0bbf25fbcc57
This commit is contained in:
srowen 2012-08-06 21:28:35 +00:00
parent 24f5b64a2f
commit 3a33c03f8d
2 changed files with 23 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
android/src/com/google/zxing/client/android/FinishListener.java
View file

@ -24,8 +24,7 @@ import android.content.DialogInterface;
*
* @author Sean Owen
*/
public final class FinishListener
implements DialogInterface.OnClickListener, DialogInterface.OnCancelListener, Runnable {
public final class FinishListener implements DialogInterface.OnClickListener, DialogInterface.OnCancelListener {
private final Activity activityToFinish;
@ -43,8 +42,7 @@ public final class FinishListener
run();
}
@Override
public void run() {
private void run() {
activityToFinish.finish();
}

36
android/src/com/google/zxing/client/android/camera/AutoFocusManager.java
View file

@ -19,14 +19,13 @@ package com.google.zxing.client.android.camera;
import android.content.Context;
import android.content.SharedPreferences;
import android.hardware.Camera;
import android.os.AsyncTask;
import android.preference.PreferenceManager;
import android.util.Log;
import com.google.zxing.client.android.PreferencesActivity;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Timer;
import java.util.TimerTask;
final class AutoFocusManager implements Camera.AutoFocusCallback {
@ -43,12 +42,10 @@ final class AutoFocusManager implements Camera.AutoFocusCallback {
private boolean active;
private final boolean useAutoFocus;
private final Camera camera;
private final Timer timer;
private TimerTask outstandingTask;
private AutoFocusTask outstandingTask;
AutoFocusManager(Context context, Camera camera) {
this.camera = camera;
timer = new Timer(true);
SharedPreferences sharedPrefs = PreferenceManager.getDefaultSharedPreferences(context);
String currentFocusMode = camera.getParameters().getFocusMode();
useAutoFocus =
@ -61,15 +58,7 @@ final class AutoFocusManager implements Camera.AutoFocusCallback {
@Override
public synchronized void onAutoFocus(boolean success, Camera theCamera) {
if (active) {
outstandingTask = new TimerTask() {
@Override
public void run() {
if (active) {
start();
}
}
};
timer.schedule(outstandingTask, AUTO_FOCUS_INTERVAL_MS);
outstandingTask = new AutoFocusTask();
}
}
@ -95,10 +84,27 @@ final class AutoFocusManager implements Camera.AutoFocusCallback {
}
}
if (outstandingTask != null) {
outstandingTask.cancel();
outstandingTask.cancel(true);
outstandingTask = null;
}
active = false;
}
private final class AutoFocusTask extends AsyncTask<Void,Void,Void> {
@Override
protected Void doInBackground(Void... voids) {
try {
Thread.sleep(AUTO_FOCUS_INTERVAL_MS);
} catch (InterruptedException e) {
// continue
}
synchronized (AutoFocusManager.this) {
if (active) {
start();
}
}
return null;
}
}
}