mudhorn/zxing
1
0
Fork 0
mirror of https://github.com/zxing/zxing.git synced 2025-03-05 20:48:51 -08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Make sure cancel is handled properly in a few cases, where app must exit after dialog

Browse source 
git-svn-id: https://zxing.googlecode.com/svn/trunk@1466 59b500cc-1b3d-0410-9834-0bbf25fbcc57
This commit is contained in:
srowen 2010-06-30 08:07:05 +00:00
parent 423c1a6ec6
commit 4a623428c1
3 changed files with 49 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
android/src/com/google/zxing/client/android/CaptureActivity.java
View file

@ -723,11 +723,8 @@ public final class CaptureActivity extends Activity implements SurfaceHolder.Cal
AlertDialog.Builder builder = new AlertDialog.Builder(this);
builder.setTitle(getString(R.string.app_name));
builder.setMessage(getString(R.string.msg_camera_framework_bug));
builder.setPositiveButton(R.string.button_ok, new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialogInterface, int i) {
finish();
}
});
builder.setPositiveButton(R.string.button_ok, new FinishListener(this));
builder.setOnCancelListener(new FinishListener(this));
builder.show();
}

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

@ -0,0 +1,43 @@
/*
* Copyright (C) 2010 ZXing authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.google.zxing.client.android;
import android.app.Activity;
import android.content.DialogInterface;
/**
* Simple listener used to exit the app in a few cases.
*
* @author Sean Owen
*/
public final class FinishListener implements DialogInterface.OnClickListener, DialogInterface.OnCancelListener {
private final Activity activityToFinish;
public FinishListener(Activity activityToFinish) {
this.activityToFinish = activityToFinish;
}
public void onCancel(DialogInterface dialogInterface) {
activityToFinish.finish();
}
public void onClick(DialogInterface dialogInterface, int i) {
activityToFinish.finish();
}
}

18
android/src/com/google/zxing/client/android/encode/EncodeActivity.java
View file

@ -18,6 +18,7 @@ package com.google.zxing.client.android.encode;
import com.google.zxing.BarcodeFormat;
import com.google.zxing.WriterException;
import com.google.zxing.client.android.FinishListener;
import com.google.zxing.client.android.Intents;
import com.google.zxing.client.android.R;
@ -83,7 +84,7 @@ public final class EncodeActivity extends Activity {
setTitle(getString(R.string.app_name) + " - " + qrCodeEncoder.getTitle());
qrCodeEncoder.requestBarcode(handler, smallerDimension);
progressDialog = ProgressDialog.show(EncodeActivity.this, null,
getString(R.string.msg_encode_in_progress), true, true, cancelListener);
getString(R.string.msg_encode_in_progress), true, true, new FinishListener(EncodeActivity.this));
} catch (IllegalArgumentException e) {
showErrorMessage(R.string.msg_encode_contents_failed);
}
@ -114,18 +115,6 @@ public final class EncodeActivity extends Activity {
}
};
private final OnClickListener clickListener = new OnClickListener() {
public void onClick(DialogInterface dialog, int which) {
finish();
}
};
private final OnCancelListener cancelListener = new OnCancelListener() {
public void onCancel(DialogInterface dialog) {
finish();
}
};
@Override
public void onCreate(Bundle icicle) {
super.onCreate(icicle);
@ -233,7 +222,8 @@ public final class EncodeActivity extends Activity {
}
AlertDialog.Builder builder = new AlertDialog.Builder(this);
builder.setMessage(message);
builder.setPositiveButton(R.string.button_ok, clickListener);
builder.setPositiveButton(R.string.button_ok, new FinishListener(this));
builder.setOnCancelListener(new FinishListener(this));
builder.show();
}
}