Merge pull request #11 from Gitteroid/dev

Updated sdk with latest changes in the API.

Author: amatkivskiy

README.md

@@ -36,7 +36,7 @@ repositories {
 }
 
 dependencies {
-      compile 'com.github.amatkivskiy:gitter.sdk.rx:1.5'
+      compile 'com.github.amatkivskiy:gitter.sdk.rx:1.5.1'
 }
 ```
 
@@ -47,7 +47,7 @@ repositories {
 }
 
 dependencies {
-      compile 'com.github.amatkivskiy:gitter.sdk.async:1.5'
+      compile 'com.github.amatkivskiy:gitter.sdk.async:1.5.1'
 }
 ```
 
@@ -58,11 +58,18 @@ repositories {
 }
 
 dependencies {
-      compile 'com.github.amatkivskiy:gitter.sdk.sync:1.4'
+      compile 'com.github.amatkivskiy:gitter.sdk.sync:1.5.1'
 }
 ```
 
 ###<a name="ReleaseNotes">**Release notes**
+- **1.5.1** (07.05.2016)
+	- Updated `RoomRepsonse` data structure.
+	- Added `aroundId` and `q` params for chat messages request.
+	- Added `Update room` request.
+	- Fixed `Issue` data structure type.
+	- Faye: added ability to set custom OkHttpClient.
+	- Faye: changed `onSubscribed()` params, no it passes messages snapshots.
 - **1.5** (14.01.2016)
 	- Added faye api support.
 	- Added room events streaming api support.
@@ -351,34 +358,16 @@ client.getRoomEventsStream(roomId).subscribe(new Action1<RoomEvent>() {
 1 Setup ```AsyncGitterFayeClient```:
 
 ```java
-AsyncGitterFayeClient client = new AsyncGitterFayeClient("account_token");
-```
-
-also you can provide disconnection listener (sometimes Faye server drops connection):
-
-```java
-AsyncGitterFayeClient client = new AsyncGitterFayeClient(ACCOUNT_TOKEN, new DisconnectionListener() {
-      @Override
-      public void onDisconnected() {
-        // Client has disconnected. You can reconnect it here.
-      }
-});
-```
-
-and you can provide error listener (is called when something went wrong):
-
-```java
-AsyncGitterFayeClient client = new AsyncGitterFayeClient(ACCOUNT_TOKEN, new DisconnectionListener() {
-      @Override
-      public void onDisconnected() {
-        // Client has disconnected. You can reconnect it here.
-      }
-    }, new FailListener() {
-      @Override
-      public void onFailed(Exception ex) {
-        // Oh, something horrible happened.
-      }
-});
+AsyncGitterFayeClient client = new AsyncGitterFayeClientBuilder()
+        .withAccountToken("account_token")
+        .withOnDisconnected(new DisconnectionListener() {
+          @Override
+          public void onDisconnected() {
+            // Client has disconnected. You can reconnect it here.
+          }
+        })
+        .withOkHttpClient(new OkHttpClient())
+        .build();
 ```
 
 2 Connect it to the server:
@@ -439,7 +428,7 @@ public void onFailed(String channel,Exception ex){
     }
 
 @Override
-public void onSubscribed(String channel){
+public void onSubscribed(String channel, List<MessageResponse> messagesSnapshot){
     }
 
 @Override

build.gradle

@@ -6,7 +6,7 @@ buildscript {
 }
 
 allprojects {
-    version '1.4'
+    version '1.5.1'
 
     repositories {
         jcenter()

gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.8-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.11-all.zip

library/async/build.gradle

@@ -18,7 +18,7 @@ repositories {
 publish {
     groupId = 'com.github.amatkivskiy'
     artifactId = 'gitter.sdk.async'
-    publishVersion = '1.5'
+    publishVersion = '1.5.1'
     desc = 'Gitter.im Java SDK that facilitates communication with Gitter API and Gitter Faye API'
     licences = ['MIT']
     website = 'https://github.com/Gitteroid/GitterJavaSDK'
@@ -28,7 +28,7 @@ publish {
 
 dependencies {
 //    compile project(':library:core')
-    compile 'com.github.amatkivskiy:gitter.sdk.core:1.4'
+    compile 'com.github.amatkivskiy:gitter.sdk.core:1.5'
 
     compile 'com.squareup.okio:okio:1.6.0'
     compile 'com.squareup.okhttp:okhttp:2.5.0'

library/async/src/main/java/com/amatkivskiy/gitter/sdk/async/api/AsyncGitterApi.java

@@ -1,18 +1,33 @@
 package com.amatkivskiy.gitter.sdk.async.api;
 
 import com.amatkivskiy.gitter.sdk.model.request.UnreadRequestParam;
+import com.amatkivskiy.gitter.sdk.model.request.UpdateRoomRequestParam;
 import com.amatkivskiy.gitter.sdk.model.request.UserAccountType;
-import com.amatkivskiy.gitter.sdk.model.response.*;
+import com.amatkivskiy.gitter.sdk.model.response.BooleanResponse;
+import com.amatkivskiy.gitter.sdk.model.response.OrgResponse;
+import com.amatkivskiy.gitter.sdk.model.response.RepoResponse;
+import com.amatkivskiy.gitter.sdk.model.response.SearchUsersResponse;
+import com.amatkivskiy.gitter.sdk.model.response.UserResponse;
 import com.amatkivskiy.gitter.sdk.model.response.message.MessageResponse;
 import com.amatkivskiy.gitter.sdk.model.response.message.UnReadMessagesResponse;
 import com.amatkivskiy.gitter.sdk.model.response.room.RoomResponse;
 import com.amatkivskiy.gitter.sdk.model.response.room.SearchRoomsResponse;
-import retrofit.Callback;
-import retrofit.http.*;
 
 import java.util.List;
 import java.util.Map;
 
+import retrofit.Callback;
+import retrofit.http.Body;
+import retrofit.http.DELETE;
+import retrofit.http.Field;
+import retrofit.http.FormUrlEncoded;
+import retrofit.http.GET;
+import retrofit.http.POST;
+import retrofit.http.PUT;
+import retrofit.http.Path;
+import retrofit.http.Query;
+import retrofit.http.QueryMap;
+
 public interface AsyncGitterApi {
   @GET("/user")
   void getCurrentUser(Callback<UserResponse> callback);
@@ -32,7 +47,6 @@ public interface AsyncGitterApi {
   @GET("/user/{userId}/channels")
   void getUserChannels(@Path("userId") String userId, Callback<List<RoomResponse>> callback);
 
-
   @GET("/rooms/{roomId}/users")
   void getRoomUsers(@Path("roomId") String roomId, Callback<List<UserResponse>> callback);
 
@@ -43,6 +57,10 @@ public interface AsyncGitterApi {
   @FormUrlEncoded
   void joinRoom(@Field("uri") String roomUri, Callback<RoomResponse> callback);
 
+  @PUT("/rooms/{roomId}")
+  void updateRoom(@Path("roomId") String roomId, @Body UpdateRoomRequestParam param,
+                  Callback<RoomResponse> callback);
+
   @GET("/rooms")
   void searchRooms(@Query("q") String searchTerm, Callback<SearchRoomsResponse> callback);
 

library/async/src/main/java/com/amatkivskiy/gitter/sdk/async/client/AsyncGitterApiClient.java

@@ -1,26 +1,34 @@
 package com.amatkivskiy.gitter.sdk.async.client;
 
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+
 import com.amatkivskiy.gitter.sdk.Constants;
 import com.amatkivskiy.gitter.sdk.api.builder.GitterApiBuilder;
 import com.amatkivskiy.gitter.sdk.async.api.AsyncGitterApi;
 import com.amatkivskiy.gitter.sdk.converter.UserJsonDeserializer;
 import com.amatkivskiy.gitter.sdk.model.request.ChatMessagesRequestParams;
 import com.amatkivskiy.gitter.sdk.model.request.UnreadRequestParam;
+import com.amatkivskiy.gitter.sdk.model.request.UpdateRoomRequestParam;
 import com.amatkivskiy.gitter.sdk.model.request.UserAccountType;
-import com.amatkivskiy.gitter.sdk.model.response.*;
+import com.amatkivskiy.gitter.sdk.model.response.BooleanResponse;
+import com.amatkivskiy.gitter.sdk.model.response.OrgResponse;
+import com.amatkivskiy.gitter.sdk.model.response.RepoResponse;
+import com.amatkivskiy.gitter.sdk.model.response.SearchUsersResponse;
+import com.amatkivskiy.gitter.sdk.model.response.UserResponse;
 import com.amatkivskiy.gitter.sdk.model.response.message.MessageResponse;
 import com.amatkivskiy.gitter.sdk.model.response.message.UnReadMessagesResponse;
 import com.amatkivskiy.gitter.sdk.model.response.room.RoomResponse;
 import com.amatkivskiy.gitter.sdk.model.response.room.SearchRoomsResponse;
-import com.google.gson.Gson;
-import com.google.gson.GsonBuilder;
+
+import java.util.List;
+
 import retrofit.Callback;
 import retrofit.RetrofitError;
 import retrofit.client.Response;
 import retrofit.converter.GsonConverter;
 
-import java.util.HashMap;
-import java.util.List;
+import static com.amatkivskiy.gitter.sdk.util.RequestUtils.convertChatMessagesParamsToMap;
 
 public class AsyncGitterApiClient {
   private AsyncGitterApi api;
@@ -65,6 +73,11 @@ public void joinRoom(String roomUri, Callback<RoomResponse> callback) {
     api.joinRoom(roomUri, callback);
   }
 
+  public void updateRoom(String roomId, UpdateRoomRequestParam params,
+                                             Callback<RoomResponse> callback) {
+    api.updateRoom(roomId, params, callback);
+  }
+
   /**
    * Removes specified user from the room. It can be used to leave room.
    *
@@ -167,29 +180,6 @@ public void getUnReadMessages(String userId, String roomId, Callback<UnReadMessa
     api.getUnReadMessages(userId, roomId, callback);
   }
 
-  private HashMap<String, String> convertChatMessagesParamsToMap(ChatMessagesRequestParams params) {
-    HashMap<String, String> options = new HashMap<>();
-    if (params != null) {
-      if (params.limit != null) {
-        options.put(Constants.GitterRequestParams.LIMIT_PARAM, String.valueOf(params.limit.intValue()));
-      }
-
-      if (params.afterId != null) {
-        options.put(Constants.GitterRequestParams.AFTER_ID_PARAM, params.afterId);
-      }
-
-      if (params.beforeId != null) {
-        options.put(Constants.GitterRequestParams.BEFORE_ID_PARAM, params.beforeId);
-      }
-
-      if (params.skipCount != null) {
-        options.put(Constants.GitterRequestParams.SKIP_PARAM, String.valueOf(params.skipCount.intValue()));
-      }
-    }
-
-    return options;
-  }
-
   public static class Builder extends GitterApiBuilder<Builder, AsyncGitterApiClient> {
 
     protected String getFullEndpointUrl() {

library/async/src/main/java/com/amatkivskiy/gitter/sdk/async/faye/client/AsyncGitterFayeClient.java

@@ -45,6 +45,7 @@ public class AsyncGitterFayeClient {
 
   private static final int DEFAULT_PING_INTERVAL_SEC = 5;
 
+  // Keep connection timer task
   private TimerTask pingTask;
   private Logger logger = new Logger() {
     @Override
@@ -56,10 +57,12 @@ public void log(String message) {
   private String accountToken;
   private String clientId;
   private WebSocket webSocket;
+  private OkHttpClient okHttpClient;
   private HashMap<String, ChannelListener> channelListeners = new HashMap<>();
 
   private boolean catchDisconnection = true;
-  private WebSocketListener webSocketListener;
+
+  // State listeners
   private HandshakeListener handshakeListener;
   private ConnectionListener connectionListener;
   private DisconnectionListener disconnectionListener = new DisconnectionListener() {
@@ -68,27 +71,21 @@ public void onDisconnected() {
 
     }
   };
-
   private FailListener failListener = new FailListener() {
     @Override
     public void onFailed(Exception ex) {
       logger.log("Caught error: " + ex);
     }
   };
 
-  public AsyncGitterFayeClient(String accountToken) {
-    this.accountToken = accountToken;
-  }
-
-  public AsyncGitterFayeClient(String accountToken, DisconnectionListener onDisconnected) {
-    this.accountToken = accountToken;
-    this.disconnectionListener = onDisconnected;
-  }
-
-  public AsyncGitterFayeClient(String accountToken, DisconnectionListener onDisconnected, FailListener failListener) {
+  public AsyncGitterFayeClient(String accountToken,
+                               DisconnectionListener onDisconnected,
+                               FailListener failListener,
+                               OkHttpClient okHttpClient) {
     this.accountToken = accountToken;
-    this.disconnectionListener = onDisconnected;
-    this.failListener = failListener;
+    if (onDisconnected != null) this.disconnectionListener = onDisconnected;
+    if (failListener != null) this.failListener = failListener;
+    if (okHttpClient != null) this.okHttpClient = okHttpClient;
   }
 
   /**
@@ -184,7 +181,7 @@ public void onHandshakeFinished() {
     };
 
     Request request = new Request.Builder().url(GITTER_FAYE_ENDPOINT).build();
-    WebSocketCall.create(new OkHttpClient(), request).enqueue(this.webSocketListener = createWebSocketListener());
+    WebSocketCall.create(this.okHttpClient, request).enqueue(createWebSocketListener());
   }
 
   private void sendMessage(JsonObject message) {
@@ -256,7 +253,7 @@ public void onMessage(BufferedSource payload, WebSocket.PayloadType type) throws
           ChannelListener listener = channelListeners.get(subscriptionChannel);
           if (listener != null) {
             if (json.get(SUCCESS).getAsBoolean()) {
-              listener.onSubscribed(channel);
+              listener.onSubscribed(channel, Utils.parseSnapshotJson(json));
             } else {
               listener.onFailed(channel, new Exception(json.toString()));
             }
@@ -306,7 +303,6 @@ public void onClose(int code, String reason) {
 
   private void cleanUp() {
     webSocket = null;
-    webSocketListener = null;
 
     channelListeners.clear();
     channelListeners = null;

library/async/src/main/java/com/amatkivskiy/gitter/sdk/async/faye/client/AsyncGitterFayeClientBuilder.java

@@ -0,0 +1,36 @@
+package com.amatkivskiy.gitter.sdk.async.faye.client;
+
+import com.amatkivskiy.gitter.sdk.async.faye.interfaces.DisconnectionListener;
+import com.amatkivskiy.gitter.sdk.async.faye.interfaces.FailListener;
+import com.squareup.okhttp.OkHttpClient;
+
+public class AsyncGitterFayeClientBuilder {
+  private String accountToken;
+  private DisconnectionListener onDisconnected;
+  private FailListener failListener;
+  private OkHttpClient okHttpClient;
+
+  public AsyncGitterFayeClientBuilder withAccountToken(String accountToken) {
+    this.accountToken = accountToken;
+    return this;
+  }
+
+  public AsyncGitterFayeClientBuilder withOnDisconnected(DisconnectionListener onDisconnected) {
+    this.onDisconnected = onDisconnected;
+    return this;
+  }
+
+  public AsyncGitterFayeClientBuilder withFailListener(FailListener failListener) {
+    this.failListener = failListener;
+    return this;
+  }
+
+  public AsyncGitterFayeClientBuilder withOkHttpClient(OkHttpClient okHttpClient) {
+    this.okHttpClient = okHttpClient;
+    return this;
+  }
+
+  public AsyncGitterFayeClient build() {
+    return new AsyncGitterFayeClient(accountToken, onDisconnected, failListener, okHttpClient);
+  }
+}