From dbaf2a379ad92ac7d740ef62ddb01ff7f14c3719 Mon Sep 17 00:00:00 2001
From: Thomas <tschneider.ac@gmail.com>
Date: Mon, 24 Oct 2022 17:49:26 +0200
Subject: [PATCH] Remove old settings + fix scroll with fav.
---
.../timeline/FragmentMastodonTimeline.java | 22 +++++++++++--------
app/src/main/res/xml/pref_compose.xml | 8 +++----
2 files changed, 17 insertions(+), 13 deletions(-)
diff --git a/app/src/main/java/app/fedilab/android/ui/fragment/timeline/FragmentMastodonTimeline.java b/app/src/main/java/app/fedilab/android/ui/fragment/timeline/FragmentMastodonTimeline.java
index f9d91c60..30faf291 100644
--- a/app/src/main/java/app/fedilab/android/ui/fragment/timeline/FragmentMastodonTimeline.java
+++ b/app/src/main/java/app/fedilab/android/ui/fragment/timeline/FragmentMastodonTimeline.java
@@ -253,13 +253,7 @@ public class FragmentMastodonTimeline extends Fragment implements StatusAdapter.
if (timelineType != null) {
slug = timelineType.getValue() + (ident != null ? "|" + ident : "");
}
- //Only fragment in main view pager should not have the view initialized
- //AND Only the first fragment will initialize its view
- if (!isViewInitialized) {
- if (slug != null) {
- isViewInitialized = slug.compareTo(Helper.getSlugOfFirstFragment(requireActivity(), currentUserID, currentInstance)) == 0;
- }
- }
+
SharedPreferences sharedpreferences = PreferenceManager.getDefaultSharedPreferences(requireActivity());
LocalBroadcastManager.getInstance(requireActivity()).registerReceiver(receive_action, new IntentFilter(Helper.RECEIVE_STATUS_ACTION));
@@ -278,9 +272,18 @@ public class FragmentMastodonTimeline extends Fragment implements StatusAdapter.
binding.loader.setVisibility(View.VISIBLE);
binding.recyclerView.setVisibility(View.GONE);
max_id = statusReport != null ? statusReport.id : null;
- if (max_id == null) {
+ //Inner marker are only for pinned timelines and main timelines, they have isViewInitialized set to false
+ if (max_id == null && !isViewInitialized) {
max_id = sharedpreferences.getString(getString(R.string.SET_INNER_MARKER) + BaseMainActivity.currentUserID + BaseMainActivity.currentInstance + slug, null);
}
+ //Only fragment in main view pager should not have the view initialized
+ //AND Only the first fragment will initialize its view
+ if (!isViewInitialized) {
+ if (slug != null) {
+ isViewInitialized = slug.compareTo(Helper.getSlugOfFirstFragment(requireActivity(), currentUserID, currentInstance)) == 0;
+ }
+ }
+
flagLoading = false;
router(null);
@@ -299,6 +302,8 @@ public class FragmentMastodonTimeline extends Fragment implements StatusAdapter.
binding.swipeContainer.setRefreshing(false);
binding.loadingNextElements.setVisibility(View.GONE);
flagLoading = false;
+
+
if (timelineStatuses != null && fetched_statuses != null && fetched_statuses.statuses != null && fetched_statuses.statuses.size() > 0) {
try {
if (statusToUpdate != null) {
@@ -318,7 +323,6 @@ public class FragmentMastodonTimeline extends Fragment implements StatusAdapter.
}
} catch (Exception ignored) {
}
-
flagLoading = fetched_statuses.pagination.max_id == null;
binding.noAction.setVisibility(View.GONE);
if (timelineType == Timeline.TimeLineEnum.ART) {
diff --git a/app/src/main/res/xml/pref_compose.xml b/app/src/main/res/xml/pref_compose.xml
index f1bbccb7..b3cbfd8c 100644
--- a/app/src/main/res/xml/pref_compose.xml
+++ b/app/src/main/res/xml/pref_compose.xml
@@ -13,9 +13,9 @@
app:singleLineTitle="false"
app:summary="@string/set_capitalize_indication"
app:title="@string/set_capitalize" />
-
+ <!--
<SwitchPreferenceCompat
- app:defaultValue="true"
+ app:defaultValue="false"
app:iconSpaceReserved="false"
app:key="@string/SET_PICTURE_COMPRESSED"
app:singleLineTitle="false"
@@ -23,13 +23,13 @@
app:title="@string/set_resize_picture" />
<SwitchPreferenceCompat
- app:defaultValue="true"
+ app:defaultValue="false"
app:iconSpaceReserved="false"
app:key="@string/SET_VIDEO_COMPRESSED"
app:singleLineTitle="false"
app:summary="@string/set_resize_video_indication"
app:title="@string/set_resize_video" />
-
+ -->
<SwitchPreferenceCompat
app:defaultValue="false"
app:iconSpaceReserved="false"