jni: update for new removeContact API

Add distinction between removing a contact
and banning it.

Change-Id: I9d8dd8e544b8e907e23d8b7fafa6bcccbed49ca4
Reviewed-by: Hadrien De Sousa <hadrien.desousa@savoirfairelinux.com>

ring-android/app/src/main/java/cx/ring/service/DRingService.java

@@ -625,7 +625,7 @@ public class DRingService extends Service implements Observer<ServiceEvent> {
                     break;
                 case ACTION_TRUST_REQUEST_BLOCK:
                     mAccountService.discardTrustRequest(account, from);
-                    mContactService.removeContact(account, from);
+                    mContactService.removeContact(account, from, true);
                     break;
             }
         }

ring-android/libringclient/src/main/java/cx/ring/contactrequests/PendingContactRequestsPresenter.java

@@ -175,7 +175,7 @@ public class PendingContactRequestsPresenter extends RootPresenter<PendingContac
         String accountId = mAccountID == null ? mAccountService.getCurrentAccount().getAccountID() : mAccountID;
         String contactId = viewModel.getContactId();
         mAccountService.discardTrustRequest(accountId, contactId);
-        mContactService.removeContact(accountId, contactId);
+        mContactService.removeContact(accountId, contactId, true);
         mPreferencesService.removeRequestPreferences(accountId, contactId);
         updateList(true);
     }

ring-android/libringclient/src/main/java/cx/ring/conversation/ConversationPresenter.java

@@ -156,7 +156,7 @@ public class ConversationPresenter extends RootPresenter<ConversationView> imple
             contactId = split[1];
         }
 
-        mContactService.removeContact(accountId, contactId);
+        mContactService.removeContact(accountId, contactId, true);
         getView().goToHome();
     }
 

ring-android/libringclient/src/main/java/cx/ring/services/ContactService.java

@@ -356,7 +356,7 @@ public abstract class ContactService extends Observable {
      * @param accountId
      * @param uri
      */
-    public void removeContact(final String accountId, final String uri) {
+    public void removeContact(final String accountId, final String uri, final boolean ban) {
 
         FutureUtils.executeDaemonThreadCallable(
                 mExecutor,
@@ -366,7 +366,7 @@ public abstract class ContactService extends Observable {
                     @Override
                     public Boolean call() throws Exception {
                         Log.i(TAG, "removeContact() thread running...");
-                        Ringservice.removeContact(accountId, uri);
+                        Ringservice.removeContact(accountId, uri, ban);
                         return true;
                     }
                 }

ring-android/libringclient/src/main/java/cx/ring/smartlist/SmartListPresenter.java

@@ -368,7 +368,7 @@ public class SmartListPresenter extends RootPresenter<SmartListView> implements
     public void removeContact(String accountId, String contactId) {
         String[] split = contactId.split(":");
         if (split.length > 1 && split[0].equals("ring")) {
-            mContactService.removeContact(accountId, split[1]);
+            mContactService.removeContact(accountId, split[1], false);
         }
     }
 

ring-android/libringclient/src/main/jni/configurationmanager.i

@@ -186,7 +186,7 @@ void sendTrustRequest(const std::string& accountId, const std::string& to, const
 /* Contacts */
 
 void addContact(const std::string& accountId, const std::string& uri);
-void removeContact(const std::string& accountId, const std::string& uri);
+void removeContact(const std::string& accountId, const std::string& uri, const bool& ban);
 std::vector<std::map<std::string, std::string>> getContacts(const std::string& accountId);
 
 int exportAccounts(std::vector<std::string> accountIDs, std::string toDir, std::string password);