Commit graph

1327 commits

Author SHA1 Message Date
ftylitak 31b5627fee Updated with the latest version of the library. Uses MultiFormatReader instead of QRCodeReader. DataMatrixReader is still not supported.
git-svn-id: https://zxing.googlecode.com/svn/trunk@1481 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2010-07-14 09:32:32 +00:00
flyashi 5a36cea5af Updates to C++ port:
- updated Binarizer, BinaryBitmap, and LuminanceSource implementations to match Java
 - updated Magick client

git-svn-id: https://zxing.googlecode.com/svn/trunk@1480 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2010-07-13 18:43:54 +00:00
srowen 4ed7e4ac96 Make sure checkboxes are enabled correctly on first load
git-svn-id: https://zxing.googlecode.com/svn/trunk@1479 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2010-07-13 10:34:13 +00:00
srowen e46c6f1e9f Add WAKE_LOCK for wifi as it appears necessary on older Android
git-svn-id: https://zxing.googlecode.com/svn/trunk@1478 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2010-07-13 07:56:52 +00:00
srowen 04a62c6879 Style bits on wi-fi code
git-svn-id: https://zxing.googlecode.com/svn/trunk@1476 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2010-07-10 05:59:14 +00:00
dswitkin@google.com 426636cea4 Updated the version to 3.4 beta 2.
git-svn-id: https://zxing.googlecode.com/svn/trunk@1475 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2010-07-09 21:36:59 +00:00
vikrama b5619824c8 Fixed: pause -> onPause, resume -> onResume
Make sure the ssid we are connected to is not null.  This happens when
a network has been updated/removed while we are still connected to it.

Make errorCount an instance variable.




git-svn-id: https://zxing.googlecode.com/svn/trunk@1474 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2010-07-09 17:14:04 +00:00
flyashi ecbf50da87 C++ port Binarizer and BinaryBitmap weren't caching rows correctly.
git-svn-id: https://zxing.googlecode.com/svn/trunk@1473 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2010-07-09 15:15:01 +00:00
flyashi b1032ceba4 Fixed C++ port's handling of reversed barcodes:
- BitArray.reverse() was inverting, not reversing, bits.
 - OneDReader wasn't reversing x coordinates of the result points.
 - OneDReader wasn't catching Binarizer exceptions properly.

Issue 470 can be closed by this.

git-svn-id: https://zxing.googlecode.com/svn/trunk@1472 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2010-07-09 15:12:46 +00:00
vikrama 9e1dbf07d9 Renamed the receiver, but forgot in the previous commit.
git-svn-id: https://zxing.googlecode.com/svn/trunk@1471 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2010-07-09 05:55:08 +00:00
vikrama 77207acb31 Some error checking put in. When a new network is created and the
connection fails, an alert message is displayed, and connection
attempts cease.  Retrying with a correct barcode works.  Not perfect
yet, but in my testing I have found this version much better than the
previous setup: at least errors are detected and the user is informed.



git-svn-id: https://zxing.googlecode.com/svn/trunk@1470 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2010-07-09 05:49:42 +00:00
vikrama 983d29eb62 Removed some commented code, and general code cleanup. Turned many
variables into finals.  Change the UI to display network name and type
more clearly.



git-svn-id: https://zxing.googlecode.com/svn/trunk@1469 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2010-07-08 05:12:51 +00:00
vikrama b8f4061c39 Bug Fix:
When a 64 bit hex password is entered, wpa_supplicant fails with the
error:

 "wpa_supplicant (pid) Line 0: Invalid passphrase length 64 (expected:
  8..63)"

The fix is to not quote 64 char long hexadecimal passwords.  Tested
dd-wrt on a 64 char hex password.




git-svn-id: https://zxing.googlecode.com/svn/trunk@1468 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2010-07-05 22:25:20 +00:00
srowen 7a8081f238 Maybe solve issue 465 simply: add an empty libs directory
git-svn-id: https://zxing.googlecode.com/svn/trunk@1467 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2010-07-03 10:59:46 +00:00
srowen 4a623428c1 Make sure cancel is handled properly in a few cases, where app must exit after dialog
git-svn-id: https://zxing.googlecode.com/svn/trunk@1466 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2010-06-30 08:07:05 +00:00
dswitkin@google.com 423c1a6ec6 Added two missing authors.
git-svn-id: https://zxing.googlecode.com/svn/trunk@1465 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2010-06-29 21:23:41 +00:00
dswitkin@google.com f70d7e51bf - Bumped version to 3.4 beta 1.
- Fixed two crashes on low DPI devices because of missing/stale views in layout-ldpi/capture.xml.
- Added support for apps on SD card on Froyo.
- Updated SDK to 8.
- Tweaked some font sizes.
- Updated the What's New page.

git-svn-id: https://zxing.googlecode.com/svn/trunk@1464 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2010-06-29 21:11:27 +00:00
srowen 73bb0192a3 On the way to deploy new verison, add favicon
git-svn-id: https://zxing.googlecode.com/svn/trunk@1463 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2010-06-29 16:18:34 +00:00
rpechayr 2959549f83 [cpp] added const qualifiers that had been removed (accidentaly\?) to LuminanceSourse pure virtual methods. Fixed build problem of ScanTest. Please check that ScanTest builds if you revert this, it will consist of removing const qualifyers to implementation these methods in sublass of LuminancesSource
git-svn-id: https://zxing.googlecode.com/svn/trunk@1461 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2010-06-24 05:04:36 +00:00
vikrama a55b3b0491 Connected, turned into a resource
git-svn-id: https://zxing.googlecode.com/svn/trunk@1460 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2010-06-23 22:26:43 +00:00
vikrama b237d3d34f Change another string to a resource.
git-svn-id: https://zxing.googlecode.com/svn/trunk@1459 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2010-06-23 22:16:53 +00:00
srowen e4c28d95da Small style things
git-svn-id: https://zxing.googlecode.com/svn/trunk@1457 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2010-06-23 10:23:09 +00:00
vikrama c003d96b89 1. Set up all strings in res/*/strings.xml rather than as string
literals.
2. Using a very handy script for this purpose, and checking it
   into utils/ since it saved me some headache.
3. Turned tabs -> spaces for WifiResultHandler.
4. Better error handling on network types: look for exact matches
   rather than substrings.



git-svn-id: https://zxing.googlecode.com/svn/trunk@1456 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2010-06-23 06:00:57 +00:00
vikrama c2e3604aea 1. Instead of killing the activity when done, load up a URL in a browser instead.
2. More error checking:
   a. Missing SSID
   b. Incorrect network type (hey, it's just a string, and the user could get creative)

TODOs:
1. Localize the strings this is introducing.
2. Errors not handled:
   a. Tell if network not found.
   b. Incorrect SSID codes still crash the app: WIFI:S:winders;T:WPA;P:secret;badjunk;;
   c. For an open network, giving a password crashes:  WIFI:S:winders;T:nopass;P:secret;;
3. When connected, it should say, "Connected to <ssid>".



git-svn-id: https://zxing.googlecode.com/svn/trunk@1455 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2010-06-23 04:08:35 +00:00
luizcroc dc9fcff5cb Fixing some issues in C++ port regarding 1D barcode readers
git-svn-id: https://zxing.googlecode.com/svn/trunk@1454 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2010-06-23 03:05:34 +00:00
vikrama 6943578c18 Do not broadcast the intent
git-svn-id: https://zxing.googlecode.com/svn/trunk@1453 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2010-06-23 03:01:43 +00:00
srowen b3993e7d51 Remove use of methods not in J2ME
git-svn-id: https://zxing.googlecode.com/svn/trunk@1452 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2010-06-22 06:23:20 +00:00
srowen 296bd49474 Blacklist Evo too for camera issue
git-svn-id: https://zxing.googlecode.com/svn/trunk@1451 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2010-06-21 23:24:13 +00:00
srowen d066265213 Danish fixes from rasmussch
git-svn-id: https://zxing.googlecode.com/svn/trunk@1450 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2010-06-20 23:00:37 +00:00
rpechayr 211b24a454 [iphone][ScanTest] updated after update of ZingWidgetController
git-svn-id: https://zxing.googlecode.com/svn/trunk@1449 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2010-06-19 16:58:19 +00:00
rpechayr 32bbefc1d2 [iphone][ZXingWidgetController] delegate API changed to conform to standard delagate APIs, bug fixed regarding status bar displaying upon success of scanning
git-svn-id: https://zxing.googlecode.com/svn/trunk@1448 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2010-06-19 16:57:05 +00:00
dswitkin@google.com b94d44c5a1 - Made sure barcode scanning always restarts when the activity is resumed.
- Fixed a potential ANR - we can never sleep on the main thread.
- Bumped the version number.
- Minor cleanup and 100 columns fixes.

git-svn-id: https://zxing.googlecode.com/svn/trunk@1447 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2010-06-18 16:17:12 +00:00
srowen 7255ac8443 Issues 155.2 -- add %f for format
git-svn-id: https://zxing.googlecode.com/svn/trunk@1445 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2010-06-18 12:58:57 +00:00
rpechayr b8453900ed [iphone] updated README to clearly advise to make .mm files whenever including files from ZXing
git-svn-id: https://zxing.googlecode.com/svn/trunk@1444 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2010-06-17 18:16:53 +00:00
srowen edd6ed8e7a Add bulk scan mode with preference (and rearrange prefs a bit). Reorder main strings file, add new pref string and remove probably-incorrect ellipses from Asian language translations
git-svn-id: https://zxing.googlecode.com/svn/trunk@1443 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2010-06-17 12:26:41 +00:00
srowen 02f090dd34 Add auto-translation tool to help update strings with Google Translate. Let it reorder (but not change) existing translations alphabetically by key. Add bulk-scan strings along the way as a test.
git-svn-id: https://zxing.googlecode.com/svn/trunk@1442 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2010-06-17 10:55:00 +00:00
vikrama b9f47fdc59 Escape the semicolons: this was easier than I imagined. Tested with an ssid containing multiple semicolons. Also some minor code cleanups.
Still to be done:
1. Rename 'nopass' to something cleaner, so it looks crisp in Android's Barcode Scanner UI.



git-svn-id: https://zxing.googlecode.com/svn/trunk@1441 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2010-06-17 05:24:42 +00:00
vikrama 737fee3e69 Add the nopass handling in the Android client.
TODO:
1. Document the encoding.
2. Test out the interaction with appspot.com with escaped semicolons and colons



git-svn-id: https://zxing.googlecode.com/svn/trunk@1440 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2010-06-17 04:33:59 +00:00
vikrama c938a5d196 Initial checkin of wifi generator.
TODO:
1. Semicolons need to be escaped
2. In the android code, need much better error checking.  Incorrect barcodes crash Barcode Scanner!
3. Add network type NOPASS to the android code.  This is ready, and will be a separate checkin.



git-svn-id: https://zxing.googlecode.com/svn/trunk@1439 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2010-06-17 04:31:26 +00:00
srowen 2d7b4138ab Display possible country origin info on product scan
git-svn-id: https://zxing.googlecode.com/svn/trunk@1438 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2010-06-16 21:13:47 +00:00
srowen 627cd6cab0 Avoid possible AIOOBE on bad input
git-svn-id: https://zxing.googlecode.com/svn/trunk@1437 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2010-06-16 21:12:43 +00:00
srowen 8cbe558ec3 Add support for UPC/EAN +5 extensions, plus basic tests, and display the content in Android client as metadata
git-svn-id: https://zxing.googlecode.com/svn/trunk@1436 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2010-06-16 19:49:22 +00:00
vikrama 2223a5cf42 Adding strings converted using Google Translate. Feeling bad about all the Engrish jokes I made in the past.
git-svn-id: https://zxing.googlecode.com/svn/trunk@1435 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2010-06-16 04:11:54 +00:00
rpechayr 9e5e997e96 [iphone] updated README
git-svn-id: https://zxing.googlecode.com/svn/trunk@1434 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2010-06-15 22:10:23 +00:00
srowen 8e142f1f24 Oops remove bar again
git-svn-id: https://zxing.googlecode.com/svn/trunk@1433 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2010-06-15 22:08:02 +00:00
rpechayr 6ede7ed564 [iphone] now decoders need to be injected into ZXingWidgetController to enhance performance when only a few readers are needed. One exc bad access bug solved. A few minor bugs remain in ScanTest. 1st status bar does not reappear when success of scan. this one should be easy to fix. 2nd ScanTest does not display the results when scan success for the first time, but only second time. This second bug is strange
git-svn-id: https://zxing.googlecode.com/svn/trunk@1432 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2010-06-15 22:01:04 +00:00
srowen d8233b3ce1 ... and roll back a bit more to old status view, smaller text again
git-svn-id: https://zxing.googlecode.com/svn/trunk@1431 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2010-06-15 21:53:48 +00:00
srowen b238eb22a0 ... and put back status text, in a simplified form?
git-svn-id: https://zxing.googlecode.com/svn/trunk@1430 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2010-06-15 19:56:32 +00:00
srowen bda97f7c84 Back to white backgrounds, somewhat smaller text in the result screen, shorter Toast popup and doesn't interfere with help screen
git-svn-id: https://zxing.googlecode.com/svn/trunk@1429 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2010-06-15 18:43:10 +00:00
srowen b7d6fcef1d Style-related changes
git-svn-id: https://zxing.googlecode.com/svn/trunk@1428 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2010-06-15 16:25:24 +00:00