From 8eb473fc40691abe8515e7f0916637eb6c208426 Mon Sep 17 00:00:00 2001 From: srowen Date: Fri, 20 Jan 2012 19:43:58 +0000 Subject: [PATCH] Remove defunct 'buggy' message for 4.0 from HelpActivity. And add the other half of new History impl that I forgot git-svn-id: https://zxing.googlecode.com/svn/trunk@2125 59b500cc-1b3d-0410-9834-0bbf25fbcc57 --- android/res/values-ar/strings.xml | 1 - android/res/values-bg/strings.xml | 1 - android/res/values-ca/strings.xml | 1 - android/res/values-cs/strings.xml | 1 - android/res/values-da/strings.xml | 1 - android/res/values-de/strings.xml | 1 - android/res/values-el/strings.xml | 1 - android/res/values-es/strings.xml | 1 - android/res/values-fi/strings.xml | 1 - android/res/values-fr/strings.xml | 1 - android/res/values-he/strings.xml | 1 - android/res/values-hi/strings.xml | 1 - android/res/values-hu/strings.xml | 1 - android/res/values-id/strings.xml | 1 - android/res/values-it/strings.xml | 1 - android/res/values-iw/strings.xml | 1 - android/res/values-ja/strings.xml | 1 - android/res/values-ko/strings.xml | 1 - android/res/values-nl/strings.xml | 1 - android/res/values-pl/strings.xml | 1 - android/res/values-pt/strings.xml | 1 - android/res/values-ru/strings.xml | 1 - android/res/values-sk/strings.xml | 1 - android/res/values-sl/strings.xml | 1 - android/res/values-sv/strings.xml | 1 - android/res/values-tr/strings.xml | 1 - android/res/values-zh-rCN/strings.xml | 1 - android/res/values-zh-rTW/strings.xml | 1 - android/res/values/strings.xml | 1 - .../zxing/client/android/CaptureActivity.java | 34 ++++++++++++- .../zxing/client/android/HelpActivity.java | 49 ------------------- 31 files changed, 33 insertions(+), 79 deletions(-) diff --git a/android/res/values-ar/strings.xml b/android/res/values-ar/strings.xml index 1f5452333..b374ea10f 100644 --- a/android/res/values-ar/strings.xml +++ b/android/res/values-ar/strings.xml @@ -66,7 +66,6 @@ إعدادات مشاركة حسب مكتبة الرمز الشريطي ZXing مفتوحة المصادر - يوجد بالهاتف أخطاء معروفة تتسبب في حدوث مشكلات في مسح الرمز الشريطي. لمزيد من المعلومات، قم بزيارة http://code.google.com/p/zxing/wiki/FrequentlyAskedQuestions معظم الدراسي : الباركود الممسوحة ضوئيا وحفظها عفوا، حدثت مشكلة في كاميرا جهاز Android. قد تحتاج إلى إعادة تشغيل الجهاز. التنسيق diff --git a/android/res/values-bg/strings.xml b/android/res/values-bg/strings.xml index 6482a42bc..94d6f6cc8 100644 --- a/android/res/values-bg/strings.xml +++ b/android/res/values-bg/strings.xml @@ -66,7 +66,6 @@ Настройки Сподели Базирано на библиотеката с отворен код\nZXing Barcode - Това устройство демонстрира проблеми при сканиране на баркодове. За повече информация посетете http://code.google.com/p/zxing/wiki/FrequentlyAskedQuestions Масов режим: баркодът е сканиран и записан Съжаляваме, срещнахме проблем с камерата. Може да се наложи да рестартирате устройството си. Формат diff --git a/android/res/values-ca/strings.xml b/android/res/values-ca/strings.xml index 3358a03e4..74a9741d6 100644 --- a/android/res/values-ca/strings.xml +++ b/android/res/values-ca/strings.xml @@ -66,7 +66,6 @@ Configuració Comparteix L\'aplicació oficial per a l\'Android del projecte de codi obert de codis de barres ZXing. - Aquests dispostiu té errors coneguts que poden causar problemes en escanejar codis de barres. Per obtenir més informació, visiteu http://code.google.com/p/zxing/wiki/FrequentlyAskedQuestions (en anglès) Mode en bloc: codi de barres escanejat i desat S\'ha produït un problema amb la càmera de l\'Android. Potser haureu de reiniciar el dispositiu. Format diff --git a/android/res/values-cs/strings.xml b/android/res/values-cs/strings.xml index f01c7ffbf..60f04096a 100644 --- a/android/res/values-cs/strings.xml +++ b/android/res/values-cs/strings.xml @@ -66,7 +66,6 @@ Nastavení Sdílet Na bázi open source ZXing Barcode Library - Tento přístroj má známé chyby, které způsobují problémy čárového kódu. Pro Více informací najdete na http://code.google.com/p/zxing/wiki/FrequentlyAskedQuestions Bulk režimu: čárový kód naskenované a uložené Omlouváme se, fotoaparát má problém. Možná bude nutné restartovat zařízení Formát diff --git a/android/res/values-da/strings.xml b/android/res/values-da/strings.xml index 27528d2e8..1cd6e3e08 100644 --- a/android/res/values-da/strings.xml +++ b/android/res/values-da/strings.xml @@ -66,7 +66,6 @@ Indstillinger Del Open sourceprojektet ZXings officielle Android-app. - Denne enhed har kendte fejl, der forårsager stregkodescanningsproblemer. For mere information, besøg http://code.google.com/p/zxing/wiki/FrequentlyAskedQuestions (på engelsk) Massetilstand: stregkode scannet og gemt Beklager, Android-kameraet er stødt på et problem. Du skal muligvis genstarte enheden. Format diff --git a/android/res/values-de/strings.xml b/android/res/values-de/strings.xml index ffea4f175..d4c6546cc 100644 --- a/android/res/values-de/strings.xml +++ b/android/res/values-de/strings.xml @@ -66,7 +66,6 @@ Einstellungen Senden Basiert auf der Open Source ZXing Barcode Bibliothek - Bei diesem Gerät sind Fehler bekannt, die beim Barcode-Scanning Probleme bereiten. Weitere Informationen auf http://code.google.com/p/zxing/wiki/FrequentlyAskedQuestions Bulk-Modus: Barcode gescannt und gespeichert Bei der Android-Kamera ist leider ein Fehler aufgetreten. Es könnte sein, dass Sie das Gerät neu starten müssen. Format diff --git a/android/res/values-el/strings.xml b/android/res/values-el/strings.xml index c85ada91e..06299ac04 100644 --- a/android/res/values-el/strings.xml +++ b/android/res/values-el/strings.xml @@ -66,7 +66,6 @@ Ρυθμίσεις Κοινή χρήση Η επίσημη εφαρμογή του Android από το πρότζεκτ ανοιχτού κώδικα ZXing barcode. - Αυτή η συσκευή έχει γνωστά σφάλματα που ίσως προκαλέσουν προβλήματα στο σκανάρισμα. Για περισσότερες πληροφορίες, επισκεφτείτε http://code.google.com/p/zxing/wiki/FrequentlyAskedQuestions Μαζική λειτουργία: barcode σκαναρίστηκε και αποθηκεύτηκε Συγνώμη, προέκυψε ένα πρόβλημα με την κάμερα. Ίσως χρειαστεί να επανεκιννήσετε τη συσκευή. Διαμόρφωση diff --git a/android/res/values-es/strings.xml b/android/res/values-es/strings.xml index 06cb72662..212796343 100644 --- a/android/res/values-es/strings.xml +++ b/android/res/values-es/strings.xml @@ -66,7 +66,6 @@ Configuración Compartir La aplicación oficial de Android del proyecto de código de barras de código abierto ZXing. - Este dispositivo tiene errores conocidos que causan problemas de escaneado de código de barras. Para más información, visite http://code.google.com/p/zxing/wiki/FrequentlyAskedQuestions Modo Masivo: código de barras escaneado y guardado Lo sentimos, la cámara de Android ha encontrado un problema. Es posible que necesite reiniciar el dispositivo. Formato diff --git a/android/res/values-fi/strings.xml b/android/res/values-fi/strings.xml index 32787072b..493060852 100644 --- a/android/res/values-fi/strings.xml +++ b/android/res/values-fi/strings.xml @@ -66,7 +66,6 @@ Asetukset Jaa Perustuu avoimen koodin ZXing Barcode kirjastoon - Tämä laite on tunnettuja vikoja, jotka aiheuttavat viivakoodi skannauksen ongelmia. Varten Lisätietoja http://code.google.com/p/zxing/wiki/FrequentlyAskedQuestions Bulk tila: viivakoodi skannataan ja tallennetaan Anteeksi, Android kamera kohtasi virheen. Sinun täytyy ehkä käynnistää laite uudelleen. Formaatti diff --git a/android/res/values-fr/strings.xml b/android/res/values-fr/strings.xml index e066ee231..bb99dbc6f 100644 --- a/android/res/values-fr/strings.xml +++ b/android/res/values-fr/strings.xml @@ -66,7 +66,6 @@ Paramètres Partager L\'application Android officielle du projet libre ZXing. - Cet appareil a rencontré un bogue entraînant des problèmes de lecture de codes-barres. Pour plus d\'informations, rendez-vous sur http://code.google.com/p/zxing/wiki/FrequentlyAskedQuestions Mode lecture en rafale : code-barres scanné et enregistré Désolé, la caméra Android rencontré un problème. Un redémarrage de l\'appareil est peut-être nécessaire. Format diff --git a/android/res/values-he/strings.xml b/android/res/values-he/strings.xml index 8309b8c9f..27d9604fb 100755 --- a/android/res/values-he/strings.xml +++ b/android/res/values-he/strings.xml @@ -66,7 +66,6 @@ הגדרות שתף מבוסס עם ספריית הקוד הפתוח ZXing Barcode Library - במכשיר זה יופיעו תקלות ידועות שיגרמו לבעיות בסריקת ברקודים. לקבלת מידע נוסף, בקר http://code.google.com/p/zxing/wiki/FrequentlyAskedQuestions מצב קבוצה: ברקוד נסרק ונשמר סליחה, מצלמת האנדרואיד נתקלה בבעיה. ייתכן שיהיה עליך להפעיל מחדש את המכשיר. פורמט diff --git a/android/res/values-hi/strings.xml b/android/res/values-hi/strings.xml index 8ca47486c..0fe7aaf23 100644 --- a/android/res/values-hi/strings.xml +++ b/android/res/values-hi/strings.xml @@ -66,7 +66,6 @@ सेटिंग्स शेयर खुला स्रोत ZXing बारकोड परियोजना के आधिकारिक Android के बॉक्स. - इस डिवाइस कीड़े कि बारकोड स्कैनिंग समस्याओं के कारण जाना जाता है. अधिक जानकारी के लिए, http://code.google.com/p/zxing/wiki/FrequentlyAskedQuestions यात्रा थोक मोड: बारकोड स्कैन और बचाया क्षमा करें, Android कैमरा एक समस्या का सामना करना पड़ा. आप डिवाइस को पुनरारंभ करने की आवश्यकता हो सकती है. प्रारूप diff --git a/android/res/values-hu/strings.xml b/android/res/values-hu/strings.xml index dcecdb819..8747ae29e 100644 --- a/android/res/values-hu/strings.xml +++ b/android/res/values-hu/strings.xml @@ -66,7 +66,6 @@ Beállítások Megosztás A nyílt forráskódú ZXing vonalkód projekt hivatalos Android alkalmazása. - Ennek a készüléknek vannak ismert hibái, melyek vonalkód olvasási problémákat okoznak. További információkért látogassa meg a http://code.google.com/p/zxing/wiki/FrequentlyAskedQuestions weboldalt Tömeges beolvasás: vonalkód beszkennelve és mentve Android kamera hiba. Lehet, hogy újra kell indítania a készüléket. Formátum diff --git a/android/res/values-id/strings.xml b/android/res/values-id/strings.xml index 09301386c..d0eb7aaac 100644 --- a/android/res/values-id/strings.xml +++ b/android/res/values-id/strings.xml @@ -66,7 +66,6 @@ Pengaturan Bagikan ZXing barcode merupakan aplikasi proyek resmi dari Android. - Perangkat ini diketahui memiliki bug yang dapat menyebabkan pemindaian barcode bermasalah. Untuk informasi lebih lanjut, kunjungi http://code.google.com/p/zxing/wiki/FrequentlyAskedQuestions Bulk mode: barcode sudah dipindai dan disimpan Maaf, kamera pada Android mengalami masalah. Anda mungkin perlu me-restart perangkat. Bentuk diff --git a/android/res/values-it/strings.xml b/android/res/values-it/strings.xml index f6aadfb08..5d33d0f95 100644 --- a/android/res/values-it/strings.xml +++ b/android/res/values-it/strings.xml @@ -66,7 +66,6 @@ Impostazioni Condividi Basato sulla libreria di software libero ZXing Barcode - Questo dispositivo ha un bug noto che causa problemi con la scansione dei codici a barre. Per ulteriori informazioni, visita http://code.google.com/p/zxing/wiki/FrequentlyAskedQuestions Modalità di gruppo: codici a barre scansionati e salvati Spiacenti, la fotocamera Android ha riscontrato un problema. Potrebbe essere necessario riavviare il dispositivo. Formato diff --git a/android/res/values-iw/strings.xml b/android/res/values-iw/strings.xml index 8309b8c9f..27d9604fb 100644 --- a/android/res/values-iw/strings.xml +++ b/android/res/values-iw/strings.xml @@ -66,7 +66,6 @@ הגדרות שתף מבוסס עם ספריית הקוד הפתוח ZXing Barcode Library - במכשיר זה יופיעו תקלות ידועות שיגרמו לבעיות בסריקת ברקודים. לקבלת מידע נוסף, בקר http://code.google.com/p/zxing/wiki/FrequentlyAskedQuestions מצב קבוצה: ברקוד נסרק ונשמר סליחה, מצלמת האנדרואיד נתקלה בבעיה. ייתכן שיהיה עליך להפעיל מחדש את המכשיר. פורמט diff --git a/android/res/values-ja/strings.xml b/android/res/values-ja/strings.xml index 9f8b20f25..47980b090 100644 --- a/android/res/values-ja/strings.xml +++ b/android/res/values-ja/strings.xml @@ -66,7 +66,6 @@ 設定 共有 オープンソースのバーコード ライブラリ、ZXing を使用しています - このデバイスでは、バーコードのスキャンに問題があります。 詳細については、http://code.google.com/p/zxing/wiki/FrequentlyAskedQuestions を参照してください 連続モード：バーコードスキャンして保存 申し訳ありませんが、Androidのカメラに問題が発生しました。デバイスを再起動する必要があります。 フォーマット diff --git a/android/res/values-ko/strings.xml b/android/res/values-ko/strings.xml index 2862ac597..0857a929f 100644 --- a/android/res/values-ko/strings.xml +++ b/android/res/values-ko/strings.xml @@ -66,7 +66,6 @@ 설정 공유 오픈소스 ZXing Barcode Library를 이용하여 제작된 어플 - 해당 기기는 바코드 스캐닝시 알려진 버그가 있습니다. 더 많은 정보를 얻기 위해서는 다음 주소를 방문하세요.(영문)http://code.google.com/p/zxing/wiki/FrequentlyAskedQuestions 일괄 스캔 모드: 바코드가 읽히고 저장됩니다. 죄송합니다. 기기의 카메라에 오류가 생겼습니다. 기기를 재시작 해야될 수도 있습니다. 포맷 diff --git a/android/res/values-nl/strings.xml b/android/res/values-nl/strings.xml index 9a8e9261a..e87f4f04e 100644 --- a/android/res/values-nl/strings.xml +++ b/android/res/values-nl/strings.xml @@ -66,7 +66,6 @@ Instellingen Deel Gebaseerd op de open source ZXing Barcodebibliotheek - Dit apparaat heeft bekende bugs die ervoor zorgen dat er zich problemen voor kunnen doen bij het scannen. Voor meer informatie, bezoek http://code.google.com/p/zxing/wiki/FrequentlyAskedQuestions Bulk mode: barcode gescand en opgeslagen Sorry, er is een probleem met de Androidcamera. Probeer je telefoon te herstarten. Formaat diff --git a/android/res/values-pl/strings.xml b/android/res/values-pl/strings.xml index 8674115c4..28951c62c 100644 --- a/android/res/values-pl/strings.xml +++ b/android/res/values-pl/strings.xml @@ -66,7 +66,6 @@ Ustawienia Udostępnij Bazowane na bibliotece kodów paskowych ZXing o otwartym źródle - To urządzenie wykazuje znane błędy które powodują problemy podczas skanowania kodów paskowych. W celu otrzymania dalszych informacji, odwiedź http://code.google.com/p/zxing/wiki/FrequentlyAskedQuestions Tryb zbiorcze: skanowania kodów kreskowych i zapisaniu Przepraszamy, aparat Android napotkał problem. Może wystąpić potrzeba ponownego uruchomienia urządzenia. Format diff --git a/android/res/values-pt/strings.xml b/android/res/values-pt/strings.xml index 87f68752f..d2e9bd318 100644 --- a/android/res/values-pt/strings.xml +++ b/android/res/values-pt/strings.xml @@ -66,7 +66,6 @@ Definições Partilhar Baseado na biblioteca de código de barras de código aberto ZXing - Este dispositivo tem bugs conhecidos que causam problemas de varredura de código de barras. Para obter mais informações, visite http://code.google.com/p/zxing/wiki/FrequentlyAskedQuestions Modo em massa: código de barras lido e guardado Desculpe, a câmera do Android encontrou um problema. Poderá precisar de reiniciar o dispositivo. Formato diff --git a/android/res/values-ru/strings.xml b/android/res/values-ru/strings.xml index 0f167face..47b6651d9 100644 --- a/android/res/values-ru/strings.xml +++ b/android/res/values-ru/strings.xml @@ -66,7 +66,6 @@ Настройки Поделиться Основано на свободной библиотеке штрих-кодов ZXing - Это устройство имеет известные ошибки при сканировании штрих-кода. Для получения более подробной информации, посетите http://code.google.com/p/zxing/wiki/FrequentlyAskedQuestions Массовый режим: сохранять историю сканирования К сожалению, возникла ошибка камеры. Вам может потребоваться перезагрузка устройства. Формат diff --git a/android/res/values-sk/strings.xml b/android/res/values-sk/strings.xml index a5bd191a9..da7746c2a 100644 --- a/android/res/values-sk/strings.xml +++ b/android/res/values-sk/strings.xml @@ -66,7 +66,6 @@ Nastavenia Zdieľať Založené na otvorených zdrojových kódoch knižnice čiarových kódov ZXing - Toto zariadenie má známe chyby, ktoré spôsobujú problémy skenovania čiarových kódov. Pre viac informácií navštívte http://code.google.com/p/zxing/wiki/FrequentlyAskedQuestions Hromadný mód: čiarový kód naskenovaný a uložený Ospravedlňujeme sa, fotoaparát narazil na problém. Možno bude potrebné reštartovať zariadenie. Formát diff --git a/android/res/values-sl/strings.xml b/android/res/values-sl/strings.xml index 0e123f196..d02b16d88 100644 --- a/android/res/values-sl/strings.xml +++ b/android/res/values-sl/strings.xml @@ -66,7 +66,6 @@ Nastavitve Deli Temelji na odprtokodni ZXing Barcode knjižnici - Ta naprava ima znane hrošče, ki povzročajo težave z branjem črtih kod. Za več informacij obiščite http://code.google.com/p/zxing/wiki/FrequentlyAskedQuestions Slikanje na debelo: črtna koda prebrana in shranjena Oprostite, Android kamera je naletela na težave. Mogoče boste morali ponovno zagnati napravo. Format diff --git a/android/res/values-sv/strings.xml b/android/res/values-sv/strings.xml index a6e2715b3..2b699366e 100644 --- a/android/res/values-sv/strings.xml +++ b/android/res/values-sv/strings.xml @@ -66,7 +66,6 @@ Inställningar Dela Baserad på ZXing Barcode Library som är öppen källkod - Den här enheten har kända buggar som medför problem med skanning av streckkoder. För mer information, besök http://code.google.com/p/zxing/wiki/FrequentlyAskedQuestions Bulk-läge: streckkod skannas och sparas Tyvärr, Androidens kamera fick problem. Du kan behöva starta om enheten. Format diff --git a/android/res/values-tr/strings.xml b/android/res/values-tr/strings.xml index 42708ddc2..49be64763 100644 --- a/android/res/values-tr/strings.xml +++ b/android/res/values-tr/strings.xml @@ -66,7 +66,6 @@ Ayarlar Paylaş Açık kaynak ZXing Barkod Kitaplığı temellidir - Bu cihaz barkod tarama sorunlarına yol açtığı bilinen hatalar içermektedir. Daha fazla bilgi için şu adresi ziyaret edin: http://code.google.com/p/zxing/wiki/FrequentlyAskedQuestions Toplu modu: taranan ve kaydedilen barkodlar Üzgünüz, Android kamera bir sorunla karşılaştı. Cihazı yeniden başlatmanız gerekebilir. Biçim diff --git a/android/res/values-zh-rCN/strings.xml b/android/res/values-zh-rCN/strings.xml index 136313594..b96ef1033 100644 --- a/android/res/values-zh-rCN/strings.xml +++ b/android/res/values-zh-rCN/strings.xml @@ -66,7 +66,6 @@ 设置 分享 基于ZXing开源条码引擎 - 此设备存在已知问题，将导致条码扫描器出错。更多信息，请访问 http://code.google.com/p/zxing/wiki/FrequentlyAskedQuestions 批量扫描：找到条码，已保存 抱歉，Android相机出现问题。您可能需要重启设备。 格式 diff --git a/android/res/values-zh-rTW/strings.xml b/android/res/values-zh-rTW/strings.xml index e68a9f8ef..f88ce523c 100644 --- a/android/res/values-zh-rTW/strings.xml +++ b/android/res/values-zh-rTW/strings.xml @@ -66,7 +66,6 @@ 設定 分享 ZXing 開放原始碼條碼掃描專案的官方 Android 應用程式 - 該裝置有已知的錯誤導致條碼掃描有問題。如需更多資訊，請至 http://code.google.com/p/zxing/wiki/FrequentlyAskedQuestions 大量掃描模式：條碼掃描並儲存 很抱歉，相機出現問題。您可能需要重新啟動設備。 格式 diff --git a/android/res/values/strings.xml b/android/res/values/strings.xml index 5d3f9ba91..d12a22232 100755 --- a/android/res/values/strings.xml +++ b/android/res/values/strings.xml @@ -66,7 +66,6 @@ Settings Share The official Android app of the open source ZXing barcode project. - This device has known bugs that cause barcode scanning problems. For more information, visit http://code.google.com/p/zxing/wiki/FrequentlyAskedQuestions Bulk mode: barcode scanned and saved Sorry, the Android camera encountered a problem. You may need to restart the device. Format diff --git a/android/src/com/google/zxing/client/android/CaptureActivity.java b/android/src/com/google/zxing/client/android/CaptureActivity.java index 30859f4c0..dad8ed122 100755 --- a/android/src/com/google/zxing/client/android/CaptureActivity.java +++ b/android/src/com/google/zxing/client/android/CaptureActivity.java @@ -22,6 +22,7 @@ import com.google.zxing.ResultMetadataType; import com.google.zxing.ResultPoint; import com.google.zxing.client.android.camera.CameraManager; import com.google.zxing.client.android.history.HistoryActivity; +import com.google.zxing.client.android.history.HistoryItem; import com.google.zxing.client.android.history.HistoryManager; import com.google.zxing.client.android.result.ResultButtonListener; import com.google.zxing.client.android.result.ResultHandler; @@ -110,6 +111,7 @@ public final class CaptureActivity extends Activity implements SurfaceHolder.Cal private CameraManager cameraManager; private CaptureActivityHandler handler; + private Result savedResultToShow; private ViewfinderView viewfinderView; private TextView statusView; private View resultView; @@ -378,6 +380,35 @@ public final class CaptureActivity extends Activity implements SurfaceHolder.Cal return true; } + @Override + public void onActivityResult(int requestCode, int resultCode, Intent intent) { + if (resultCode == RESULT_OK) { + if (requestCode == HISTORY_REQUEST_CODE) { + int itemNumber = intent.getIntExtra(Intents.History.ITEM_NUMBER, -1); + if (itemNumber >= 0) { + HistoryItem historyItem = historyManager.buildHistoryItem(itemNumber); + decodeOrStoreSavedBitmap(null, historyItem.getResult()); + } + } + } + } + + private void decodeOrStoreSavedBitmap(Bitmap bitmap, Result result) { + // Bitmap isn't used yet -- will be used soon + if (handler == null) { + savedResultToShow = result; + } else { + if (result != null) { + savedResultToShow = result; + } + if (savedResultToShow != null) { + Message message = Message.obtain(handler, R.id.decode_succeeded, savedResultToShow); + handler.sendMessage(message); + } + savedResultToShow = null; + } + } + @Override public void surfaceCreated(SurfaceHolder holder) { if (holder == null) { @@ -409,12 +440,12 @@ public final class CaptureActivity extends Activity implements SurfaceHolder.Cal inactivityTimer.onActivity(); lastResult = rawResult; ResultHandler resultHandler = ResultHandlerFactory.makeResultHandler(this, rawResult); - historyManager.addHistoryItem(rawResult, resultHandler); if (barcode == null) { // This is from history -- no saved barcode handleDecodeInternally(rawResult, resultHandler, null); } else { + historyManager.addHistoryItem(rawResult, resultHandler); beepManager.playBeepSoundAndVibrate(); drawResultPoints(barcode, rawResult); switch (source) { @@ -689,6 +720,7 @@ public final class CaptureActivity extends Activity implements SurfaceHolder.Cal if (handler == null) { handler = new CaptureActivityHandler(this, decodeFormats, characterSet, cameraManager); } + decodeOrStoreSavedBitmap(null, null); } catch (IOException ioe) { Log.w(TAG, ioe); displayFrameworkBugMessageAndExit(); diff --git a/android/src/com/google/zxing/client/android/HelpActivity.java b/android/src/com/google/zxing/client/android/HelpActivity.java index 7f8e125c3..cb145cc9d 100644 --- a/android/src/com/google/zxing/client/android/HelpActivity.java +++ b/android/src/com/google/zxing/client/android/HelpActivity.java @@ -17,13 +17,9 @@ package com.google.zxing.client.android; import android.app.Activity; -import android.app.AlertDialog; -import android.content.DialogInterface; import android.content.Intent; import android.net.Uri; -import android.os.Build; import android.os.Bundle; -import android.util.Log; import android.view.View; import android.view.KeyEvent; import android.webkit.WebView; @@ -37,18 +33,6 @@ import android.widget.Button; */ public final class HelpActivity extends Activity { - private static final String TAG = HelpActivity.class.getSimpleName(); - - // Actually guessing at the Desire's MODEL for now: - private static final String[] BUGGY_MODEL_SUBSTRINGS = { - "Desire", - "Pulse", // Camera doesn't come on - "Geeksphone", // Doesn't support YUV? - "supersonic", // aka Evo - }; - private static final Uri BUGGY_URI = - Uri.parse("http://code.google.com/p/zxing/wiki/FrequentlyAskedQuestions"); - // Use this key and one of the values below when launching this activity via intent. If not // present, the default page will be loaded. public static final String REQUESTED_PAGE_KEY = "requested_page_key"; @@ -59,7 +43,6 @@ public final class HelpActivity extends Activity { "file:///android_asset/html-" + LocaleManager.getTranslatedAssetLanguage() + '/'; private static final String WEBVIEW_STATE_PRESENT = "webview_state_present"; - private static boolean initialized = false; private WebView webView; private Button backButton; @@ -77,16 +60,6 @@ public final class HelpActivity extends Activity { } }; - private final DialogInterface.OnClickListener groupsListener = - new DialogInterface.OnClickListener() { - @Override - public void onClick(DialogInterface dialogInterface, int i) { - Intent intent = new Intent(Intent.ACTION_VIEW, BUGGY_URI); - intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET); - HelpActivity.this.startActivity(intent); - } - }; - @Override protected void onCreate(Bundle icicle) { super.onCreate(icicle); @@ -116,28 +89,6 @@ public final class HelpActivity extends Activity { backButton.setOnClickListener(backListener); View doneButton = findViewById(R.id.done_button); doneButton.setOnClickListener(doneListener); - - if (!initialized) { - initialized = true; - checkBuggyDevice(); - } - } - - private void checkBuggyDevice() { - String model = Build.MODEL; - Log.i(TAG, "Build model is " + model); - if (model != null) { - for (String buggyModelSubstring : BUGGY_MODEL_SUBSTRINGS) { - if (model.contains(buggyModelSubstring)) { - AlertDialog.Builder builder = new AlertDialog.Builder(this); - builder.setMessage(R.string.msg_buggy); - builder.setPositiveButton(R.string.button_ok, groupsListener); - builder.setNegativeButton(R.string.button_cancel, null); - builder.show(); - break; - } - } - } } @Override