PeterCxy
/
open-keychain
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Merge pull request #2393 from wiktor-k/xmpp-uri 

Fix saving XMPP URIs in phone Contact Book
master
Vincent Breitmoser 2018-09-13 10:40:43 +02:00 committed by GitHub
parent e6be72d3ec 5c55c1a166
commit cc64cf404c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 21 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/ContactHelper.java
View File

@ -41,6 +41,7 @@ import android.net.Uri;
import android.os.Build;
import android.provider.ContactsContract;
import android.provider.ContactsContract.CommonDataKinds.Email;
import android.provider.ContactsContract.CommonDataKinds.Im;
import android.provider.ContactsContract.Data;
import android.support.v4.content.ContextCompat;
import android.util.Patterns;
@ -785,17 +786,29 @@ public class ContactHelper {
*/
private void writeContactEmail(ArrayList<ContentProviderOperation> ops,
long rawContactId, long masterKeyId) {
ContentProviderOperation deleteOp = selectByRawContactAndItemType(
ContentProviderOperation deleteEmailOp = selectByRawContactAndItemType(
ContentProviderOperation.newDelete(Data.CONTENT_URI), rawContactId, Email.CONTENT_ITEM_TYPE).build();
ops.add(deleteOp);
ops.add(deleteEmailOp);
ContentProviderOperation deleteJabberOp = selectByRawContactAndItemType(
ContentProviderOperation.newDelete(Data.CONTENT_URI), rawContactId, Im.CONTENT_ITEM_TYPE).build();
ops.add(deleteJabberOp);
for (UserId userId : keyRepository.getUserIds(masterKeyId)) {
ContentProviderOperation insertOp =
referenceRawContact(ContentProviderOperation.newInsert(Data.CONTENT_URI), rawContactId)
.withValue(Data.MIMETYPE, Email.CONTENT_ITEM_TYPE)
.withValue(Email.DATA, userId.email())
.build();
ops.add(insertOp);
if (userId.email() != null) {
ContentProviderOperation.Builder builder = referenceRawContact(
ContentProviderOperation.newInsert(Data.CONTENT_URI), rawContactId);
if (userId.email().startsWith("xmpp:")) {
builder = builder.withValue(Data.MIMETYPE, Im.CONTENT_ITEM_TYPE)
.withValue(Im.PROTOCOL, Im.PROTOCOL_JABBER)
.withValue(Im.DATA, userId.email().substring(5));
} else {
builder = builder.withValue(Data.MIMETYPE, Email.CONTENT_ITEM_TYPE)
.withValue(Email.DATA, userId.email());
}
ops.add(builder.build());
}
}
}