call: fix hosting conferences

Change-Id: I228ae2f805fdb0b49c57d28ed1c0a625746b380e

ring-android/libjamiclient/src/main/kotlin/net/jami/call/CallPresenter.kt

@@ -192,8 +192,7 @@ class CallPresenter @Inject constructor(
     }
 
     private fun showConference(conference: Observable<Conference>) {
-        var conference = conference
-        conference = conference.distinctUntilChanged()
+        val conference = conference.distinctUntilChanged()
         mCompositeDisposable.add(conference
             .switchMap { obj: Conference -> obj.participantInfo }
             .observeOn(mUiScheduler)
@@ -608,7 +607,7 @@ class CallPresenter @Inject constructor(
                         .filter(Call::isOnGoing)
                         .firstElement()
                         .delay(1, TimeUnit.SECONDS)
-                        .doOnEvent { v: Call, e: Throwable -> pendingObserver.onComplete() }
+                        .doOnEvent { v: Call?, e: Throwable? -> pendingObserver.onComplete() }
                     mCompositeDisposable.add(newCall.subscribe { call: Call ->
                         val id = mConference!!.id
                         if (mConference!!.isConference) {

ring-android/libjamiclient/src/main/kotlin/net/jami/model/Conference.kt

@@ -122,8 +122,10 @@ class Conference {
     }
 
     fun findCallByContact(uri: Uri): Call? {
+        val mUri = if (uri.host == "ring.dht") Uri.fromId(uri.rawRingId) else uri
         for (call in mParticipants) {
-            if (call.contact!!.uri.toString() == uri.toString()) return call
+            if (call.contact?.uri == mUri)
+                return call
         }
         return null
     }

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

@@ -95,6 +95,8 @@ class CallService(
             val newInfo: MutableList<ParticipantInfo> = ArrayList(info.size)
             if (conference.isConference) {
                 for (i in info) {
+                    val uri = i["uri"]!!
+                    if (uri.isEmpty()) continue
                     val call = conference.findCallByContact(Uri.fromString(i["uri"]!!))
                     if (call != null) {
                         val confInfo = ParticipantInfo(call, call.contact!!, i)
@@ -128,7 +130,7 @@ class CallService(
             conference.isModerator = isModerator
             conference.setInfo(newInfo)
         } else {
-            Log.w(TAG, "onConferenceInfoUpdated can't find conference$confId")
+            Log.w(TAG, "onConferenceInfoUpdated can't find conference $confId")
         }
     }