search: support using uri with nameserver, unicode characters

Change-Id: I8128b0ec3a3bcfa38bc4b68e8c4b453ded24f6e7

ring-android/libringclient/src/main/java/cx/ring/facades/ConversationFacade.java

@@ -375,7 +375,7 @@ public class ConversationFacade {
         } else if (uri.isRingId()) {
             return mContactService.getLoadedContact(account.getAccountID(), account.getContactFromCache(uri))
                     .map(contact -> Collections.singletonList(Observable.just(new SmartListViewModel(account.getAccountID(), contact, null))));
-        } else if (account.canSearch()) {
+        } else if (account.canSearch() && !query.contains("@")) {
             return mAccountService.searchUser(account.getAccountID(), query)
                     .map(AccountService.UserSearchResult::getResultsViewModels);
         } else {

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

@@ -1209,7 +1209,7 @@ public class AccountService {
             return Single.error(e);
         }
         return getSearchResults()
-                .filter(r -> account.equals(r.accountId) && query.equals(r.query))
+                .filter(r -> account.equals(r.accountId) && encodedUrl.equals(r.query))
                 .firstOrError()
                 .doOnSubscribe(s -> mExecutor.execute(() -> Ringservice.searchUser(account, encodedUrl)))
                 .subscribeOn(Schedulers.from(mExecutor));