mirror/Infinity-For-Lemmy
1
0
Fork 0
mirror of https://codeberg.org/Bazsalanszky/Infinity-For-Lemmy.git synced 2024-12-27 03:18:24 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix bug with post detail refreshing

Browse Source 
Signed-off-by: Balazs Toldi <balazs@toldi.eu>
This commit is contained in:
Balazs Toldi 2023-07-22 16:36:15 +02:00
parent 258ff290bb
commit c756342ce6
No known key found for this signature in database
GPG Key ID: 6C7D440036F99D58
3 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/src/main/java/eu/toldi/infinityforlemmy/apis/LemmyAPI.java
View File

@ -19,10 +19,13 @@ public interface LemmyAPI {
Call<String> userLogin(@Body AccountLoginDTO params); Call<String> userLogin(@Body AccountLoginDTO params);
@GET("api/v3/user") @GET("api/v3/user")
Call<String> userInfo(@Query("username") String username,@Query("auth") String access_token); Call<String> userInfo(@Query("username") String username, @Query("auth") String access_token);
@GET("api/v3/community") @GET("api/v3/community")
Call<String> communityInfo(@Query("name") String name,@Query("auth") String access_token); Call<String> communityInfo(@Query("name") String name, @Query("auth") String access_token);
@GET("api/v3/post")
Call<String> postInfo(@Query("id") Integer postID, @Query("comment_id") Integer comment_id, @Query("auth") String access_token);
@GET("api/v3/user") @GET("api/v3/user")
ListenableFuture<Response<String>> getUserPosts( ListenableFuture<Response<String>> getUserPosts(

10
app/src/main/java/eu/toldi/infinityforlemmy/post/FetchPost.java
View File

@ -6,8 +6,8 @@ import androidx.annotation.NonNull;
import java.util.concurrent.Executor; import java.util.concurrent.Executor;
import eu.toldi.infinityforlemmy.apis.LemmyAPI;
import eu.toldi.infinityforlemmy.apis.RedditAPI; import eu.toldi.infinityforlemmy.apis.RedditAPI;
import eu.toldi.infinityforlemmy.utils.APIUtils;
import retrofit2.Call; import retrofit2.Call;
import retrofit2.Callback; import retrofit2.Callback;
import retrofit2.Response; import retrofit2.Response;
@ -17,11 +17,9 @@ public class FetchPost {
public static void fetchPost(Executor executor, Handler handler, Retrofit retrofit, String id, String accessToken, public static void fetchPost(Executor executor, Handler handler, Retrofit retrofit, String id, String accessToken,
FetchPostListener fetchPostListener) { FetchPostListener fetchPostListener) {
Call<String> postCall; Call<String> postCall;
if (accessToken == null) { // Use LemmyAPI.postInfo() instead of RedditAPI.getPost()
postCall = retrofit.create(RedditAPI.class).getPost(id); postCall = retrofit.create(LemmyAPI.class).postInfo(Integer.parseInt(id), null, accessToken);
} else {
postCall = retrofit.create(RedditAPI.class).getPostOauth(id, APIUtils.getOAuthHeader(accessToken));
}
postCall.enqueue(new Callback<>() { postCall.enqueue(new Callback<>() {
@Override @Override
public void onResponse(@NonNull Call<String> call, @NonNull Response<String> response) { public void onResponse(@NonNull Call<String> call, @NonNull Response<String> response) {

6
app/src/main/java/eu/toldi/infinityforlemmy/post/ParsePost.java
View File

@ -98,13 +98,13 @@ public class ParsePost {
executor.execute(() -> { executor.execute(() -> {
try { try {
JSONArray allData = new JSONArray(response).getJSONObject(0).getJSONObject(JSONUtils.DATA_KEY).getJSONArray(JSONUtils.CHILDREN_KEY); JSONObject allData = new JSONObject(response).getJSONObject("post_view");
if (allData.length() == 0) { if (allData.length() == 0) {
handler.post(parsePostListener::onParsePostFail); handler.post(parsePostListener::onParsePostFail);
return; return;
} }
JSONObject data = allData.getJSONObject(0).getJSONObject(JSONUtils.DATA_KEY);
Post post = parseBasicData(data); Post post = parseBasicData(allData);
handler.post(() -> parsePostListener.onParsePostSuccess(post)); handler.post(() -> parsePostListener.onParsePostSuccess(post));
} catch (JSONException e) { } catch (JSONException e) {
e.printStackTrace(); e.printStackTrace();