request: fix block request crash

- handle crash by catching the error properly
- call banRequest before removeRequest

GitLab: #1576
Change-Id: I425f0316178b619a23ad205581f620a22f44b4ec

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

@@ -256,8 +256,8 @@ class DRingService : Service() {
                 ACTION_TRUST_REQUEST_ACCEPT -> mConversationFacade.acceptRequest(path.accountId, path.conversationUri)
                 ACTION_TRUST_REQUEST_REFUSE -> mConversationFacade.discardRequest(path.accountId, path.conversationUri)
                 ACTION_TRUST_REQUEST_BLOCK -> {
-                    mConversationFacade.discardRequest(path.accountId, path.conversationUri)
                     mConversationFacade.banConversation(path.accountId, path.conversationUri)
+                    mConversationFacade.discardRequest(path.accountId, path.conversationUri)
                 }
             }
         }

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

@@ -98,8 +98,8 @@ class TVContactPresenter @Inject constructor(
     }
 
     fun blockTrustRequest() {
-        mConversationService.discardRequest(mAccountId!!, mUri!!)
         mConversationService.banConversation(mAccountId!!, mUri!!)
+        mConversationService.discardRequest(mAccountId!!, mUri!!)
         view?.finishView()
     }
 }
\ No newline at end of file

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

@@ -49,8 +49,8 @@ class ContactRequestsPresenter @Inject internal constructor(
     }
 
     fun banContact(item: Conversation) {
-        conversationFacade.discardRequest(item.accountId, item.uri)
         conversationFacade.banConversation(item.accountId, item.uri)
+        conversationFacade.discardRequest(item.accountId, item.uri)
     }
 
     fun copyNumber(item: Conversation) {

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

@@ -446,8 +446,8 @@ class ConversationPresenter @Inject constructor(
 
     fun onBlockIncomingContactRequest() {
         mConversation?.let { conversation ->
-            conversationFacade.discardRequest(conversation.accountId, conversation.uri)
             conversationFacade.banConversation(conversation.accountId, conversation.uri)
+            conversationFacade.discardRequest(conversation.accountId, conversation.uri)
         }
         view?.goToHome()
     }

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

@@ -69,8 +69,8 @@ class ConversationFacade(
         }
     }
 
-    fun startConversation(accountId: String, contactId: Uri): Single<Conversation> = getAccountSubject(accountId)
-        .map { account: Account -> account.getByUri(contactId)!! }
+    fun startConversation(accountId: String, contactId: Uri): Single<Conversation> =
+        getAccountSubject(accountId).map { account: Account -> account.getByUri(contactId)!! }
 
     fun getAccountSubject(accountId: String): Single<Account> = mAccountService.getAccountSingle(accountId)
         .flatMap { account: Account -> loadSmartlist(account) }
@@ -685,19 +685,17 @@ class ConversationFacade(
 
     fun banConversation(accountId: String, conversationUri: Uri) {
         if (conversationUri.isSwarm) {
-            startConversation(accountId, conversationUri)
-                .subscribe { conversation: Conversation ->
+            mDisposableBag.add(
+                startConversation(accountId, conversationUri).subscribe({ v: Conversation ->
                     try {
-                        val contact = conversation.contact
+                        val contact = v.contact
                         mAccountService.removeContact(accountId, contact!!.uri.rawRingId, true)
                     } catch (e: Exception) {
                         mAccountService.removeConversation(accountId, conversationUri)
                     }
-                }
-            //return mAccountService.removeConversation(accountId, conversationUri);
-        } else {
-            mAccountService.removeContact(accountId, conversationUri.rawRingId, true)
-        }
+                }, { e: Throwable -> Log.e(TAG, "Error banning conversation", e) })
+            )
+        } else mAccountService.removeContact(accountId, conversationUri.rawRingId, true)
     }
 
     fun createConversation(accountId: String, currentSelection: Collection<Contact>): Single<Conversation> {