Merge pull request #400 from filipedelimabrito/iss321

Spotlight changes.
RocketChat · Aug 18, 2017 · bb01f6a · bb01f6a
2 parents b9d3665 + 5c8721d
commit bb01f6a
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/app/src/main/java/chat/rocket/android/api/MethodCallHelper.java b/app/src/main/java/chat/rocket/android/api/MethodCallHelper.java
@@ -365,9 +365,10 @@ public Task<Void> createPrivateGroup(final String name, final boolean readOnly)
         .onSuccessTask(task -> Task.forResult(null));
   }
 
-  public Task<Void> createDirectMessage(final String username) {
+  public Task<String> createDirectMessage(final String username) {
     return call("createDirectMessage", TIMEOUT_MS, () -> new JSONArray().put(username))
-        .onSuccessTask(task -> Task.forResult(null));
+        .onSuccessTask(CONVERT_TO_JSON_OBJECT)
+        .onSuccessTask(task -> Task.forResult(task.getResult().getString("rid")));
   }
 
   /**

diff --git a/app/src/main/java/chat/rocket/android/fragment/sidebar/SidebarMainPresenter.java b/app/src/main/java/chat/rocket/android/fragment/sidebar/SidebarMainPresenter.java
@@ -98,7 +98,7 @@ public void onSpotlightSelected(Spotlight spotlight) {
       methodCallHelper.createDirectMessage(username)
           .continueWithTask(task -> {
             if (task.isCompleted()) {
-              rocketChatCache.setSelectedRoomId(spotlight.getId() + userId);
+              rocketChatCache.setSelectedRoomId(task.getResult());
             }
             return null;
           });

diff --git a/...main/java/chat/rocket/android/fragment/sidebar/dialog/AddDirectMessageDialogFragment.java b/...main/java/chat/rocket/android/fragment/sidebar/dialog/AddDirectMessageDialogFragment.java
@@ -105,6 +105,7 @@ private void setupView(Optional<RocketChatAbsoluteUrl> rocketChatAbsoluteUrlOpti
   protected Task<Void> getMethodCallForSubmitAction() {
     String username =
         ((TextView) getDialog().findViewById(R.id.editor_username)).getText().toString();
-    return methodCall.createDirectMessage(username);
+    return methodCall.createDirectMessage(username)
+        .onSuccess(task -> null);
   }
 }