commit 51f6f77ef0fb1e16be9d19009252ced701e19f75
author Daisuke Miyakawa <dmiyakawa@google.com> Wed Nov 11 07:16:18 2009 +0900
committer Daisuke Miyakawa <dmiyakawa@google.com> Wed Nov 11 09:03:27 2009 +0900
tree 9c4e0954a4974592e0907215186e629c377e7c3f
parent 9bcf470c6ed7210887a0442f7e25ca050e6375d6

Use scan mode introduced in VCardParser.

This change must be merged after the change I5d30aa18 being submitted.

Internal issue number: 2245363

Dr.NO: Hiroshi

src/com/android/contacts/ImportVCardActivity.java

diff --git a/src/com/android/contacts/ImportVCardActivity.java b/src/com/android/contacts/ImportVCardActivity.java
index 8fd9c0d..7b1243f 100644
--- a/src/com/android/contacts/ImportVCardActivity.java
+++ b/src/com/android/contacts/ImportVCardActivity.java
@@ -36,6 +36,7 @@
 import android.pim.vcard.VCardConfig;
 import android.pim.vcard.VCardDataBuilder;
 import android.pim.vcard.VCardEntryCounter;
+import android.pim.vcard.VCardParser;
 import android.pim.vcard.VCardParser_V21;
 import android.pim.vcard.VCardParser_V30;
 import android.pim.vcard.VCardSourceDetector;
@@ -203,13 +204,15 @@
                     boolean result;
                     try {
                         result = readOneVCardFile(mCanonicalPath,
-                                VCardConfig.DEFAULT_CHARSET, builderCollection, null, true, null);
+                                VCardConfig.DEFAULT_CHARSET, builderCollection, null,
+                                VCardParser.PARSER_MODE_SCAN, true, null);
                     } catch (VCardNestedException e) {
                         try {
                             // Assume that VCardSourceDetector was able to detect the source.
                             // Try again with the detector.
                             result = readOneVCardFile(mCanonicalPath,
-                                    VCardConfig.DEFAULT_CHARSET, counter, detector, false, null);
+                                    VCardConfig.DEFAULT_CHARSET, counter,
+                                    detector, VCardParser.PARSER_MODE_SCAN, false, null);
                         } catch (VCardNestedException e2) {
                             result = false;
                             Log.e(LOG_TAG, "Must not reach here. " + e2);
@@ -230,7 +233,7 @@
                     mProgressDialogForReadVCard.setIndeterminate(false);
                     mProgressDialogForReadVCard.setMax(counter.getCount());
                     String charset = detector.getEstimatedCharset();
-                    doActuallyReadOneVCard(mCanonicalPath, null, charset, true, detector,
+                    doActuallyReadOneVCardFile(mCanonicalPath, null, charset, true, detector,
                             mErrorFileNameList);
                 } else {  // Read multiple files.
                     mProgressDialogForReadVCard.setProgressNumberFormat(
@@ -247,14 +250,15 @@
                         VCardSourceDetector detector = new VCardSourceDetector();
                         try {
                             if (!readOneVCardFile(canonicalPath, VCardConfig.DEFAULT_CHARSET,
-                                    detector, null, true, mErrorFileNameList)) {
+                                    detector, null, VCardParser.PARSER_MODE_SCAN,
+                                    true, mErrorFileNameList)) {
                                 continue;
                             }
                         } catch (VCardNestedException e) {
                             // Assume that VCardSourceDetector was able to detect the source.
                         }
                         String charset = detector.getEstimatedCharset();
-                        doActuallyReadOneVCard(canonicalPath, mAccount,
+                        doActuallyReadOneVCardFile(canonicalPath, mAccount,
                                 charset, false, detector, mErrorFileNameList);
                         mProgressDialogForReadVCard.incrementProgressBy(1);
                     }
@@ -286,7 +290,7 @@
             }
         }
 
-        private boolean doActuallyReadOneVCard(String canonicalPath, Account account,
+        private boolean doActuallyReadOneVCardFile(String canonicalPath, Account account,
                 String charset, boolean showEntryParseProgress,
                 VCardSourceDetector detector, List<String> errorFileNameList) {
             final Context context = ImportVCardActivity.this;
@@ -309,7 +313,8 @@
             }
 
             try {
-                if (!readOneVCardFile(canonicalPath, charset, builder, detector, false, null)) {
+                if (!readOneVCardFile(canonicalPath, charset, builder, detector,
+                        VCardParser.PARSER_MODE_DEFAULT, false, null)) {
                     return false;
                 }
             } catch (VCardNestedException e) {
@@ -318,14 +323,17 @@
             return true;
         }
 
+        /**
+         * TODO: clean up input arguments...
+         */
         private boolean readOneVCardFile(String canonicalPath, String charset,
                 VCardBuilder builder, VCardSourceDetector detector,
-                boolean throwNestedException, List<String> errorFileNameList)
+                int parseMode, boolean throwNestedException, List<String> errorFileNameList)
                 throws VCardNestedException {
             FileInputStream is;
             try {
                 is = new FileInputStream(canonicalPath);
-                mVCardParser = new VCardParser_V21(detector);
+                mVCardParser = new VCardParser_V21(detector, parseMode);
 
                 try {
                     mVCardParser.parse(is, charset, builder, mCanceled);