ConversationFacade: fix URI for conversation ban

Change-Id: I64da77b634315b1f2f90c058d7a91335a7258ed0

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

@@ -267,7 +267,7 @@ class DRingService : Service() {
                 ACTION_TRUST_REQUEST_REFUSE -> mConversationFacade.discardRequest(path.accountId, path.conversationUri)
                 ACTION_TRUST_REQUEST_BLOCK -> {
                     mConversationFacade.discardRequest(path.accountId, path.conversationUri)
-                    mAccountService.removeContact(path.accountId, path.conversationUri.rawRingId, true)
+                    mConversationFacade.banConversation(path.accountId, path.conversationUri)
                 }
             }
         }

ring-android/app/src/main/java/cx/ring/tv/contact/TVContactPresenter.kt

@@ -103,7 +103,7 @@ class TVContactPresenter @Inject constructor(
 
     fun blockTrustRequest() {
         mConversationService.discardRequest(mAccountId!!, mUri!!)
-        mAccountService.removeContact(mAccountId!!, mUri!!.rawRingId, true)
+        mConversationService.banConversation(mAccountId!!, mUri!!)
         view?.finishView()
     }
 }
\ No newline at end of file

ring-android/libjamiclient/src/main/kotlin/net/jami/contactrequests/ContactRequestsPresenter.kt

@@ -53,7 +53,7 @@ class ContactRequestsPresenter @Inject internal constructor(
 
     fun banContact(item: Conversation) {
         conversationFacade.discardRequest(item.accountId, item.uri)
-        accountService.removeContact(item.accountId, item.uri.host, true)
+        conversationFacade.banConversation(item.accountId, item.uri)
     }
 
     fun copyNumber(item: Conversation) {

ring-android/libjamiclient/src/main/kotlin/net/jami/conversation/ConversationPresenter.kt

@@ -347,7 +347,7 @@ class ConversationPresenter @Inject constructor(
     fun onBlockIncomingContactRequest() {
         mConversation?.let { conversation ->
             conversationFacade.discardRequest(conversation.accountId, conversation.uri)
-            accountService.removeContact(conversation.accountId, conversation.uri.host, true)
+            conversationFacade.banConversation(conversation.accountId, conversation.uri)
         }
         view?.goToHome()
     }

ring-android/libjamiclient/src/main/kotlin/net/jami/services/ConversationFacade.kt

@@ -626,14 +626,14 @@ class ConversationFacade(
                 .subscribe { conversation: Conversation ->
                     try {
                         val contact = conversation.contact
-                        mAccountService.removeContact(accountId, contact!!.uri.rawUriString, true)
+                        mAccountService.removeContact(accountId, contact!!.uri.rawRingId, true)
                     } catch (e: Exception) {
                         mAccountService.removeConversation(accountId, conversationUri)
                     }
                 }
             //return mAccountService.removeConversation(accountId, conversationUri);
         } else {
-            mAccountService.removeContact(accountId, conversationUri.rawUriString, true)
+            mAccountService.removeContact(accountId, conversationUri.rawRingId, true)
         }
     }