Difuse/difuse-phone-android
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Contact creation is OK but are invisible upon restart

Browse source
This commit is contained in:
Sylvain Berfini 2018-12-07 15:10:06 +01:00
parent 16ae046543
commit 998640fadd
7 changed files with 117 additions and 70 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/build.gradle
View file

@ -52,7 +52,7 @@ android {
versionName "4.1" versionName "4.1"
applicationId getPackageName() applicationId getPackageName()
multiDexEnabled true multiDexEnabled true
manifestPlaceholders = [sync_mimetype:"vnd.android.cursor.item/vnd." + getPackageName() + ".provider.sip_address"] manifestPlaceholders = [linphone_address_mime_type:"vnd.android.cursor.item/vnd." + getPackageName() + ".provider.sip_address"]
} }
applicationVariants.all { variant -> applicationVariants.all { variant ->
@ -82,7 +82,7 @@ android {
resValue "string", "sync_account_type", getPackageName() + ".sync" resValue "string", "sync_account_type", getPackageName() + ".sync"
resValue "string", "file_provider", getPackageName() + ".provider" resValue "string", "file_provider", getPackageName() + ".provider"
resValue "string", "sync_mimetype", "vnd.android.cursor.item/vnd." + getPackageName() + ".provider.sip_address" resValue "string", "linphone_address_mime_type", "vnd.android.cursor.item/vnd." + getPackageName() + ".provider.sip_address"
} }
debug { debug {
applicationIdSuffix ".debug" applicationIdSuffix ".debug"
@ -92,7 +92,7 @@ android {
resValue "string", "sync_account_type", getPackageName() + ".sync" resValue "string", "sync_account_type", getPackageName() + ".sync"
resValue "string", "file_provider", getPackageName() + ".provider" resValue "string", "file_provider", getPackageName() + ".provider"
resValue "string", "sync_mimetype", "vnd.android.cursor.item/vnd." + getPackageName() + ".provider.sip_address" resValue "string", "linphone_address_mime_type", "vnd.android.cursor.item/vnd." + getPackageName() + ".provider.sip_address"
} }
} }

2
app/src/main/AndroidManifest.xml
View file

@ -95,7 +95,7 @@
<action android:name="android.intent.action.VIEW" /> <action android:name="android.intent.action.VIEW" />
<category android:name="android.intent.category.BROWSABLE" /> <category android:name="android.intent.category.BROWSABLE" />
<category android:name="android.intent.category.DEFAULT" /> <category android:name="android.intent.category.DEFAULT" />
<data android:mimeType="${sync_mimetype}" /> <data android:mimeType="${linphone_address_mime_type}" />
</intent-filter> </intent-filter>
<intent-filter> <intent-filter>
<action android:name="android.intent.action.SEND" /> <action android:name="android.intent.action.SEND" />

167
app/src/main/java/org/linphone/contacts/AndroidContact.java
View file

@ -26,6 +26,10 @@ import android.content.ContentUris;
import android.database.Cursor; import android.database.Cursor;
import android.net.Uri; import android.net.Uri;
import android.provider.ContactsContract; import android.provider.ContactsContract;
import android.provider.ContactsContract.CommonDataKinds;
import android.provider.ContactsContract.Contacts;
import android.provider.ContactsContract.Data;
import android.provider.ContactsContract.RawContacts;
import androidx.core.util.Pair; import androidx.core.util.Pair;
import java.io.Serializable; import java.io.Serializable;
import java.util.ArrayList; import java.util.ArrayList;
@ -37,12 +41,14 @@ import org.linphone.R;
import org.linphone.mediastream.Log; import org.linphone.mediastream.Log;
class AndroidContact implements Serializable { class AndroidContact implements Serializable {
protected String mAndroidId, mAndroidRawId, mAndroidTagId, mAndroidLookupKey; protected String mAndroidId, mAndroidRawId, mAndroidLookupKey;
protected boolean isAndroidIdLinphone;
private transient ArrayList<ContentProviderOperation> mChangesToCommit; private transient ArrayList<ContentProviderOperation> mChangesToCommit;
protected AndroidContact() { protected AndroidContact() {
mChangesToCommit = new ArrayList<>(); mChangesToCommit = new ArrayList<>();
isAndroidIdLinphone = false;
} }
protected String getAndroidId() { protected String getAndroidId() {
@ -63,7 +69,7 @@ class AndroidContact implements Serializable {
protected Uri getAndroidLookupUri() { protected Uri getAndroidLookupUri() {
return ContactsContract.Contacts.getLookupUri( return ContactsContract.Contacts.getLookupUri(
Long.parseLong(getAndroidId()), getAndroidLookupKey()); Long.parseLong(mAndroidId), getAndroidLookupKey());
} }
protected boolean isAndroidContact() { protected boolean isAndroidContact() {
@ -78,15 +84,27 @@ class AndroidContact implements Serializable {
protected void saveChangesCommited() { protected void saveChangesCommited() {
if (ContactsManager.getInstance().hasContactsAccess() && mChangesToCommit.size() > 0) { if (ContactsManager.getInstance().hasContactsAccess() && mChangesToCommit.size() > 0) {
try { try {
ContentResolver contentResolver = LinphoneService.instance().getContentResolver();
ContentProviderResult[] results = ContentProviderResult[] results =
LinphoneService.instance() contentResolver.applyBatch(ContactsContract.AUTHORITY, mChangesToCommit);
.getContentResolver()
.applyBatch(ContactsContract.AUTHORITY, mChangesToCommit);
if (results != null && results.length > 0 && results[0] != null) { if (results != null && results.length > 0 && results[0] != null) {
Log.i("[Contact] Contact created with URI " + results[0].uri); mAndroidRawId = String.valueOf(ContentUris.parseId(results[0].uri));
Log.i("[Contact] Contact created with RAW ID " + mAndroidRawId);
final String[] projection =
new String[] {ContactsContract.RawContacts.CONTACT_ID};
final Cursor cursor =
contentResolver.query(results[0].uri, projection, null, null, null);
if (cursor != null) {
cursor.moveToNext();
long contactId = cursor.getLong(0);
mAndroidId = String.valueOf(contactId);
cursor.close();
Log.i("[Contact] Contact created with ID " + mAndroidId);
}
} }
} catch (Exception e) { } catch (Exception e) {
Log.e(e); Log.e("[Contact] Exception while saving changes: " + e);
} finally { } finally {
mChangesToCommit.clear(); mChangesToCommit.clear();
} }
@ -94,55 +112,41 @@ class AndroidContact implements Serializable {
} }
protected void createAndroidContact() { protected void createAndroidContact() {
// TODO
if (LinphoneManager.getInstance() if (LinphoneManager.getInstance()
.getContext() .getContext()
.getResources() .getResources()
.getBoolean(R.bool.use_linphone_tag)) { .getBoolean(R.bool.use_linphone_tag)) {
Log.i("[Contact] Creating contact using linphone account type"); Log.i("[Contact] Creating contact using linphone account type");
addChangesToCommit( addChangesToCommit(
ContentProviderOperation.newInsert(ContactsContract.RawContacts.CONTENT_URI) ContentProviderOperation.newInsert(RawContacts.CONTENT_URI)
.withValue( .withValue(
ContactsContract.RawContacts.ACCOUNT_TYPE, RawContacts.ACCOUNT_TYPE,
ContactsManager.getInstance() ContactsManager.getInstance()
.getString(R.string.sync_account_type)) .getString(R.string.sync_account_type))
.withValue( .withValue(
ContactsContract.RawContacts.ACCOUNT_NAME, RawContacts.ACCOUNT_NAME,
ContactsManager.getInstance() ContactsManager.getInstance()
.getString(R.string.sync_account_name)) .getString(R.string.sync_account_name))
.withValue( .withValue(
ContactsContract.RawContacts.AGGREGATION_MODE, RawContacts.AGGREGATION_MODE,
ContactsContract.RawContacts.AGGREGATION_MODE_DEFAULT) RawContacts.AGGREGATION_MODE_DEFAULT)
.build());
} else {
Log.i("[Contact] Creating contact using default account type");
addChangesToCommit(
ContentProviderOperation.newInsert(ContactsContract.RawContacts.CONTENT_URI)
.withValue(ContactsContract.RawContacts.ACCOUNT_TYPE, null)
.withValue(ContactsContract.RawContacts.ACCOUNT_NAME, null)
.withValue(
ContactsContract.RawContacts.AGGREGATION_MODE,
ContactsContract.RawContacts.AGGREGATION_MODE_DEFAULT)
.build()); .build());
isAndroidIdLinphone = true;
} }
} }
protected void deleteAndroidContact() { protected void deleteAndroidContact() {
ContactsManager.getInstance().delete(getAndroidId()); ContactsManager.getInstance().delete(mAndroidId);
} }
protected Uri getContactThumbnailPictureUri() { protected Uri getContactThumbnailPictureUri() {
Uri person = Uri person = ContentUris.withAppendedId(Contacts.CONTENT_URI, Long.parseLong(mAndroidId));
ContentUris.withAppendedId( return Uri.withAppendedPath(person, Contacts.Photo.CONTENT_DIRECTORY);
ContactsContract.Contacts.CONTENT_URI, Long.parseLong(getAndroidId()));
return Uri.withAppendedPath(person, ContactsContract.Contacts.Photo.CONTENT_DIRECTORY);
} }
protected Uri getContactPictureUri() { protected Uri getContactPictureUri() {
Uri person = Uri person = ContentUris.withAppendedId(Contacts.CONTENT_URI, Long.parseLong(mAndroidId));
ContentUris.withAppendedId( return Uri.withAppendedPath(person, Contacts.Photo.DISPLAY_PHOTO);
ContactsContract.Contacts.CONTENT_URI, Long.parseLong(getAndroidId()));
return Uri.withAppendedPath(person, ContactsContract.Contacts.Photo.DISPLAY_PHOTO);
} }
protected void setName(String fn, String ln) { protected void setName(String fn, String ln) {
@ -151,9 +155,16 @@ class AndroidContact implements Serializable {
return; return;
} }
if (mAndroidId == null || "0".equals(mAndroidId)) { if (mAndroidId == null) {
Log.i("[Contact] Setting given & family name " + fn + " " + ln + " to new contact."); Log.i("[Contact] Setting given & family name " + fn + " " + ln + " to new contact.");
// TODO addChangesToCommit(
ContentProviderOperation.newInsert(Data.CONTENT_URI)
.withValueBackReference(Data.RAW_CONTACT_ID, 0)
.withValue(
Data.MIMETYPE, CommonDataKinds.StructuredName.CONTENT_ITEM_TYPE)
.withValue(CommonDataKinds.StructuredName.GIVEN_NAME, fn)
.withValue(CommonDataKinds.StructuredName.FAMILY_NAME, ln)
.build());
} else { } else {
Log.i( Log.i(
"[Contact] Setting given & family name " "[Contact] Setting given & family name "
@ -173,9 +184,15 @@ class AndroidContact implements Serializable {
return; return;
} }
} }
if (mAndroidId == null || "0".equals(mAndroidId)) { if (mAndroidId == null) {
Log.i("[Contact] Setting organization " + org + " to new contact."); Log.i("[Contact] Setting organization " + org + " to new contact.");
// TODO addChangesToCommit(
ContentProviderOperation.newInsert(Data.CONTENT_URI)
.withValueBackReference(Data.RAW_CONTACT_ID, 0)
.withValue(
Data.MIMETYPE, CommonDataKinds.Organization.CONTENT_ITEM_TYPE)
.withValue(CommonDataKinds.Organization.COMPANY, org)
.build());
} else { } else {
Log.i("[Contact] Setting organization " + org + " to existing contact " + mAndroidId); Log.i("[Contact] Setting organization " + org + " to existing contact " + mAndroidId);
// TODO // TODO
@ -188,7 +205,7 @@ class AndroidContact implements Serializable {
return; return;
} }
if (mAndroidId == null || "0".equals(mAndroidId)) { if (mAndroidId == null) {
Log.i("[Contact] Setting picture to new contact."); Log.i("[Contact] Setting picture to new contact.");
// TODO // TODO
} else { } else {
@ -203,7 +220,7 @@ class AndroidContact implements Serializable {
return; return;
} }
if (mAndroidId == null || "0".equals(mAndroidId)) { if (mAndroidId == null) {
Log.i("[Contact] Removing number or address " + noa + " from new contact."); Log.i("[Contact] Removing number or address " + noa + " from new contact.");
// TODO // TODO
} else { } else {
@ -216,7 +233,7 @@ class AndroidContact implements Serializable {
} }
} }
protected void addNumberOrAddress(String value, String oldValueToReplace) { protected void addNumberOrAddress(String value, String oldValueToReplace, boolean isSIP) {
if (value == null || value.isEmpty()) { if (value == null || value.isEmpty()) {
Log.e("[Contact] Can't add null or empty number or address"); Log.e("[Contact] Can't add null or empty number or address");
return; return;
@ -237,9 +254,35 @@ class AndroidContact implements Serializable {
+ mAndroidId); + mAndroidId);
// TODO // TODO
} else { } else {
if (mAndroidId == null || "0".equals(mAndroidId)) { if (mAndroidId == null) {
Log.i("[Contact] Adding number or address " + value + " to new contact."); Log.i("[Contact] Adding number or address " + value + " to new contact.");
// TODO if (isSIP) {
addChangesToCommit(
ContentProviderOperation.newInsert(Data.CONTENT_URI)
.withValueBackReference(Data.RAW_CONTACT_ID, 0)
.withValue(
Data.MIMETYPE,
ContactsManager.getInstance()
.getString(R.string.linphone_address_mime_type))
.withValue("data1", value) // Value
.withValue(
"data2",
ContactsManager.getInstance()
.getString(R.string.app_name)) // Summary
.withValue("data3", value) // Detail
.build());
} else {
addChangesToCommit(
ContentProviderOperation.newInsert(Data.CONTENT_URI)
.withValueBackReference(Data.RAW_CONTACT_ID, 0)
.withValue(
Data.MIMETYPE, CommonDataKinds.Phone.CONTENT_ITEM_TYPE)
.withValue(ContactsContract.CommonDataKinds.Phone.NUMBER, value)
.withValue(
ContactsContract.CommonDataKinds.Phone.TYPE,
CommonDataKinds.Phone.TYPE_MOBILE)
.build());
}
} else { } else {
Log.i( Log.i(
"[Contact] Adding number or address " "[Contact] Adding number or address "
@ -257,7 +300,7 @@ class AndroidContact implements Serializable {
.getContext() .getContext()
.getResources() .getResources()
.getBoolean(R.bool.use_linphone_tag)) { .getBoolean(R.bool.use_linphone_tag)) {
mAndroidTagId = findLinphoneRawContactId(); // TODO
} }
} }
@ -276,8 +319,7 @@ class AndroidContact implements Serializable {
+ "=?"; + "=?";
String[] args = String[] args =
new String[] { new String[] {
getAndroidId(), mAndroidId, ContactsContract.CommonDataKinds.StructuredName.CONTENT_ITEM_TYPE
ContactsContract.CommonDataKinds.StructuredName.CONTENT_ITEM_TYPE
}; };
Cursor c = resolver.query(ContactsContract.Data.CONTENT_URI, proj, select, args, null); Cursor c = resolver.query(ContactsContract.Data.CONTENT_URI, proj, select, args, null);
if (c != null) { if (c != null) {
@ -310,7 +352,7 @@ class AndroidContact implements Serializable {
+ "=?"; + "=?";
String[] args = String[] args =
new String[] { new String[] {
getAndroidId(), ContactsContract.CommonDataKinds.Organization.CONTENT_ITEM_TYPE mAndroidId, ContactsContract.CommonDataKinds.Organization.CONTENT_ITEM_TYPE
}; };
Cursor c = resolver.query(ContactsContract.Data.CONTENT_URI, proj, select, args, null); Cursor c = resolver.query(ContactsContract.Data.CONTENT_URI, proj, select, args, null);
if (c != null) { if (c != null) {
@ -336,7 +378,7 @@ class AndroidContact implements Serializable {
ContactsContract.RawContacts.CONTENT_URI, ContactsContract.RawContacts.CONTENT_URI,
projection, projection,
selection, selection,
new String[] {getAndroidId()}, new String[] {mAndroidId},
null); null);
if (c != null) { if (c != null) {
if (c.moveToFirst()) { if (c.moveToFirst()) {
@ -370,10 +412,11 @@ class AndroidContact implements Serializable {
projection, projection,
select, select,
new String[] { new String[] {
getAndroidId(), mAndroidId,
ContactsContract.CommonDataKinds.SipAddress.CONTENT_ITEM_TYPE, ContactsContract.CommonDataKinds.SipAddress.CONTENT_ITEM_TYPE,
ContactsContract.CommonDataKinds.Phone.CONTENT_ITEM_TYPE, ContactsContract.CommonDataKinds.Phone.CONTENT_ITEM_TYPE,
ContactsManager.getInstance().getString(R.string.sync_mimetype) ContactsManager.getInstance()
.getString(R.string.linphone_address_mime_type)
}, },
null); null);
if (c != null) { if (c != null) {
@ -383,7 +426,7 @@ class AndroidContact implements Serializable {
if (mime.equals(ContactsContract.CommonDataKinds.SipAddress.CONTENT_ITEM_TYPE) if (mime.equals(ContactsContract.CommonDataKinds.SipAddress.CONTENT_ITEM_TYPE)
|| mime.equals( || mime.equals(
ContactsManager.getInstance() ContactsManager.getInstance()
.getString(R.string.sync_mimetype))) { .getString(R.string.linphone_address_mime_type))) {
String number = c.getString(c.getColumnIndex("data1")); // SIP_ADDRESS String number = c.getString(c.getColumnIndex("data1")); // SIP_ADDRESS
result.add(new LinphoneNumberOrAddress(number, true)); result.add(new LinphoneNumberOrAddress(number, true));
} else if (mime.equals( } else if (mime.equals(
@ -401,14 +444,16 @@ class AndroidContact implements Serializable {
return result; return result;
} }
protected void createLinphoneTagIfNeeded() { protected void createRawLinphoneContactFromExistingAndroidContactIfNeeded(String fullName) {
if (LinphoneManager.getInstance() if (LinphoneManager.getInstance()
.getContext() .getContext()
.getResources() .getResources()
.getBoolean(R.bool.use_linphone_tag)) { .getBoolean(R.bool.use_linphone_tag)) {
if (mAndroidTagId == null && findLinphoneRawContactId() == null) { // TODO
createLinphoneContactTag(); /*if (mLinphoneAndroidContactId == null && findLinphoneRawContactId() == null) {
} createRawLinphoneContactFromExistingAndroidContact(fullName);
isAndroidIdLinphone = true;
}*/
} }
} }
@ -428,7 +473,7 @@ class AndroidContact implements Serializable {
projection, projection,
selection, selection,
new String[] { new String[] {
getAndroidId(), mAndroidId,
ContactsManager.getInstance().getString(R.string.sync_account_type) ContactsManager.getInstance().getString(R.string.sync_account_type)
}, },
null); null);
@ -441,10 +486,10 @@ class AndroidContact implements Serializable {
return result; return result;
} }
private void createLinphoneContactTag() { /*private void createRawLinphoneContactFromExistingAndroidContact(String fullName) {
ArrayList<ContentProviderOperation> batch = new ArrayList<>(); ArrayList<ContentProviderOperation> batch = new ArrayList<>();
/*batch.add( batch.add(
ContentProviderOperation.newInsert(ContactsContract.RawContacts.CONTENT_URI) ContentProviderOperation.newInsert(ContactsContract.RawContacts.CONTENT_URI)
.withValue( .withValue(
ContactsContract.RawContacts.ACCOUNT_TYPE, ContactsContract.RawContacts.ACCOUNT_TYPE,
@ -465,7 +510,7 @@ class AndroidContact implements Serializable {
ContactsContract.CommonDataKinds.StructuredName.CONTENT_ITEM_TYPE) ContactsContract.CommonDataKinds.StructuredName.CONTENT_ITEM_TYPE)
.withValue( .withValue(
ContactsContract.CommonDataKinds.StructuredName.DISPLAY_NAME, ContactsContract.CommonDataKinds.StructuredName.DISPLAY_NAME,
getFullName()) fullName)
.build()); .build());
batch.add( batch.add(
@ -479,17 +524,15 @@ class AndroidContact implements Serializable {
mAndroidRawId) mAndroidRawId)
.withValueBackReference( .withValueBackReference(
ContactsContract.AggregationExceptions.RAW_CONTACT_ID2, 0) ContactsContract.AggregationExceptions.RAW_CONTACT_ID2, 0)
.build());*/ .build());
// TODO Log.i("[Contact] Creating linphone contact");
Log.i("[Contact] Creating linphone tag");
try { try {
LinphoneService.instance() LinphoneService.instance()
.getContentResolver() .getContentResolver()
.applyBatch(ContactsContract.AUTHORITY, batch); .applyBatch(ContactsContract.AUTHORITY, batch);
mAndroidTagId = findLinphoneRawContactId();
} catch (Exception e) { } catch (Exception e) {
Log.e(e); Log.e(e);
} }
} }*/
} }

2
app/src/main/java/org/linphone/contacts/AsyncContactsLoader.java
View file

@ -158,7 +158,7 @@ class AsyncContactsLoader extends AsyncTask<Void, Void, AsyncContactsLoader.Asyn
contact.addNumberOrAddress(new LinphoneNumberOrAddress(data1, data4)); contact.addNumberOrAddress(new LinphoneNumberOrAddress(data1, data4));
} else if (ContactsContract.CommonDataKinds.SipAddress.CONTENT_ITEM_TYPE.equals( } else if (ContactsContract.CommonDataKinds.SipAddress.CONTENT_ITEM_TYPE.equals(
mime) mime)
|| mContext.getString(R.string.sync_mimetype).equals(mime)) { || mContext.getString(R.string.linphone_address_mime_type).equals(mime)) {
contact.addNumberOrAddress(new LinphoneNumberOrAddress(data1, true)); contact.addNumberOrAddress(new LinphoneNumberOrAddress(data1, true));
} else if (ContactsContract.CommonDataKinds.Organization.CONTENT_ITEM_TYPE.equals( } else if (ContactsContract.CommonDataKinds.Organization.CONTENT_ITEM_TYPE.equals(
mime)) { mime)) {

6
app/src/main/java/org/linphone/contacts/ContactEditorFragment.java
View file

@ -91,7 +91,8 @@ public class ContactEditorFragment extends Fragment {
Serializable obj = getArguments().getSerializable("Contact"); Serializable obj = getArguments().getSerializable("Contact");
if (obj != null) { if (obj != null) {
mContact = (LinphoneContact) obj; mContact = (LinphoneContact) obj;
mContact.createLinphoneTagIfNeeded(); mContact.createRawLinphoneContactFromExistingAndroidContactIfNeeded(
mContact.getFullName());
mIsNewContact = false; mIsNewContact = false;
if (getArguments().getString("NewSipAdress") != null) { if (getArguments().getString("NewSipAdress") != null) {
mNewSipOrNumberToAdd = getArguments().getString("NewSipAdress"); mNewSipOrNumberToAdd = getArguments().getString("NewSipAdress");
@ -175,6 +176,9 @@ public class ContactEditorFragment extends Fragment {
mContact.save(); mContact.save();
getFragmentManager().popBackStackImmediate(); getFragmentManager().popBackStackImmediate();
if (mIsNewContact) {
LinphoneActivity.instance().displayContact(mContact, false);
}
} }
}); });

2
app/src/main/java/org/linphone/contacts/LinphoneContact.java
View file

@ -267,7 +267,7 @@ public class LinphoneContact extends AndroidContact
public void addOrUpdateNumberOrAddress(LinphoneNumberOrAddress noa) { public void addOrUpdateNumberOrAddress(LinphoneNumberOrAddress noa) {
if (noa != null && noa.getValue() != null) { if (noa != null && noa.getValue() != null) {
addNumberOrAddress(noa.getValue(), noa.getOldValue()); addNumberOrAddress(noa.getValue(), noa.getOldValue(), noa.isSIPAddress());
if (isFriend()) { if (isFriend()) {
if (noa.isSIPAddress()) { if (noa.isSIPAddress()) {

2
app/src/main/res/xml/contacts.xml
View file

@ -5,7 +5,7 @@
android:detailColumn="data3" android:detailColumn="data3"
android:detailSocialSummary="true" android:detailSocialSummary="true"
android:icon="@drawable/linphone_logo" android:icon="@drawable/linphone_logo"
android:mimeType="@string/sync_mimetype" android:mimeType="@string/linphone_address_mime_type"
android:summaryColumn="data2" /> android:summaryColumn="data2" />
</ContactsSource> </ContactsSource>