Fix broken sdk api calls

app/src/main/java/chat/rocket/android/chatrooms/ui/ChatRoomsAdapter.kt

@@ -26,11 +26,11 @@ class ChatRoomsAdapter(private var dataSet: MutableList<ChatRoom>, private val c
         val chatRoom = dataSet[position]
         val chatRoomName = chatRoom.name
 
-        holder.chatName.textContent = chatRoomName!!
+        holder.chatName.textContent = chatRoomName
 
         if (chatRoom.type == RoomType.ONE_TO_ONE) {
             // TODO Check the best way to get the current server url.
-            val canonicalUrl = chatRoom.client.restUrl.toString()
+            val canonicalUrl = chatRoom.client.url
             holder.userAvatar.setImageURI(UrlHelper.getAvatarUrl(canonicalUrl, chatRoomName))
             holder.userAvatar.setVisibility(true)
         } else {

app/src/main/java/chat/rocket/android/dagger/module/AppModule.kt

@@ -29,8 +29,8 @@ class AppModule {
             platformLogger = logger
 
             // TODO remove
-            restUrl = HttpUrl.parse("https://open.rocket.chat")!!
-            websocketUrl = "https://open.rocket.chat"
+            // TODO: From where should we get the url here?
+            restUrl = "https://unstable.rocket.chat"
         }
     }
 

app/src/main/java/chat/rocket/android/push/di/PushModule.kt

@@ -11,7 +11,6 @@ import chat.rocket.core.RocketChatClient
 import chat.rocket.core.TokenRepository
 import dagger.Module
 import dagger.Provides
-import okhttp3.HttpUrl
 import okhttp3.OkHttpClient
 import okhttp3.logging.HttpLoggingInterceptor
 import javax.inject.Singleton
@@ -57,8 +56,7 @@ class PushModule(val context: FirebaseTokenService) {
     fun provideRocketChatClient(okHttpClient: OkHttpClient, repository: TokenRepository, logger: PlatformLogger): RocketChatClient {
         return RocketChatClient.create {
             httpClient = okHttpClient
-            restUrl = HttpUrl.parse("https://unstable.rocket.chat")!!
-            websocketUrl = "https://unstable.rocket.chat"
+            restUrl = "https://unstable.rocket.chat"
             tokenRepository = repository
             platformLogger = logger
         }

dependencies.gradle

@@ -9,7 +9,7 @@ ext {
         kotlin            : '1.2.10',
         coroutine         : '0.21',
         dokka             : '0.9.15',
-        kotshi            : '0.3.0-beta2',
+        kotshi            : '0.3.0',
 
         // Main dependencies
         support                : '27.0.2',