summaryrefslogtreecommitdiff
path: root/src/com/google/zxing/client/android/encode
AgeCommit message (Collapse)AuthorFilesLines
2014-05-16Move library into a subfolder.Ralf Kistner6-909/+0
2013-07-09Merge branch 'upstream-2.2'Ralf Kistner4-14/+20
Conflicts: AndroidManifest.xml assets/html-de/index.html assets/html-de/whatsnew.html assets/html-en/index.html assets/html-es/index.html assets/html-es/whatsnew.html assets/html-fr/index.html assets/html-fr/whatsnew.html assets/html-it/index.html assets/html-it/whatsnew.html assets/html-ja/index.html assets/html-ja/whatsnew.html assets/html-ko/index.html assets/html-ko/whatsnew.html assets/html-nl/index.html assets/html-nl/whatsnew.html assets/html-pt/index.html assets/html-pt/whatsnew.html assets/html-ru/index.html assets/html-ru/whatsnew.html assets/html-zh-rCN/index.html assets/html-zh-rCN/whatsnew.html assets/html-zh-rTW/index.html assets/html-zh-rTW/whatsnew.html res/layout/bookmark_picker_list_item.xml src/com/google/zxing/client/android/CaptureActivity.java src/com/google/zxing/client/android/CaptureActivityHandler.java src/com/google/zxing/client/android/HttpHelper.java src/com/google/zxing/client/android/LocaleManager.java src/com/google/zxing/client/android/book/SearchBookContentsResult.java src/com/google/zxing/client/android/history/HistoryManager.java src/com/google/zxing/client/android/result/AddressBookResultHandler.java src/com/google/zxing/client/android/result/ProductResultHandler.java src/com/google/zxing/client/android/result/ResultHandler.java src/com/google/zxing/client/android/result/SMSResultHandler.java src/com/google/zxing/client/android/result/supplement/BookResultInfoRetriever.java src/com/google/zxing/client/android/result/supplement/SupplementalInfoRetriever.java src/com/google/zxing/client/android/result/supplement/URIResultInfoRetriever.java src/com/google/zxing/client/android/share/AppPickerActivity.java src/com/google/zxing/client/android/share/BookmarkPickerActivity.java src/com/google/zxing/client/android/share/LoadPackagesAsyncTask.java src/com/google/zxing/client/android/share/ShareActivity.java src/com/google/zxing/client/android/wifi/WifiConfigManager.java
2013-05-07MECARD TEL should have only digitssrowen@gmail.com1-1/+6
git-svn-id: http://zxing.googlecode.com/svn/trunk/android@2714 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2013-04-18A few inspection cleanupssrowen@gmail.com1-2/+1
git-svn-id: http://zxing.googlecode.com/svn/trunk/android@2660 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2013-03-03Issue 1638 support for several URLs in contact info, and some incidental ↵srowen@gmail.com4-8/+9
test cleanup too git-svn-id: http://zxing.googlecode.com/svn/trunk/android@2583 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2013-03-02Various changes from IJ12.1 inspectionssrowen@gmail.com3-3/+3
git-svn-id: http://zxing.googlecode.com/svn/trunk/android@2581 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2012-12-28Add VERSION:3.0 to vCard encodingsrowen1-0/+1
git-svn-id: http://zxing.googlecode.com/svn/trunk/android@2546 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2012-12-14Namespace some resources to prevent conflicts.Ralf Kistner1-3/+3
Also removed some unused resources.
2012-11-28Initial preparation for use as a library project.Ralf Kistner1-14/+14
1. Add pom.xml and Readme.md. 2. Change switch statements on resource id's to if/else statements. 3. Use Android API level 16 instead of 17 for now.
2012-08-13Fix encoding of certain Intents that don't have EXTRA_TEXT or EXTRA_STREAMsrowen1-7/+21
git-svn-id: http://zxing.googlecode.com/svn/trunk/android@2388 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2012-08-07Misc fixes from Lachezarsrowen1-1/+7
git-svn-id: http://zxing.googlecode.com/svn/trunk/android@2385 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2012-07-23Fix possible strange NPE on EncodeActivitysrowen1-1/+4
git-svn-id: http://zxing.googlecode.com/svn/trunk/android@2359 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2012-07-22Can also use proper menu resource for other menussrowen1-11/+10
git-svn-id: http://zxing.googlecode.com/svn/trunk/android@2358 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2012-04-26More reliable method for reading vCard, may avoid OOME in weird stream ↵srowen1-9/+8
behavior case git-svn-id: http://zxing.googlecode.com/svn/trunk/android@2267 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2012-04-26Don't crash on unsupported barcode format like CODE_93srowen1-1/+7
git-svn-id: http://zxing.googlecode.com/svn/trunk/android@2266 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2012-04-26Avoid NPE is options menu gets called before onResume (?)srowen1-1/+2
git-svn-id: http://zxing.googlecode.com/svn/trunk/android@2264 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2012-04-26Avoid NPE on null actionsrowen1-5/+6
git-svn-id: http://zxing.googlecode.com/svn/trunk/android@2262 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2012-04-05Minor inspection stuffsrowen1-9/+7
git-svn-id: http://zxing.googlecode.com/svn/trunk/android@2247 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2012-01-30Maybe avoid a weird NPEsrowen2-2/+17
git-svn-id: http://zxing.googlecode.com/svn/trunk/android@2135 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2012-01-19Avoid an NPE in Arrays.asListsrowen1-4/+8
git-svn-id: http://zxing.googlecode.com/svn/trunk/android@2121 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2012-01-19Issue 1126 In vCard, escape comma not colonsrowen1-1/+1
git-svn-id: http://zxing.googlecode.com/svn/trunk/android@2120 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2011-12-23Issue 918 Add MECARD/vCard switch after factoring out and tidying some of ↵srowen6-220/+434
the contact encoding logic git-svn-id: http://zxing.googlecode.com/svn/trunk/android@2097 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2011-11-13Back-port BS+ changes to use newer Android 2.x APIs, removing deprecations. ↵srowen1-3/+3
Now, we're on to Android 2.1 / Eclair / android-7 as a minimum platform level. I called this "4.0" accordingly. git-svn-id: http://zxing.googlecode.com/svn/trunk/android@2031 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2011-11-10Update ZXingTest to work on 3.x+, mostly by removing the camera capture bit ↵srowen1-5/+7
for now. It can come back after android/ is updated and can be cloned again. Updated android-integration with better API and ability to specify package. Now ZXingTest uses our integration code. It's updated for Android 2.x and reports camera params in a slightly better form. Also fixed a few Android 2.x issues and related intent integration stuff left over from other recent changes. git-svn-id: http://zxing.googlecode.com/svn/trunk/android@2020 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2011-11-02Update all Java code to use Java 6srowen1-4/+5
git-svn-id: http://zxing.googlecode.com/svn/trunk/android@2002 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2011-10-22Merge miscellaneous additional changes from my near-identical version of ↵srowen1-1/+2
hiding text while encoding QR codes: redact menu bar title, and some javadoc improvements in Intents git-svn-id: http://zxing.googlecode.com/svn/trunk/android@1989 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2011-10-22Added an option to hide the contents when encoding a barcode via Intent.dswitkin@google.com1-1/+6
git-svn-id: http://zxing.googlecode.com/svn/trunk/android@1988 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2011-09-26A pile of changes from proper static analysis for nullability issues, with ↵srowen2-16/+21
full annotations. git-svn-id: http://zxing.googlecode.com/svn/trunk/android@1937 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2011-08-12Issue 939 add NOTE, URL to encodersrowen1-0/+13
git-svn-id: http://zxing.googlecode.com/svn/trunk/android@1882 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2011-07-27Issue 924 avoid encoding duplicate fieldssrowen1-31/+53
git-svn-id: http://zxing.googlecode.com/svn/trunk/android@1868 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2011-05-18Cleaned up a bunch of TODOs and deleted the old ImageConverter app which has ↵dswitkin@google.com1-3/+8
been supplanted by CommandLineRunner. git-svn-id: http://zxing.googlecode.com/svn/trunk/android@1778 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2011-04-13Issue 786, from Lachezar, support encoding text/plainsrowen1-1/+32
git-svn-id: http://zxing.googlecode.com/svn/trunk/android@1740 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2010-12-15Style stuff mostly but fix a problem between Aztec and J2ME toosrowen1-2/+0
git-svn-id: http://zxing.googlecode.com/svn/trunk/android@1681 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2010-11-30Simplify encoding to fix odd display problem -- no thread, no layout listenersrowen3-133/+35
git-svn-id: http://zxing.googlecode.com/svn/trunk/android@1676 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2010-09-17Properly escape MECARD reserved charssrowen1-9/+25
git-svn-id: http://zxing.googlecode.com/svn/trunk/android@1594 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2010-09-15Minor changes from code inspection resultssrowen1-6/+6
git-svn-id: http://zxing.googlecode.com/svn/trunk/android@1589 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2010-09-10Issue 549, Make slightly more consistent by changing value of as-yet-unused ↵srowen1-1/+0
key ENCODE_FORMAT git-svn-id: http://zxing.googlecode.com/svn/trunk/android@1581 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2010-07-15Remove progress dialog to avoid rare exceptionsrowen1-14/+0
git-svn-id: http://zxing.googlecode.com/svn/trunk/android@1484 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2010-06-30Make sure cancel is handled properly in a few cases, where app must exit ↵srowen1-14/+4
after dialog git-svn-id: http://zxing.googlecode.com/svn/trunk/android@1466 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2010-06-09Handle empty string as null in many casessrowen1-22/+37
git-svn-id: http://zxing.googlecode.com/svn/trunk/android@1420 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2010-06-09Better handling of empty/incomplete content streamsrowen1-0/+8
git-svn-id: http://zxing.googlecode.com/svn/trunk/android@1417 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2010-05-27More logging, care with parsing vCard?srowen1-14/+14
git-svn-id: http://zxing.googlecode.com/svn/trunk/android@1393 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2010-05-27More encoding related changes for encoding Chinese chars in QR codessrowen2-35/+76
git-svn-id: http://zxing.googlecode.com/svn/trunk/android@1392 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2010-05-07One more time -- rationalize log levels, mostly downward, and pull out 1-2 ↵srowen2-5/+5
more statements git-svn-id: http://zxing.googlecode.com/svn/trunk/android@1342 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2010-04-28Added the external storage permission to fix SD card writing issues and ↵dswitkin1-5/+4
bumped the version to 3.3 beta 1. git-svn-id: http://zxing.googlecode.com/svn/trunk/android@1322 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2010-04-19Fix up history output, make it an email attachment, save to SD card too; ↵srowen1-23/+21
avoid spurious error when output dir already exists. git-svn-id: http://zxing.googlecode.com/svn/trunk/android@1312 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2010-04-13Better naming of shared barcode files and deal with case where SD card is ↵srowen1-9/+38
mounted git-svn-id: http://zxing.googlecode.com/svn/trunk/android@1306 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2010-04-10Noticed we should just use BarcodeFormat constants in the client for simplicitysrowen1-16/+9
git-svn-id: http://zxing.googlecode.com/svn/trunk/android@1295 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2010-04-04Added send barcode featuresrowen2-18/+95
git-svn-id: http://zxing.googlecode.com/svn/trunk/android@1274 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2010-04-02Fix typo from last commit, black is not 00000000!srowen1-3/+2
git-svn-id: http://zxing.googlecode.com/svn/trunk/android@1270 59b500cc-1b3d-0410-9834-0bbf25fbcc57