Merge pull request #484 from filipedelimabrito/fix-rest-call-old-servers

[FIX] Crash that happens w/ old servers when invoking the REST API calls.

app/src/main/java/chat/rocket/android/fragment/chatroom/list/RoomListPresenter.kt

@@ -2,6 +2,7 @@ package chat.rocket.android.fragment.chatroom.list
 
 import android.content.Context
 import android.os.Handler
+import android.util.Log
 import chat.rocket.android.R
 import chat.rocket.android.api.rest.RestApiHelper
 import chat.rocket.android.helper.OkHttpHelper
@@ -11,6 +12,7 @@ import chat.rocket.core.models.User
 import okhttp3.Call
 import okhttp3.Callback
 import okhttp3.Response
+import org.json.JSONException
 import org.json.JSONObject
 import java.io.IOException
 import java.sql.Timestamp
@@ -147,6 +149,7 @@ class RoomListPresenter(val context: Context, val view: RoomListContract.View) :
     }
 
     private fun handleMessagesJson(json: String, isPinnedMessage: Boolean) {
+        try {
             val jSONObject = JSONObject(json)
             val messagesJSONArray = jSONObject.getJSONArray("messages")
 
@@ -194,9 +197,13 @@ class RoomListPresenter(val context: Context, val view: RoomListContract.View) :
                     }
                 }
             }
+        } catch (exception: JSONException) {
+            showInvalidRequest()
+        }
     }
 
     private fun handleMembersJson(json: String) {
+        try {
             val jsonObject = JSONObject(json)
             val membersJsonArray = jsonObject.getJSONArray("members")
 
@@ -214,6 +221,9 @@ class RoomListPresenter(val context: Context, val view: RoomListContract.View) :
                     showMemberList(dataSet, jsonObject.optString("total"))
                 }
             }
+        }catch (exception: JSONException) {
+            showInvalidRequest()
+        }
     }
 
     private fun getUserFromJsonObject(jsonObject: JSONObject): User {
@@ -247,6 +257,13 @@ class RoomListPresenter(val context: Context, val view: RoomListContract.View) :
         }
     }
 
+    private fun showInvalidRequest() {
+        mainHandler.post {
+            view.showWaitingView(false)
+            view.showMessage(context.getString(R.string.fragment_room_list_could_not_load_your_request, context.getString(R.string.make_sure_your_server_version_is_up_to_date)))
+        }
+    }
+
     private fun showEmptyViewMessage(message: String) {
         mainHandler.post {
             view.showWaitingView(false)

app/src/main/res/layout/dialog_users_of_room.xml

-<?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
-
-    <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:orientation="vertical">
-
-        <FrameLayout
-                android:id="@+id/room_user_titlebar"
-                android:layout_width="match_parent"
-                android:layout_height="?attr/actionBarSize"
-                android:paddingEnd="@dimen/margin_16"
-                android:paddingStart="@dimen/margin_16">
-
-            <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="start|center_vertical"
-                    android:text="@string/users_of_room_title"
-                    android:textAppearance="@style/TextAppearance.AppCompat.Title" />
-
-            <TextView
-                    android:id="@+id/room_user_count"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="end|center_vertical"
-                    android:textAppearance="@style/TextAppearance.AppCompat.Small" />
-        </FrameLayout>
-
-        <android.support.v7.widget.RecyclerView
-                android:id="@+id/recyclerview"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:orientation="vertical" />
-
-    </LinearLayout>
-
-    <chat.rocket.android.widget.WaitingView
-            android:id="@+id/waiting"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center" />
-
-</FrameLayout>
\ No newline at end of file

app/src/main/res/layout/fragment_room_list.xml

@@ -14,7 +14,13 @@
         android:id="@+id/messageText"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:layout_marginLeft="@dimen/margin_16"
+        android:layout_marginStart="@dimen/margin_16"
+        android:layout_marginRight="@dimen/margin_16"
+        android:layout_marginEnd="@dimen/margin_16"
         android:layout_centerInParent="true"
+        android:gravity="center"
+        android:textAppearance="@style/TextAppearance.AppCompat.Body1"
         android:visibility="gone" />
 
     <android.support.v7.widget.RecyclerView

app/src/main/res/values/strings.xml

@@ -17,18 +17,13 @@
     <string name="fragment_room_list_favorite_message_title">Favorite Messages (%s)</string>
     <string name="fragment_room_list_file_list_title">File list (%s)</string>
     <string name="fragment_room_list_member_list_title">Member list (%s)</string>
-    <string name="fragment_room_list_could_not_load_your_request">Could not load your request.\nResponse was: %s</string>
+    <string name="fragment_room_list_could_not_load_your_request">Could not load your request.\n%s.</string>
     <string name="fragment_room_list_no_pinned_message_to_show">No pinned message to show</string>
     <string name="fragment_room_list_no_favorite_message_to_show">No favorite message to show</string>
     <string name="fragment_room_list_no_file_list_to_show">No file list to show</string>
     <string name="fragment_room_list_no_member_list_to_show">No member list to show</string>
 
     <string name="start_of_conversation">Start of conversation</string>
-    <string name="users_of_room_title">Members List</string>
-    <plurals name="fmt_room_user_count">
-        <item quantity="one">Total: %,d user</item>
-        <item quantity="other">Total: %,d users</item>
-    </plurals>
     <string name="sending">Sending…</string>
     <string name="not_synced">Not synced</string>
     <string name="failed_to_sync">Failed to sync</string>
@@ -68,6 +63,7 @@
     <string name="video_upload_message_spec_title">Attach video</string>
 
     <string name="input_hostname_invalid_server_message">Invalid server version</string>
+    <string name="make_sure_your_server_version_is_up_to_date">Make sure your Rocket.Chat server version is up to date</string>
     <string name="connection_error_try_later">There\'s a connection error. Please try later.</string>
 
     <string name="version_info_text">Version: %s</string>