Merge pull request #85 from harshithagb/AND-661-Not-able-to-access-mo…

…bilesupport-account-library-images Not able to access account library images
constantcontact · Jul 10, 2017 · b832347 · b832347
2 parents 292b2cd + 64a1c94
commit b832347
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 10 deletions.
diff --git a/lib-rx/src/main/java/com/constantcontact/v2/LibraryService.java b/lib-rx/src/main/java/com/constantcontact/v2/LibraryService.java
@@ -94,8 +94,8 @@ Observable<Paged<File>> getFiles(@Query("limit") int limit, @Query("sort_by") Fi
      * @param nextLink Value of the link found in the meta of the original call
      * @return an Observable that emits Paged Files
      */
-    @GET("v2/library/files?next={next}")
-    Observable<Paged<File>> getFiles(@Path("next") String nextLink);
+    @GET
+    Observable<Paged<File>> getFiles(@Url String nextLink);
 
     /**
      * Get a {@link Paged} collection of {@link File} from a specific {@link Folder}.
@@ -117,12 +117,11 @@ Observable<Paged<File>> getFilesByFolder(@Path("folderId") String folderId, @Que
     /**
      * Get a {@link Paged} collection of {@link File} from a specific {@link Folder}.
      *
-     * @param folderId The Folder ID
      * @param nextLink Value of the link found in the meta of the original call
      * @return an Observable that emits Paged Files
      */
-    @GET("v2/library/folders/{folderId}/files?next={next}")
-    Observable<Paged<File>> getFilesByFolder(@Path("folderId") String folderId, @Path("next") String nextLink);
+    @GET
+    Observable<Paged<File>> getFilesByFolder(@Url String nextLink);
 
     /**
      * Get a specific {@link File}

diff --git a/lib/src/main/java/com/constantcontact/v2/LibraryService.java b/lib/src/main/java/com/constantcontact/v2/LibraryService.java
@@ -35,8 +35,8 @@ public interface LibraryService {
      * @param nextLink Value of the link found in the meta of the original call
      * @return an Observable that emits Paged Folders
      */
-    @GET("v2/library/folders?next={next}")
-    Call<Paged<Folder>> getFolders(@Path("next") String nextLink);
+    @GET
+    Call<Paged<Folder>> getFolders(@Url String nextLink);
 
     /**
      * Create a new {@link Folder}
@@ -116,12 +116,11 @@ Call<Paged<File>> getFilesByFolder(@Path("folderId") String folderId, @Query("li
     /**
      * Get a {@link Paged} collection of {@link File} from a specific {@link Folder}.
      *
-     * @param folderId The Folder ID
      * @param nextLink Value of the link found in the meta of the original call
      * @return an Observable that emits Paged Files
      */
-    @GET("v2/library/folders/{folderId}/files?next={next}")
-    Call<Paged<File>> getFilesByFolder(@Path("folderId") String folderId, @Path("next") String nextLink);
+    @GET
+    Call<Paged<File>> getFilesByFolder(@Url String nextLink);
 
     /**
      * Get a specific {@link File}