From 347f3c150053fbcb3390ac15e067ec092985660b Mon Sep 17 00:00:00 2001 From: stom79 Date: Thu, 24 Jan 2019 18:03:00 +0100 Subject: [PATCH] Fix videos not displayed in Peertube profiles --- .../fr/gouv/etalab/mastodon/activities/ShowAccountActivity.java | 1 + .../main/java/fr/gouv/etalab/mastodon/client/PeertubeAPI.java | 2 -- .../gouv/etalab/mastodon/fragments/DisplayStatusFragment.java | 1 - 3 files changed, 1 insertion(+), 3 deletions(-) diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/activities/ShowAccountActivity.java b/app/src/main/java/fr/gouv/etalab/mastodon/activities/ShowAccountActivity.java index 2175a9853..4b2cca6a3 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/activities/ShowAccountActivity.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/activities/ShowAccountActivity.java @@ -881,6 +881,7 @@ public class ShowAccountActivity extends BaseActivity implements OnPostActionInt bundle = new Bundle(); bundle.putSerializable("type", RetrieveFeedsAsyncTask.Type.USER); bundle.putString("targetedid", account.getAcct()); + bundle.putString("instanceType", "PEERTUBE"); bundle.putBoolean("showReply",false); bundle.putBoolean("ischannel",ischannel); displayStatusFragment.setArguments(bundle); diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/client/PeertubeAPI.java b/app/src/main/java/fr/gouv/etalab/mastodon/client/PeertubeAPI.java index 4cb30da5d..55f905657 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/client/PeertubeAPI.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/client/PeertubeAPI.java @@ -569,10 +569,8 @@ public class PeertubeAPI { params.put("count", String.valueOf(limit)); List peertubes = new ArrayList<>(); try { - HttpsConnection httpsConnection = new HttpsConnection(context); String response = httpsConnection.get(getAbsoluteUrl(String.format("/accounts/%s/videos", acct)), 60, params, prefKeyOauthTokenT); - JSONArray jsonArray = new JSONObject(response).getJSONArray("data"); peertubes = parsePeertube(jsonArray); diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/fragments/DisplayStatusFragment.java b/app/src/main/java/fr/gouv/etalab/mastodon/fragments/DisplayStatusFragment.java index dc8611cf7..5d96fe4f6 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/fragments/DisplayStatusFragment.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/fragments/DisplayStatusFragment.java @@ -441,7 +441,6 @@ public class DisplayStatusFragment extends Fragment implements OnRetrieveFeedsIn flag_loading = false; return; } - //For remote Peertube remote instances if(instanceType.equals("PEERTUBE")){ int previousPosition = this.peertubes.size();