summaryrefslogtreecommitdiff
path: root/android/src/com/google
diff options
context:
space:
mode:
authorSean Owen <srowen@gmail.com>2015-01-30 23:35:37 +0300
committerSean Owen <srowen@gmail.com>2015-01-30 23:35:37 +0300
commit894ab95ea04b46abcb8c568c1bb8295d555ce2fc (patch)
treebcf3fa7a3d24d8d6c118baf95493a563d47615d4 /android/src/com/google
parentc02bf4ca8eb81c1de2f4de3d401603d509877c89 (diff)
downloadzxing-894ab95ea04b46abcb8c568c1bb8295d555ce2fc.tar.xz
Closes issue #302 : incorrectly remembers state from Intent after processing
Diffstat (limited to 'android/src/com/google')
-rwxr-xr-xandroid/src/com/google/zxing/client/android/CaptureActivity.java3
1 files changed, 3 insertions, 0 deletions
diff --git a/android/src/com/google/zxing/client/android/CaptureActivity.java b/android/src/com/google/zxing/client/android/CaptureActivity.java
index d4fe7dbc6..09e735c91 100755
--- a/android/src/com/google/zxing/client/android/CaptureActivity.java
+++ b/android/src/com/google/zxing/client/android/CaptureActivity.java
@@ -198,6 +198,8 @@ public final class CaptureActivity extends Activity implements SurfaceHolder.Cal
&& (intent == null || intent.getBooleanExtra(Intents.Scan.SAVE_HISTORY, true));
source = IntentSource.NONE;
+ sourceUrl = null;
+ scanFromWebPageManager = null;
decodeFormats = null;
characterSet = null;
@@ -681,6 +683,7 @@ public final class CaptureActivity extends Activity implements SurfaceHolder.Cal
if (scanFromWebPageManager != null && scanFromWebPageManager.isScanFromWebPage()) {
String replyURL = scanFromWebPageManager.buildReplyURL(rawResult, resultHandler);
+ scanFromWebPageManager = null;
sendReplyMessage(R.id.launch_product_query, replyURL, resultDurationMS);
}