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

Remove progress dialog to avoid rare exception

Browse source 
git-svn-id: https://zxing.googlecode.com/svn/trunk@1484 59b500cc-1b3d-0410-9834-0bbf25fbcc57
This commit is contained in:
srowen 2010-07-15 15:18:31 +00:00
parent 273220b3f8
commit 3cdba67bf6
1 changed files with 0 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -24,10 +24,6 @@ import com.google.zxing.client.android.R;
import android.app.Activity; import android.app.Activity;
import android.app.AlertDialog; import android.app.AlertDialog;
import android.app.ProgressDialog;
import android.content.DialogInterface;
import android.content.DialogInterface.OnCancelListener;
import android.content.DialogInterface.OnClickListener;
import android.content.Intent; import android.content.Intent;
import android.graphics.Bitmap; import android.graphics.Bitmap;
import android.net.Uri; import android.net.Uri;
@ -62,7 +58,6 @@ public final class EncodeActivity extends Activity {
private static final int MAX_BARCODE_FILENAME_LENGTH = 24; private static final int MAX_BARCODE_FILENAME_LENGTH = 24;
private QRCodeEncoder qrCodeEncoder; private QRCodeEncoder qrCodeEncoder;
private ProgressDialog progressDialog;
private boolean firstLayout; private boolean firstLayout;
/** /**
@ -83,8 +78,6 @@ public final class EncodeActivity extends Activity {
qrCodeEncoder = new QRCodeEncoder(EncodeActivity.this, intent); qrCodeEncoder = new QRCodeEncoder(EncodeActivity.this, intent);
setTitle(getString(R.string.app_name) + " - " + qrCodeEncoder.getTitle()); setTitle(getString(R.string.app_name) + " - " + qrCodeEncoder.getTitle());
qrCodeEncoder.requestBarcode(handler, smallerDimension); qrCodeEncoder.requestBarcode(handler, smallerDimension);
progressDialog = ProgressDialog.show(EncodeActivity.this, null,
getString(R.string.msg_encode_in_progress), true, true, new FinishListener(EncodeActivity.this));
} catch (IllegalArgumentException e) { } catch (IllegalArgumentException e) {
showErrorMessage(R.string.msg_encode_contents_failed); showErrorMessage(R.string.msg_encode_contents_failed);
} }
@ -98,8 +91,6 @@ public final class EncodeActivity extends Activity {
public void handleMessage(Message message) { public void handleMessage(Message message) {
switch (message.what) { switch (message.what) {
case R.id.encode_succeeded: case R.id.encode_succeeded:
progressDialog.dismiss();
progressDialog = null;
Bitmap image = (Bitmap) message.obj; Bitmap image = (Bitmap) message.obj;
ImageView view = (ImageView) findViewById(R.id.image_view); ImageView view = (ImageView) findViewById(R.id.image_view);
view.setImageBitmap(image); view.setImageBitmap(image);
@ -209,17 +200,12 @@ public final class EncodeActivity extends Activity {
@Override @Override
protected void onResume() { protected void onResume() {
super.onResume(); super.onResume();
View layout = findViewById(R.id.encode_view); View layout = findViewById(R.id.encode_view);
layout.getViewTreeObserver().addOnGlobalLayoutListener(layoutListener); layout.getViewTreeObserver().addOnGlobalLayoutListener(layoutListener);
firstLayout = true; firstLayout = true;
} }
private void showErrorMessage(int message) { private void showErrorMessage(int message) {
if (progressDialog != null) {
progressDialog.dismiss();
progressDialog = null;
}
AlertDialog.Builder builder = new AlertDialog.Builder(this); AlertDialog.Builder builder = new AlertDialog.Builder(this);
builder.setMessage(message); builder.setMessage(message);
builder.setPositiveButton(R.string.button_ok, new FinishListener(this)); builder.setPositiveButton(R.string.button_ok, new FinishListener(this));