Merge pull request #320 from QuickBlox/development

- prepare for release;
QuickBlox · Oct 27, 2016 · 9a04640 · 9a04640
2 parents 7b4c12c + f909ce7
commit 9a04640
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 44 deletions.
diff --git a/build.gradle b/build.gradle
@@ -32,7 +32,7 @@ ext {
     lintAbortOnError = false
 
     // QuickBlox SDK version
-    qbSdkVersion = '3.0'
+    qbSdkVersion = '3.1.0'
 
     versionName = "3.0"
 

diff --git a/sample-chat/src/main/java/com/quickblox/sample/chat/managers/DialogsManager.java b/sample-chat/src/main/java/com/quickblox/sample/chat/managers/DialogsManager.java
@@ -105,37 +105,22 @@ public void onSystemMessageReceived(QBChatMessage systemMessage){
         }
     }
 
-    private void notifyListenersDialogCreated(final QBChatDialog chatDialog){
-        new Handler(Looper.getMainLooper()).post(new Runnable() {
-            @Override
-            public void run() {
-                for (ManagingDialogsCallbacks listener : getManagingDialogsCallbackListeners()){
-                    listener.onDialogCreated(chatDialog);
-                }
-            }
-        });
+    private void notifyListenersDialogCreated(final QBChatDialog chatDialog) {
+        for (ManagingDialogsCallbacks listener : getManagingDialogsCallbackListeners()) {
+            listener.onDialogCreated(chatDialog);
+        }
     }
 
-    private void notifyListenersDialogUpdated(final String dialogId){
-        new Handler(Looper.getMainLooper()).post(new Runnable() {
-            @Override
-            public void run() {
-                for (ManagingDialogsCallbacks listener : getManagingDialogsCallbackListeners()){
-                    listener.onDialogUpdated(dialogId);
-                }
-            }
-        });
+    private void notifyListenersDialogUpdated(final String dialogId) {
+        for (ManagingDialogsCallbacks listener : getManagingDialogsCallbackListeners()) {
+            listener.onDialogUpdated(dialogId);
+        }
     }
 
-    private void notifyListenersNewDialogLoaded(final QBChatDialog chatDialog){
-        new Handler(Looper.getMainLooper()).post(new Runnable() {
-            @Override
-            public void run() {
-                for (ManagingDialogsCallbacks listener : getManagingDialogsCallbackListeners()){
-                    listener.onNewDialogLoaded(chatDialog);
-                }
-            }
-        });
+    private void notifyListenersNewDialogLoaded(final QBChatDialog chatDialog) {
+        for (ManagingDialogsCallbacks listener : getManagingDialogsCallbackListeners()) {
+            listener.onNewDialogLoaded(chatDialog);
+        }
     }
 
     public void addManagingDialogsCallbackListener(ManagingDialogsCallbacks listener){

diff --git a/sample-chat/src/main/java/com/quickblox/sample/chat/ui/adapter/DialogsAdapter.java b/sample-chat/src/main/java/com/quickblox/sample/chat/ui/adapter/DialogsAdapter.java
@@ -73,17 +73,15 @@ public View getView(int position, View convertView, ViewGroup parent) {
     private boolean isLastMessageAttachment(QBChatDialog dialog) {
         String lastMessage = dialog.getLastMessage();
         Integer lastMessageSenderId = dialog.getLastMessageUserId();
-        return (StringUtils.textIsNull(lastMessage) || TextUtils.isEmpty(lastMessage)) && lastMessageSenderId != null;
+        return TextUtils.isEmpty(lastMessage) && lastMessageSenderId != null;
     }
 
     private String prepareTextLastMessage(QBChatDialog chatDialog){
         if (isLastMessageAttachment(chatDialog)){
             return context.getString(R.string.chat_attachment);
-        } else if (!TextUtils.isEmpty(chatDialog.getLastMessage())){
-            return StringUtils.textIsNull(chatDialog.getLastMessage()) ? EMPTY_STRING : chatDialog.getLastMessage();
+        } else {
+            return chatDialog.getLastMessage();
         }
-
-        return EMPTY_STRING;
     }
 
     private static class ViewHolder {

diff --git a/sample-chat/src/main/java/com/quickblox/sample/chat/utils/chat/ChatHelper.java b/sample-chat/src/main/java/com/quickblox/sample/chat/utils/chat/ChatHelper.java
@@ -130,17 +130,7 @@ public void join(QBChatDialog chatDialog, final QBEntityCallback<Void> callback)
         DiscussionHistory history = new DiscussionHistory();
         history.setMaxStanzas(0);
 
-        chatDialog.join(history, new QbEntityCallbackWrapper<Void>(callback) {
-            @Override
-            public void onSuccess(final Void result, final Bundle b) {
-                onSuccessInMainThread(result, b);
-            }
-
-            @Override
-            public void onError(final QBResponseException e) {
-                onErrorInMainThread(e);
-            }
-        });
+        chatDialog.join(history, callback);
     }
 
     public void leaveChatDialog(QBChatDialog chatDialog) throws XMPPException, SmackException.NotConnectedException {