Skip to content

Commit

Permalink
Add basic support for vCard 4.0
Browse files Browse the repository at this point in the history 
Signed-off-by: June <june@eridan.me>
  • Loading branch information
@girlbossceo @thestinger
girlbossceo authored and thestinger committed Mar 13, 2023
1 parent a94a2ef commit 8fbeedd
Show file tree
Hide file tree
Showing 3 changed files with 57 additions and 9 deletions.
14 changes: 10 additions & 4 deletions src/com/android/contacts/vcard/ImportProcessor.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
import com.android.vcard.VCardParser;
import com.android.vcard.VCardParser_V21;
import com.android.vcard.VCardParser_V30;
import com.android.vcard.VCardParser_V40;
import com.android.vcard.exception.VCardException;
import com.android.vcard.exception.VCardNotSupportedException;
import com.android.vcard.exception.VCardVersionException;
Expand Down Expand Up @@ -135,7 +136,8 @@ private void runInternal() {
*/
possibleVCardVersions = new int[] {
ImportVCardActivity.VCARD_VERSION_V21,
ImportVCardActivity.VCARD_VERSION_V30
ImportVCardActivity.VCARD_VERSION_V30,
ImportVCardActivity.VCARD_VERSION_V40
};
} else {
possibleVCardVersions = new int[] {
Expand Down Expand Up @@ -231,9 +233,13 @@ private boolean readOneVCard(InputStream is, int vcardType, String charset,
// In the worst case, a user may call cancel() just before creating
// mVCardParser.
synchronized (this) {
mVCardParser = (vcardVersion == ImportVCardActivity.VCARD_VERSION_V30 ?
new VCardParser_V30(vcardType) :
new VCardParser_V21(vcardType));
if (vcardVersion == ImportVCardActivity.VCARD_VERSION_V30) {
mVCardParser = new VCardParser_V30(vcardType);
} else if (vcardVersion == ImportVCardActivity.VCARD_VERSION_V40) {
mVCardParser = new VCardParser_V40(vcardType);
} else {
mVCardParser = new VCardParser_V21(vcardType);
}
if (isCancelled()) {
Log.i(LOG_TAG, "ImportProcessor already recieves cancel request, so " +
"send cancel request to vCard parser too.");
Expand Down
34 changes: 32 additions & 2 deletions src/com/android/contacts/vcard/ImportVCardActivity.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@
import com.android.vcard.VCardParser;
import com.android.vcard.VCardParser_V21;
import com.android.vcard.VCardParser_V30;
import com.android.vcard.VCardParser_V40;
import com.android.vcard.VCardSourceDetector;
import com.android.vcard.exception.VCardException;
import com.android.vcard.exception.VCardNestedException;
Expand Down Expand Up @@ -83,6 +84,7 @@ public class ImportVCardActivity extends Activity implements ImportVCardDialogFr
/* package */ final static int VCARD_VERSION_AUTO_DETECT = 0;
/* package */ final static int VCARD_VERSION_V21 = 1;
/* package */ final static int VCARD_VERSION_V30 = 2;
/* package */ final static int VCARD_VERSION_V40 = 3;

private static final int REQUEST_OPEN_DOCUMENT = 100;

Expand Down Expand Up @@ -321,6 +323,7 @@ private ImportRequest constructImportRequest(final byte[] data,
int vcardVersion = VCARD_VERSION_V21;
try {
boolean shouldUseV30 = false;
boolean shouldUseV40 = false;
InputStream is;
if (data != null) {
is = new ByteArrayInputStream(data);
Expand Down Expand Up @@ -354,7 +357,28 @@ private ImportRequest constructImportRequest(final byte[] data,
mVCardParser.addInterpreter(detector);
mVCardParser.parse(is);
} catch (VCardVersionException e2) {
throw new VCardException("vCard with unspported version.");
try {
is.close();
} catch (IOException e) {
}

shouldUseV30 = false;
shouldUseV40 = true;
if (data != null) {
is = new ByteArrayInputStream(data);
} else {
is = resolver.openInputStream(localDataUri);
}
mVCardParser = new VCardParser_V40();
try {
counter = new VCardEntryCounter();
detector = new VCardSourceDetector();
mVCardParser.addInterpreter(counter);
mVCardParser.addInterpreter(detector);
mVCardParser.parse(is);
} catch (VCardVersionException e3) {
throw new VCardException("vCard with unspported version.");
}
}
} finally {
if (is != null) {
Expand All @@ -365,7 +389,13 @@ private ImportRequest constructImportRequest(final byte[] data,
}
}

vcardVersion = shouldUseV30 ? VCARD_VERSION_V30 : VCARD_VERSION_V21;
if (shouldUseV30) {
vcardVersion = VCARD_VERSION_V30;
} else if (shouldUseV40) {
vcardVersion = VCARD_VERSION_V40;
} else {
vcardVersion = VCARD_VERSION_V21;
}
} catch (VCardNestedException e) {
Log.w(LOG_TAG, "Nested Exception is found (it may be false-positive).");
// Go through without throwing the Exception, as we may be able to detect the
Expand Down
18 changes: 15 additions & 3 deletions src/com/android/contacts/vcard/NfcImportVCardActivity.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@
import com.android.vcard.VCardParser;
import com.android.vcard.VCardParser_V21;
import com.android.vcard.VCardParser_V30;
import com.android.vcard.VCardParser_V40;
import com.android.vcard.VCardSourceDetector;
import com.android.vcard.exception.VCardException;
import com.android.vcard.exception.VCardNestedException;
Expand Down Expand Up @@ -126,9 +127,20 @@ public void onPostExecute(ImportRequest request) {
parser.addInterpreter(detector);
parser.parse(is);
} catch (VCardVersionException e2) {
FeedbackHelper.sendFeedback(this, TAG, "vcard with unsupported version", e2);
showFailureNotification(R.string.fail_reason_not_supported);
return null;
is.reset();
vcardVersion = ImportVCardActivity.VCARD_VERSION_V40;
parser = new VCardParser_V40();
try {
counter = new VCardEntryCounter();
detector = new VCardSourceDetector();
parser.addInterpreter(counter);
parser.addInterpreter(detector);
parser.parse(is);
} catch (VCardVersionException e3) {
FeedbackHelper.sendFeedback(this, TAG, "vcard with unsupported version", e2);
showFailureNotification(R.string.fail_reason_not_supported);
return null;
}
}
} finally {
try {
Expand Down

0 comments on commit 8fbeedd

Please sign in to comment.