contactservice: reduce dependency to accountservice

Change-Id: Id5396932a0f5a97e9fece567ad2ff9e31f9d945f

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

@@ -268,15 +268,17 @@ public class ConversationPresenter extends RootPresenter<ConversationView> {
     public void sendTrustRequest() {
         final String accountId = mAccountId;
         final Uri contactId = mContactRingId;
-        mVCardService.loadSmallVCard(accountId, VCardService.MAX_SIZE_REQUEST).subscribe(vCard -> {
-            mAccountService.sendTrustRequest(accountId, contactId.getRawRingId(), Blob.fromString(VCardUtils.vcardToString(vCard)));
-            CallContact contact = mContactService.findContact(accountId, contactId);
-            if (contact == null) {
-                Log.e(TAG, "sendTrustRequest: not able to find contact");
-                return;
-            }
-            contact.setStatus(CallContact.Status.REQUEST_SENT);
-        });
+        mVCardService.loadSmallVCard(accountId, VCardService.MAX_SIZE_REQUEST)
+                .subscribeOn(Schedulers.computation())
+                .subscribe(vCard -> {
+                    mAccountService.sendTrustRequest(accountId, contactId.getRawRingId(), Blob.fromString(VCardUtils.vcardToString(vCard)));
+                    CallContact contact = mContactService.findContact(mAccountService.getAccount(accountId), contactId);
+                    if (contact == null) {
+                        Log.e(TAG, "sendTrustRequest: not able to find contact");
+                        return;
+                    }
+                    contact.setStatus(CallContact.Status.REQUEST_SENT);
+                });
     }
 
     public void clickOnGoingPane() {

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

@@ -96,7 +96,7 @@ public class CallService {
             if (audioOnly) {
                 Ringservice.muteLocalMedia(callId, "MEDIA_TYPE_VIDEO", true);
             }
-            CallContact contact = mContactService.findContactByNumber(account, number);
+            CallContact contact = mContactService.findContactByNumber(mAccountService.getAccount(account), number);
             SipCall call = addCall(account, callId, number, SipCall.Direction.OUTGOING);
             call.muteVideo(audioOnly);
             call.setContact(contact);
@@ -305,7 +305,7 @@ public class CallService {
                 return null;
             }
             sipCall.setCallState(callState);
-            CallContact contact = mContactService.findContact(sipCall.getAccount(), sipCall.getNumberUri());
+            CallContact contact = mContactService.findContact(mAccountService.getAccount(sipCall.getAccount()), sipCall.getNumberUri());
             String registeredName = callDetails.get("REGISTERED_NAME");
             if (registeredName != null && !registeredName.isEmpty()) {
                 contact.setUsername(registeredName);

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

@@ -117,11 +117,11 @@ public abstract class ContactService {
      *
      * @return The found/created contact
      */
-    public CallContact findContactByNumber(String accountId, String number) {
-        if (StringUtils.isEmpty(number) || StringUtils.isEmpty(accountId)) {
+    public CallContact findContactByNumber(Account account, String number) {
+        if (StringUtils.isEmpty(number) || account == null) {
             return null;
         }
-        return findContact(accountId, new Uri(number));
+        return findContact(account, new Uri(number));
     }
 
     public CallContact findContact(Account account, Uri uri) {
@@ -136,8 +136,4 @@ public abstract class ContactService {
         }
         return contact;
     }
-
-    public CallContact findContact(String accountId, Uri uri) {
-        return findContact(mAccountService.getAccount(accountId), uri);
-    }
 }
\ No newline at end of file