From cf4b156863ad2644067b3b2650ff2e10e3014e08 Mon Sep 17 00:00:00 2001
From: Thomas <tschneider.ac@gmail.com>
Date: Sat, 29 Jul 2023 17:37:32 +0200
Subject: Fix issue #913 - Fix Nitter feeds

---
 app/src/main/java/app/fedilab/android/BaseMainActivity.java           | 4 ++--
 .../fedilab/android/mastodon/activities/ReorderTimelinesActivity.java | 2 +-
 .../android/mastodon/client/endpoints/MastodonTimelinesService.java   | 4 ++--
 .../app/fedilab/android/mastodon/viewmodel/mastodon/TimelinesVM.java  | 1 -
 4 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/app/fedilab/android/BaseMainActivity.java b/app/src/main/java/app/fedilab/android/BaseMainActivity.java
index 6b8e0f6ed..4c9919598 100644
--- a/app/src/main/java/app/fedilab/android/BaseMainActivity.java
+++ b/app/src/main/java/app/fedilab/android/BaseMainActivity.java
@@ -1817,8 +1817,8 @@ public abstract class BaseMainActivity extends BaseActivity implements NetworkSt
         if (networkStateReceiver != null) {
             try {
                 unregisterReceiver(networkStateReceiver);
-            } catch (IllegalArgumentException illegalArgumentException) {
-                illegalArgumentException.printStackTrace();
+            } catch (IllegalArgumentException e) {
+                e.printStackTrace();
             }
         }
         SharedPreferences sharedpreferences = PreferenceManager.getDefaultSharedPreferences(BaseMainActivity.this);
diff --git a/app/src/main/java/app/fedilab/android/mastodon/activities/ReorderTimelinesActivity.java b/app/src/main/java/app/fedilab/android/mastodon/activities/ReorderTimelinesActivity.java
index 5af29524a..de89f1e3b 100644
--- a/app/src/main/java/app/fedilab/android/mastodon/activities/ReorderTimelinesActivity.java
+++ b/app/src/main/java/app/fedilab/android/mastodon/activities/ReorderTimelinesActivity.java
@@ -210,7 +210,7 @@ public class ReorderTimelinesActivity extends BaseBarActivity implements OnStart
                 } else if (popupSearchInstanceBinding.setAttachmentGroup.getCheckedRadioButtonId() == R.id.twitter_accounts) {
                     SharedPreferences sharedpreferences = PreferenceManager.getDefaultSharedPreferences(ReorderTimelinesActivity.this);
                     String nitterHost = sharedpreferences.getString(getString(R.string.SET_NITTER_HOST), getString(R.string.DEFAULT_NITTER_HOST)).toLowerCase();
-                    url = "https://" + nitterHost + "/" + instanceName.replaceAll("[ ]+", ",").replaceAll("\\s", "") + "/rss";
+                    url = "https://" + nitterHost + "/" + instanceName.replaceAll("[ ]+", ",").replaceAll("\\s", "") + "/with_replies/rss";
                 }
                 OkHttpClient client = new OkHttpClient.Builder()
                         .connectTimeout(10, TimeUnit.SECONDS)
diff --git a/app/src/main/java/app/fedilab/android/mastodon/client/endpoints/MastodonTimelinesService.java b/app/src/main/java/app/fedilab/android/mastodon/client/endpoints/MastodonTimelinesService.java
index 6655c8c8d..f12b0c43a 100644
--- a/app/src/main/java/app/fedilab/android/mastodon/client/endpoints/MastodonTimelinesService.java
+++ b/app/src/main/java/app/fedilab/android/mastodon/client/endpoints/MastodonTimelinesService.java
@@ -263,14 +263,14 @@ public interface MastodonTimelinesService {
     );
 
     @Headers({"Accept: text/html,application/xhtml+xml,application/xml"})
-    @GET("{names}/rss")
+    @GET("{names}/with_replies/rss")
     Call<Nitter> getNitter(
             @Path("names") String id,
             @Query("max_position") String max_position
     );
 
     @Headers({"Accept: text/html,application/xhtml+xml,application/xml"})
-    @GET("{account}/rss")
+    @GET("{account}/with_replies/rss")
     Call<Nitter> getNitterAccount(
             @Path("account") String account
     );
diff --git a/app/src/main/java/app/fedilab/android/mastodon/viewmodel/mastodon/TimelinesVM.java b/app/src/main/java/app/fedilab/android/mastodon/viewmodel/mastodon/TimelinesVM.java
index 8eab91594..11bd77d69 100644
--- a/app/src/main/java/app/fedilab/android/mastodon/viewmodel/mastodon/TimelinesVM.java
+++ b/app/src/main/java/app/fedilab/android/mastodon/viewmodel/mastodon/TimelinesVM.java
@@ -260,7 +260,6 @@ public class TimelinesVM extends AndroidViewModel {
             if (publicTlCall != null) {
                 try {
                     Response<Nitter> publicTlResponse = publicTlCall.execute();
-
                     if (publicTlResponse.isSuccessful()) {
                         Nitter rssResponse = publicTlResponse.body();
                         List<Status> statusList = new ArrayList<>();
-- 
cgit v1.2.3