From 5cd24157a26a4254ed58dbd9c35ec78907f304ad Mon Sep 17 00:00:00 2001 From: Andriy Matkivskiy Date: Thu, 4 Jan 2018 07:26:26 +0200 Subject: [PATCH 1/5] Add fetch room ID by uri request. --- .../com/amatkivskiy/gitter/sdk/async/api/AsyncGitterApi.java | 4 ++++ .../gitter/sdk/async/client/AsyncGitterApiClient.java | 4 ++++ .../java/com/amatkivskiy/gitter/sdk/rx/api/RxGitterApi.java | 4 ++++ .../amatkivskiy/gitter/sdk/rx/client/RxGitterApiClient.java | 4 ++++ .../com/amatkivskiy/gitter/sdk/sync/api/SyncGitterApi.java | 4 ++++ .../gitter/sdk/sync/client/SyncGitterApiClient.java | 4 ++++ 6 files changed, 24 insertions(+) diff --git a/library/async/src/main/java/com/amatkivskiy/gitter/sdk/async/api/AsyncGitterApi.java b/library/async/src/main/java/com/amatkivskiy/gitter/sdk/async/api/AsyncGitterApi.java index 3f1ecef..4648485 100644 --- a/library/async/src/main/java/com/amatkivskiy/gitter/sdk/async/api/AsyncGitterApi.java +++ b/library/async/src/main/java/com/amatkivskiy/gitter/sdk/async/api/AsyncGitterApi.java @@ -57,6 +57,10 @@ void searchUsers( void searchUsers(@Query("q") String searchTerm, Callback callback); // Rooms Api + @POST("/rooms") + @FormUrlEncoded + void getRoomIdByUri(@Field("uri") String uri, Callback callback); + @GET("/rooms/{roomId}") void getRoomById(@Path("roomId") String roomId, Callback callback); diff --git a/library/async/src/main/java/com/amatkivskiy/gitter/sdk/async/client/AsyncGitterApiClient.java b/library/async/src/main/java/com/amatkivskiy/gitter/sdk/async/client/AsyncGitterApiClient.java index 09a6892..2ab6451 100644 --- a/library/async/src/main/java/com/amatkivskiy/gitter/sdk/async/client/AsyncGitterApiClient.java +++ b/library/async/src/main/java/com/amatkivskiy/gitter/sdk/async/client/AsyncGitterApiClient.java @@ -87,6 +87,10 @@ public void failure(RetrofitError error) { } // Rooms API + public void getRoomIdByUri(String uri, Callback callback) { + api.getRoomIdByUri(uri, callback); + } + public void getRoomUsers(String roomId, Callback> callback) { api.getRoomUsers(roomId, callback); } diff --git a/library/rx/src/main/java/com/amatkivskiy/gitter/sdk/rx/api/RxGitterApi.java b/library/rx/src/main/java/com/amatkivskiy/gitter/sdk/rx/api/RxGitterApi.java index 289155e..a8c567a 100644 --- a/library/rx/src/main/java/com/amatkivskiy/gitter/sdk/rx/api/RxGitterApi.java +++ b/library/rx/src/main/java/com/amatkivskiy/gitter/sdk/rx/api/RxGitterApi.java @@ -50,6 +50,10 @@ public interface RxGitterApi { Observable searchUsers(@Query("q") String searchTerm); // Rooms API + @POST("/rooms") + @FormUrlEncoded + Observable getRoomIdByUri(@Field("uri") String uri); + @GET("/rooms/{roomId}") Observable getRoomById(@Path("roomId") String roomId); diff --git a/library/rx/src/main/java/com/amatkivskiy/gitter/sdk/rx/client/RxGitterApiClient.java b/library/rx/src/main/java/com/amatkivskiy/gitter/sdk/rx/client/RxGitterApiClient.java index bb7f58a..dcc2645 100644 --- a/library/rx/src/main/java/com/amatkivskiy/gitter/sdk/rx/client/RxGitterApiClient.java +++ b/library/rx/src/main/java/com/amatkivskiy/gitter/sdk/rx/client/RxGitterApiClient.java @@ -72,6 +72,10 @@ public List call(SearchUsersResponse searchUsersResponse) { } // Rooms API + public Observable getRoomIdByUri(String uri) { + return api.getRoomIdByUri(uri); + } + public Observable getRoomById(String roomId) { return api.getRoomById(roomId); } diff --git a/library/sync/src/main/java/com/amatkivskiy/gitter/sdk/sync/api/SyncGitterApi.java b/library/sync/src/main/java/com/amatkivskiy/gitter/sdk/sync/api/SyncGitterApi.java index 303ec22..b651f33 100644 --- a/library/sync/src/main/java/com/amatkivskiy/gitter/sdk/sync/api/SyncGitterApi.java +++ b/library/sync/src/main/java/com/amatkivskiy/gitter/sdk/sync/api/SyncGitterApi.java @@ -52,6 +52,10 @@ public interface SyncGitterApi { SearchUsersResponse searchUsers(@Query("q") String searchTerm); // Rooms API + @POST("/rooms") + @FormUrlEncoded + RoomResponse getRoomIdByUri(@Field("uri") String uri); + @GET("/rooms/{roomId}") RoomResponse getRoomById(@Path("roomId") String roomId); diff --git a/library/sync/src/main/java/com/amatkivskiy/gitter/sdk/sync/client/SyncGitterApiClient.java b/library/sync/src/main/java/com/amatkivskiy/gitter/sdk/sync/client/SyncGitterApiClient.java index 2eac5fc..b15c3ac 100644 --- a/library/sync/src/main/java/com/amatkivskiy/gitter/sdk/sync/client/SyncGitterApiClient.java +++ b/library/sync/src/main/java/com/amatkivskiy/gitter/sdk/sync/client/SyncGitterApiClient.java @@ -66,6 +66,10 @@ public List getCurrentUserRooms() { } // Rooms API + public RoomResponse getRoomIdByUri(String uri) { + return api.getRoomIdByUri(uri); + } + public RoomResponse getUserRooms(String userId) { return api.getUserRooms(userId); } From 7b556de9306b7f9d31aee36ceb09b3c4660e757e Mon Sep 17 00:00:00 2001 From: Andriy Matkivskiy Date: Thu, 4 Jan 2018 07:31:17 +0200 Subject: [PATCH 2/5] Update JDK version in travis build script. --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 330a520..b7ae7d6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,5 @@ language: java -jdk: oraclejdk7 +jdk: oraclejdk8 before_install: - chmod +x gradlew script: From 7d239f15d74b0545c64054817b312eb04828d38b Mon Sep 17 00:00:00 2001 From: Andriy Matkivskiy Date: Thu, 4 Jan 2018 11:34:07 +0200 Subject: [PATCH 3/5] Update version of dependencies. --- library/async/build.gradle | 4 ++-- library/rx/build.gradle | 2 +- samples/build.gradle | 3 --- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/library/async/build.gradle b/library/async/build.gradle index 36227c7..e4de58d 100644 --- a/library/async/build.gradle +++ b/library/async/build.gradle @@ -32,6 +32,6 @@ dependencies { // compile project(':library:core') compile 'com.github.amatkivskiy:gitter.sdk.core:1.6.0' - compile 'com.squareup.okio:okio:1.6.0' - compile 'com.squareup.okhttp3:okhttp:3.5.0' + compile 'com.squareup.okio:okio:1.13.0' + compile 'com.squareup.okhttp3:okhttp:3.9.1' } diff --git a/library/rx/build.gradle b/library/rx/build.gradle index 21294da..9617217 100644 --- a/library/rx/build.gradle +++ b/library/rx/build.gradle @@ -40,7 +40,7 @@ publish { dependencies { compile 'com.github.amatkivskiy:gitter.sdk.core:1.6.0' // compile project(':library:core') - compile 'io.reactivex:rxjava:1.1.0' + compile 'io.reactivex:rxjava:1.3.4' testCompile 'org.mockito:mockito-core:2.1.0-RC.1' testCompile 'junit:junit:4.12' diff --git a/samples/build.gradle b/samples/build.gradle index 05c5f43..a0d8083 100644 --- a/samples/build.gradle +++ b/samples/build.gradle @@ -9,8 +9,5 @@ dependencies { compile project(':library:async') compile project(':library:sync') - compile 'com.squareup.okio:okio:1.6.0' compile 'com.squareup.okhttp:okhttp:2.5.0' - compile 'com.squareup.okhttp:okhttp-ws:2.5.0' - compile 'com.appunite:websockets-rxjava:3.0.0' } From bddf7f9fc2ff0122275f4bf4ffa33cccc04235c4 Mon Sep 17 00:00:00 2001 From: Andriy Matkivskiy Date: Thu, 4 Jan 2018 11:50:13 +0200 Subject: [PATCH 4/5] Prepare README.md to new version 1.6.1. --- README.md | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/README.md b/README.md index d279959..f98ed7c 100644 --- a/README.md +++ b/README.md @@ -29,7 +29,7 @@ It provides three approaches to work with API: - [Faye](#Faye) - [Samples](#Samples) -###**Setup** +### **Setup** Add gradle dependency: For RxJava: @@ -39,7 +39,7 @@ repositories { } dependencies { - compile 'com.github.amatkivskiy:gitter.sdk.rx:1.6.0' + compile 'com.github.amatkivskiy:gitter.sdk.rx:1.6.1' } ``` @@ -50,7 +50,7 @@ repositories { } dependencies { - compile 'com.github.amatkivskiy:gitter.sdk.async:1.6.0' + compile 'com.github.amatkivskiy:gitter.sdk.async:1.6.1' } ``` @@ -61,11 +61,16 @@ repositories { } dependencies { - compile 'com.github.amatkivskiy:gitter.sdk.sync:1.6.0' + compile 'com.github.amatkivskiy:gitter.sdk.sync:1.6.1' } ``` -###**Release notes** +### **Release notes** +- **1.6.1** (04.01.2018) + - *Rx,Async,Sync:* + - Add `getRoomIdByUri` to room API + - Update dependencies used in the SDK + - **1.6.0** (12.01.2017) - *RoomResponse:* - Remove `favouriteOrder` @@ -117,7 +122,7 @@ dependencies { - **1.1.0** - Added room messages streaming API. -###**Features** +### **Features** - Authentication @@ -153,7 +158,7 @@ dependencies { - Room user presence events - Room user managment events -###**Description** +### **Description** **Authentication** Please read [Authentication](https://developer.gitter.im/docs/authentication) article on **Gitter Developer** before. @@ -344,7 +349,7 @@ List rooms = client.getUserChannels("user_id"); System.out.println("Received " + rooms.size() + " rooms"); ``` -###**How to get streaming data from Gitter Streaming API** +### **How to get streaming data from Gitter Streaming API** ### :heavy_exclamation_mark: Please don't set any log level for *RxGitterStreamingApiClient* as it blocks the stream. :heavy_exclamation_mark: If you get `java.net.SocketTimeoutException: Read timed out` try to encrease `ReadTimeout` in your `retrofit.client.Client` and spicify this client for `GutterApiClient` (`withClient()`). @@ -382,7 +387,7 @@ client.getRoomEventsStream(roomId).subscribe(new Action1() { }); ``` -###**How to work with Gitter Faye API** +### **How to work with Gitter Faye API** 1 Setup ```AsyncGitterFayeClient```: @@ -494,7 +499,7 @@ client.disconnect(); Thats all =). -###**Samples** +### **Samples** You can see some code samples [here](https://github.com/Gitteroid/GitterJavaSDK/tree/master/samples/src/main/java/com/amatkivskiy/gitter/sdk/samples) From 5c4bf8aedd103501d25b11b0aff6fbe3c87e2998 Mon Sep 17 00:00:00 2001 From: Andriy Matkivskiy Date: Thu, 4 Jan 2018 11:55:12 +0200 Subject: [PATCH 5/5] Prepare to version 1.6.1 release. --- build.gradle | 2 +- library/async/build.gradle | 2 +- library/rx/build.gradle | 2 +- library/sync/build.gradle | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build.gradle b/build.gradle index cebaf64..2d521a6 100644 --- a/build.gradle +++ b/build.gradle @@ -12,7 +12,7 @@ buildscript { } allprojects { - version '1.6.0' + version '1.6.1' repositories { jcenter() diff --git a/library/async/build.gradle b/library/async/build.gradle index e4de58d..8c5659b 100644 --- a/library/async/build.gradle +++ b/library/async/build.gradle @@ -20,7 +20,7 @@ artifacts { publish { groupId = 'com.github.amatkivskiy' artifactId = 'gitter.sdk.async' - publishVersion = '1.6.0' + publishVersion = '1.6.1' desc = 'Gitter.im Java SDK that facilitates communication with Gitter API and Gitter Faye API' licences = ['MIT'] website = 'https://github.com/Gitteroid/GitterJavaSDK' diff --git a/library/rx/build.gradle b/library/rx/build.gradle index 9617217..49cd3df 100644 --- a/library/rx/build.gradle +++ b/library/rx/build.gradle @@ -29,7 +29,7 @@ artifacts { publish { groupId = 'com.github.amatkivskiy' artifactId = 'gitter.sdk.rx' - publishVersion = '1.6.0' + publishVersion = '1.6.1' desc = 'Gitter.im RxJava SDK that facilitates communication with Gitter API' licences = ['MIT'] website = 'https://github.com/Gitteroid/GitterJavaSDK' diff --git a/library/sync/build.gradle b/library/sync/build.gradle index 3c60c53..821742d 100644 --- a/library/sync/build.gradle +++ b/library/sync/build.gradle @@ -20,7 +20,7 @@ artifacts { publish { groupId = 'com.github.amatkivskiy' artifactId = 'gitter.sdk.sync' - publishVersion = '1.6.0' + publishVersion = '1.6.1' desc = 'Gitter.im Java SDK that facilitates communication with Gitter API' licences = ['MIT'] website = 'https://github.com/Gitteroid/GitterJavaSDK'