convert stuff to kotlin

austinhuang0131 · austinhuang0131 · commit dbf0c66b4160 · 2021-06-29T10:12:07.000-04:00
diff --git a/app/src/main/java/awais/instagrabber/asyncs/FeedPostFetchService.java b/app/src/main/java/awais/instagrabber/asyncs/FeedPostFetchService.java
@@ -39,7 +39,7 @@ public void onSuccess(final PostsFetchResponse result) {
                     return;
                 } else if (result == null) return;
                 nextCursor = result.getNextCursor();
-                hasNextPage = result.hasNextPage();
+                hasNextPage = result.getHasNextPage();
 
                 final List<Media> mediaResults = result.getFeedModels();
                 feedModels.addAll(mediaResults);
diff --git a/app/src/main/java/awais/instagrabber/asyncs/HashtagPostFetchService.java b/app/src/main/java/awais/instagrabber/asyncs/HashtagPostFetchService.java
@@ -35,7 +35,7 @@ public void fetch(final FetchListener<List<Media>> fetchListener) {
             public void onSuccess(final PostsFetchResponse result) {
                 if (result == null) return;
                 nextMaxId = result.getNextCursor();
-                moreAvailable = result.hasNextPage();
+                moreAvailable = result.getHasNextPage();
                 if (fetchListener != null) {
                     fetchListener.onResult(result.getFeedModels());
                 }
diff --git a/app/src/main/java/awais/instagrabber/asyncs/LocationPostFetchService.java b/app/src/main/java/awais/instagrabber/asyncs/LocationPostFetchService.java
@@ -35,7 +35,7 @@ public void fetch(final FetchListener<List<Media>> fetchListener) {
             public void onSuccess(final PostsFetchResponse result) {
                 if (result == null) return;
                 nextMaxId = result.getNextCursor();
-                moreAvailable = result.hasNextPage();
+                moreAvailable = result.getHasNextPage();
                 if (fetchListener != null) {
                     fetchListener.onResult(result.getFeedModels());
                 }
diff --git a/app/src/main/java/awais/instagrabber/asyncs/ProfilePostFetchService.java b/app/src/main/java/awais/instagrabber/asyncs/ProfilePostFetchService.java
@@ -36,7 +36,7 @@ public void fetch(final FetchListener<List<Media>> fetchListener) {
             public void onSuccess(final PostsFetchResponse result) {
                 if (result == null) return;
                 nextMaxId = result.getNextCursor();
-                moreAvailable = result.hasNextPage();
+                moreAvailable = result.getHasNextPage();
                 if (fetchListener != null) {
                     fetchListener.onResult(result.getFeedModels());
                 }
diff --git a/app/src/main/java/awais/instagrabber/asyncs/SavedPostFetchService.java b/app/src/main/java/awais/instagrabber/asyncs/SavedPostFetchService.java
@@ -40,7 +40,7 @@ public void fetch(final FetchListener<List<Media>> fetchListener) {
             public void onSuccess(final PostsFetchResponse result) {
                 if (result == null) return;
                 nextMaxId = result.getNextCursor();
-                moreAvailable = result.hasNextPage();
+                moreAvailable = result.getHasNextPage();
                 if (fetchListener != null) {
                     fetchListener.onResult(result.getFeedModels());
                 }
diff --git a/app/src/main/java/awais/instagrabber/repositories/responses/HdProfilePicUrlInfo.kt b/app/src/main/java/awais/instagrabber/repositories/responses/HdProfilePicUrlInfo.kt
@@ -1,16 +1,5 @@
-package awais.instagrabber.repositories.responses;
+package awais.instagrabber.repositories.responses
 
-public class HdProfilePicUrlInfo {
-    private final String url;
-    private final int width, height;
+import java.io.Serializable
 
-    public HdProfilePicUrlInfo(final String url, final int width, final int height) {
-        this.url = url;
-        this.width = width;
-        this.height = height;
-    }
-
-    public String getUrl() {
-        return url;
-    }
-}
+data class HdProfilePicUrlInfo(val url: String, private val width: Int, private val height: Int) : Serializable
diff --git a/app/src/main/java/awais/instagrabber/repositories/responses/ImageVersions2.kt b/app/src/main/java/awais/instagrabber/repositories/responses/ImageVersions2.kt
@@ -1,30 +1,5 @@
-package awais.instagrabber.repositories.responses;
+package awais.instagrabber.repositories.responses
 
-import java.io.Serializable;
-import java.util.List;
-import java.util.Objects;
+import java.io.Serializable
 
-public class ImageVersions2 implements Serializable {
-    private final List<MediaCandidate> candidates;
-
-    public ImageVersions2(final List<MediaCandidate> candidates) {
-        this.candidates = candidates;
-    }
-
-    public List<MediaCandidate> getCandidates() {
-        return candidates;
-    }
-
-    @Override
-    public boolean equals(final Object o) {
-        if (this == o) return true;
-        if (o == null || getClass() != o.getClass()) return false;
-        final ImageVersions2 that = (ImageVersions2) o;
-        return Objects.equals(candidates, that.candidates);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(candidates);
-    }
-}
+data class ImageVersions2(val candidates: List<MediaCandidate>) : Serializable
diff --git a/app/src/main/java/awais/instagrabber/repositories/responses/LikersResponse.kt b/app/src/main/java/awais/instagrabber/repositories/responses/LikersResponse.kt
@@ -1,27 +1,3 @@
-package awais.instagrabber.repositories.responses;
+package awais.instagrabber.repositories.responses
 
-import java.util.List;
-
-public class LikersResponse {
-    private final List<User> users;
-    private final long userCount;
-    private final String status;
-
-    public LikersResponse(final List<User> users, final long userCount, final String status) {
-        this.users = users;
-        this.userCount = userCount;
-        this.status = status;
-    }
-
-    public List<User> getUsers() {
-        return users;
-    }
-
-    public long getUserCount() {
-        return userCount;
-    }
-
-    public String getStatus() {
-        return status;
-    }
-}
+data class LikersResponse(val users: List<User>, val userCount: Long, val status: String)
diff --git a/app/src/main/java/awais/instagrabber/repositories/responses/MediaCandidate.kt b/app/src/main/java/awais/instagrabber/repositories/responses/MediaCandidate.kt
@@ -1,43 +1,5 @@
-package awais.instagrabber.repositories.responses;
+package awais.instagrabber.repositories.responses
 
-import java.io.Serializable;
-import java.util.Objects;
+import java.io.Serializable
 
-public class MediaCandidate implements Serializable {
-    private final int width;
-    private final int height;
-    private final String url;
-
-    public MediaCandidate(final int width, final int height, final String url) {
-        this.width = width;
-        this.height = height;
-        this.url = url;
-    }
-
-    public int getWidth() {
-        return width;
-    }
-
-    public int getHeight() {
-        return height;
-    }
-
-    public String getUrl() {
-        return url;
-    }
-
-    @Override
-    public boolean equals(final Object o) {
-        if (this == o) return true;
-        if (o == null || getClass() != o.getClass()) return false;
-        final MediaCandidate that = (MediaCandidate) o;
-        return width == that.width &&
-                height == that.height &&
-                Objects.equals(url, that.url);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(width, height, url);
-    }
-}
+data class MediaCandidate(val width: Int, val height: Int, val url: String) : Serializable
diff --git a/app/src/main/java/awais/instagrabber/repositories/responses/MediaInfoResponse.kt b/app/src/main/java/awais/instagrabber/repositories/responses/MediaInfoResponse.kt
@@ -1,15 +1,3 @@
-package awais.instagrabber.repositories.responses;
+package awais.instagrabber.repositories.responses
 
-import java.util.List;
-
-public class MediaInfoResponse {
-    private final List<Media> items;
-
-    public MediaInfoResponse(final List<Media> items) {
-        this.items = items;
-    }
-
-    public List<Media> getItems() {
-        return items;
-    }
-}
+data class MediaInfoResponse(val items: List<Media>)
diff --git a/app/src/main/java/awais/instagrabber/repositories/responses/NewsInboxResponse.kt b/app/src/main/java/awais/instagrabber/repositories/responses/NewsInboxResponse.kt
@@ -1,32 +1,10 @@
-package awais.instagrabber.repositories.responses;
+package awais.instagrabber.repositories.responses
 
-import java.util.List;
+import awais.instagrabber.repositories.responses.notification.Notification
+import awais.instagrabber.repositories.responses.notification.NotificationCounts
 
-import awais.instagrabber.repositories.responses.notification.Notification;
-import awais.instagrabber.repositories.responses.notification.NotificationCounts;
-
-public class NewsInboxResponse {
-    private final NotificationCounts counts;
-    private final List<Notification> newStories;
-    private final List<Notification> oldStories;
-
-    public NewsInboxResponse(final NotificationCounts counts,
-                             final List<Notification> newStories,
-                             final List<Notification> oldStories) {
-        this.counts = counts;
-        this.newStories = newStories;
-        this.oldStories = oldStories;
-    }
-
-    public NotificationCounts getCounts() {
-        return counts;
-    }
-
-    public List<Notification> getNewStories() {
-        return newStories;
-    }
-
-    public List<Notification> getOldStories() {
-        return oldStories;
-    }
-}
+data class NewsInboxResponse(
+    val counts: NotificationCounts,
+    val newStories: List<Notification>,
+    val oldStories: List<Notification>
+)
diff --git a/app/src/main/java/awais/instagrabber/repositories/responses/Place.kt b/app/src/main/java/awais/instagrabber/repositories/responses/Place.kt
@@ -1,62 +1,12 @@
-package awais.instagrabber.repositories.responses;
+package awais.instagrabber.repositories.responses
 
-import java.util.Objects;
-
-public class Place {
-    private final Location location;
+data class Place(
+    val location: Location,
     // for search
-    private final String title; // those are repeated within location
-    private final String subtitle; // address
-    private final String slug; // browser only; for end of address
+    val title: String, // those are repeated within location
+    val subtitle: String?, // address
+    // browser only; for end of address
+    val slug: String?,
     // for location info
-    private final String status;
-
-    public Place(final Location location,
-                 final String title,
-                 final String subtitle,
-                 final String slug,
-                 final String status) {
-        this.location = location;
-        this.title = title;
-        this.subtitle = subtitle;
-        this.slug = slug;
-        this.status = status;
-    }
-
-    public Location getLocation() {
-        return location;
-    }
-
-    public String getTitle() {
-        return title;
-    }
-
-    public String getSubtitle() {
-        return subtitle;
-    }
-
-    public String getSlug() {
-        return slug;
-    }
-
-    public String getStatus() {
-        return status;
-    }
-
-    @Override
-    public boolean equals(final Object o) {
-        if (this == o) return true;
-        if (o == null || getClass() != o.getClass()) return false;
-        final Place place = (Place) o;
-        return Objects.equals(location, place.location) &&
-                Objects.equals(title, place.title) &&
-                Objects.equals(subtitle, place.subtitle) &&
-                Objects.equals(slug, place.slug) &&
-                Objects.equals(status, place.status);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(location, title, subtitle, slug, status);
-    }
-}
+    val status: String?
+)
diff --git a/app/src/main/java/awais/instagrabber/repositories/responses/PostsFetchResponse.kt b/app/src/main/java/awais/instagrabber/repositories/responses/PostsFetchResponse.kt
@@ -1,27 +1,7 @@
-package awais.instagrabber.repositories.responses;
+package awais.instagrabber.repositories.responses
 
-import java.util.List;
-
-public class PostsFetchResponse {
-    private final List<Media> feedModels;
-    private final boolean hasNextPage;
-    private final String nextCursor;
-
-    public PostsFetchResponse(final List<Media> feedModels, final boolean hasNextPage, final String nextCursor) {
-        this.feedModels = feedModels;
-        this.hasNextPage = hasNextPage;
-        this.nextCursor = nextCursor;
-    }
-
-    public List<Media> getFeedModels() {
-        return feedModels;
-    }
-
-    public boolean hasNextPage() {
-        return hasNextPage;
-    }
-
-    public String getNextCursor() {
-        return nextCursor;
-    }
-}
+class PostsFetchResponse(
+    val feedModels: List<Media>,
+    val hasNextPage: Boolean,
+    val nextCursor: String?
+)
diff --git a/app/src/main/java/awais/instagrabber/repositories/responses/TagFeedResponse.kt b/app/src/main/java/awais/instagrabber/repositories/responses/TagFeedResponse.kt
diff --git a/app/src/main/java/awais/instagrabber/repositories/responses/UserFeedResponse.kt b/app/src/main/java/awais/instagrabber/repositories/responses/UserFeedResponse.kt
diff --git a/app/src/main/java/awais/instagrabber/repositories/responses/UserProfileContextLink.kt b/app/src/main/java/awais/instagrabber/repositories/responses/UserProfileContextLink.kt
diff --git a/app/src/main/java/awais/instagrabber/repositories/responses/WrappedMedia.kt b/app/src/main/java/awais/instagrabber/repositories/responses/WrappedMedia.kt
diff --git a/app/src/main/java/awais/instagrabber/webservices/ProfileService.java b/app/src/main/java/awais/instagrabber/webservices/ProfileService.java
diff --git a/app/src/main/java/awais/instagrabber/webservices/TagsService.java b/app/src/main/java/awais/instagrabber/webservices/TagsService.java

Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ public void fetch(final FetchListener<List<Media>> fetchListener) {`
`35`	`35`	`public void onSuccess(final PostsFetchResponse result) {`
`36`	`36`	`if (result == null) return;`
`37`	`37`	`nextMaxId = result.getNextCursor();`
`38`		`- moreAvailable = result.hasNextPage();`
	`38`	`+ moreAvailable = result.getHasNextPage();`
`39`	`39`	`if (fetchListener != null) {`
`40`	`40`	`fetchListener.onResult(result.getFeedModels());`
`41`	`41`	`}`
Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ public void fetch(final FetchListener<List<Media>> fetchListener) {`
`36`	`36`	`public void onSuccess(final PostsFetchResponse result) {`
`37`	`37`	`if (result == null) return;`
`38`	`38`	`nextMaxId = result.getNextCursor();`
`39`		`- moreAvailable = result.hasNextPage();`
	`39`	`+ moreAvailable = result.getHasNextPage();`
`40`	`40`	`if (fetchListener != null) {`
`41`	`41`	`fetchListener.onResult(result.getFeedModels());`
`42`	`42`	`}`
Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ public void fetch(final FetchListener<List<Media>> fetchListener) {`
`40`	`40`	`public void onSuccess(final PostsFetchResponse result) {`
`41`	`41`	`if (result == null) return;`
`42`	`42`	`nextMaxId = result.getNextCursor();`
`43`		`- moreAvailable = result.hasNextPage();`
	`43`	`+ moreAvailable = result.getHasNextPage();`
`44`	`44`	`if (fetchListener != null) {`
`45`	`45`	`fetchListener.onResult(result.getFeedModels());`
`46`	`46`	`}`