From 775ee4d3e14d3b03a9bca59cf364c3932d5458c7 Mon Sep 17 00:00:00 2001
From: Erwan Croze <erwan.croze@belledonne-communications.com>
Date: Thu, 20 Jul 2017 12:04:06 +0200
Subject: [PATCH] Fixing delete contact from contact detail view

---
 build.gradle                                  |  1 +
 src/android/org/linphone/LinphoneContact.java |  3 ++-
 .../org/linphone/ZShutdownTestEnv.java        | 25 -------------------
 3 files changed, 3 insertions(+), 26 deletions(-)
 delete mode 100644 src/androidTest/org/linphone/ZShutdownTestEnv.java

diff --git a/build.gradle b/build.gradle
index a3f7fcee5..491dbb7cf 100644
--- a/build.gradle
+++ b/build.gradle
@@ -178,6 +178,7 @@ android.applicationVariants.all { variant ->
       "${adb} shell pm grant ${applicationId} android.permission.CAMERA".execute()
       "${adb} shell pm grant ${applicationId} android.permission.READ_PHONE_STATE".execute()
       "${adb} shell pm grant ${applicationId} android.permission.READ_CONTACTS".execute()
+      "${adb} shell pm grant ${applicationId} android.permission.WRITE_CONTACTS".execute()
     }
   })
 }
diff --git a/src/android/org/linphone/LinphoneContact.java b/src/android/org/linphone/LinphoneContact.java
index 9f08244eb..3065c35a4 100644
--- a/src/android/org/linphone/LinphoneContact.java
+++ b/src/android/org/linphone/LinphoneContact.java
@@ -489,6 +489,7 @@ public class LinphoneContact implements Serializable, Comparable<LinphoneContact
 			String[] args = new String[] { getAndroidId() };
 			changesToCommit.add(ContentProviderOperation.newDelete(ContactsContract.RawContacts.CONTENT_URI).withSelection(select, args).build());
 			save();
+			ContactsManager.getInstance().delete(getAndroidId());
 		}
 		if (isLinphoneFriend()) {
 			deleteFriend();
@@ -500,7 +501,7 @@ public class LinphoneContact implements Serializable, Comparable<LinphoneContact
 			LinphoneManager.getLcIfManagerNotDestroyedOrNull().removeFriend(friend);
 		}
 	}
-	
+
 	public void clearAddresses() {
 		addresses.clear();
 	}
diff --git a/src/androidTest/org/linphone/ZShutdownTestEnv.java b/src/androidTest/org/linphone/ZShutdownTestEnv.java
deleted file mode 100644
index 2bdba2288..000000000
--- a/src/androidTest/org/linphone/ZShutdownTestEnv.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package org.linphone;
-
-import static android.content.Intent.ACTION_MAIN;
-
-import org.linphone.LinphoneService;
-
-import android.content.Intent;
-import android.test.suitebuilder.annotation.LargeTest;
-import android.test.suitebuilder.annotation.MediumTest;
-import android.test.suitebuilder.annotation.SmallTest;
-
-/**
- * @author Sylvain Berfini
- */
-public class ZShutdownTestEnv extends SampleTest {
-
-	@SmallTest
-	@MediumTest
-	@LargeTest
-	public void testZShutDownLinphoneCore() {
-		LinphoneTestManager.destroy();
-		aContext.stopService(new Intent(ACTION_MAIN).setClass(aContext, LinphoneService.class));
-	}
-
-}