am 56150748: Revert "Use scan mode introduced in VCardParser."
Merge commit '5615074876e324863accc8d68ebe567c0041bda5' into eclair-mr2
* commit '5615074876e324863accc8d68ebe567c0041bda5':
Revert "Use scan mode introduced in VCardParser."
diff --git a/src/com/android/contacts/ImportVCardActivity.java b/src/com/android/contacts/ImportVCardActivity.java
index 36553f0..eb99c95 100644
--- a/src/com/android/contacts/ImportVCardActivity.java
+++ b/src/com/android/contacts/ImportVCardActivity.java
@@ -36,7 +36,6 @@
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;
@@ -209,15 +208,13 @@
boolean result;
try {
result = readOneVCardFile(mCanonicalPath,
- VCardConfig.DEFAULT_CHARSET, builderCollection, null,
- VCardParser.PARSER_MODE_SCAN, true, null);
+ VCardConfig.DEFAULT_CHARSET, builderCollection, null, 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, VCardParser.PARSER_MODE_SCAN, false, null);
+ VCardConfig.DEFAULT_CHARSET, counter, detector, false, null);
} catch (VCardNestedException e2) {
result = false;
Log.e(LOG_TAG, "Must not reach here. " + e2);
@@ -238,7 +235,7 @@
mProgressDialogForReadVCard.setIndeterminate(false);
mProgressDialogForReadVCard.setMax(counter.getCount());
String charset = detector.getEstimatedCharset();
- doActuallyReadOneVCardFile(mCanonicalPath, null, charset, true, detector,
+ doActuallyReadOneVCard(mCanonicalPath, null, charset, true, detector,
mErrorFileNameList);
} else { // Read multiple files.
mProgressDialogForReadVCard.setProgressNumberFormat(
@@ -255,15 +252,14 @@
VCardSourceDetector detector = new VCardSourceDetector();
try {
if (!readOneVCardFile(canonicalPath, VCardConfig.DEFAULT_CHARSET,
- detector, null, VCardParser.PARSER_MODE_SCAN,
- true, mErrorFileNameList)) {
+ detector, null, true, mErrorFileNameList)) {
continue;
}
} catch (VCardNestedException e) {
// Assume that VCardSourceDetector was able to detect the source.
}
String charset = detector.getEstimatedCharset();
- doActuallyReadOneVCardFile(canonicalPath, mAccount,
+ doActuallyReadOneVCard(canonicalPath, mAccount,
charset, false, detector, mErrorFileNameList);
mProgressDialogForReadVCard.incrementProgressBy(1);
}
@@ -295,7 +291,7 @@
}
}
- private boolean doActuallyReadOneVCardFile(String canonicalPath, Account account,
+ private boolean doActuallyReadOneVCard(String canonicalPath, Account account,
String charset, boolean showEntryParseProgress,
VCardSourceDetector detector, List<String> errorFileNameList) {
final Context context = ImportVCardActivity.this;
@@ -318,8 +314,7 @@
}
try {
- if (!readOneVCardFile(canonicalPath, charset, builder, detector,
- VCardParser.PARSER_MODE_DEFAULT, false, null)) {
+ if (!readOneVCardFile(canonicalPath, charset, builder, detector, false, null)) {
return false;
}
} catch (VCardNestedException e) {
@@ -328,17 +323,14 @@
return true;
}
- /**
- * TODO: clean up input arguments...
- */
private boolean readOneVCardFile(String canonicalPath, String charset,
VCardBuilder builder, VCardSourceDetector detector,
- int parseMode, boolean throwNestedException, List<String> errorFileNameList)
+ boolean throwNestedException, List<String> errorFileNameList)
throws VCardNestedException {
FileInputStream is;
try {
is = new FileInputStream(canonicalPath);
- mVCardParser = new VCardParser_V21(detector, parseMode);
+ mVCardParser = new VCardParser_V21(detector);
try {
mVCardParser.parse(is, charset, builder, mCanceled);