From c4c9adc006614a6f8c55b7a44aadd66da06b87be Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Mon, 12 Aug 2019 12:26:05 +0300 Subject: make HEADLINES_REQUEST_SIZE into a configurable preference to speed things up on slow connections --- org.fox.ttrss/src/main/java/org/fox/ttrss/ArticlePager.java | 6 +++--- org.fox.ttrss/src/main/java/org/fox/ttrss/CommonActivity.java | 2 +- org.fox.ttrss/src/main/java/org/fox/ttrss/HeadlinesFragment.java | 9 ++++----- 3 files changed, 8 insertions(+), 9 deletions(-) (limited to 'org.fox.ttrss/src/main/java') diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/ArticlePager.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/ArticlePager.java index 01b47039..d2a798e9 100755 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/ArticlePager.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/ArticlePager.java @@ -197,7 +197,7 @@ public class ArticlePager extends StateSavedFragment { m_refreshInProgress = true; - HeadlinesRequest req = new HeadlinesRequest(getActivity().getApplicationContext(), m_activity, m_feed, m_articles) { + @SuppressLint("StaticFieldLeak") HeadlinesRequest req = new HeadlinesRequest(getActivity().getApplicationContext(), m_activity, m_feed, m_articles) { @Override protected void onProgressUpdate(Integer... progress) { m_activity.setProgress(progress[0] / progress[1] * 10000); @@ -236,7 +236,7 @@ public class ArticlePager extends StateSavedFragment { }).show(); } - if (m_amountLoaded < HeadlinesFragment.HEADLINES_REQUEST_SIZE) { + if (m_amountLoaded < Integer.valueOf(m_prefs.getString("headlines_request_size", "30"))) { m_lazyLoadDisabled = true; } @@ -316,7 +316,7 @@ public class ArticlePager extends StateSavedFragment { put("excerpt_length", String.valueOf(CommonActivity.EXCERPT_MAX_LENGTH)); put("show_content", "true"); put("include_attachments", "true"); - put("limit", String.valueOf(HeadlinesFragment.HEADLINES_REQUEST_SIZE)); + put("limit", m_prefs.getString("headlines_request_size", "30")); put("offset", String.valueOf(0)); put("view_mode", m_activity.getViewMode()); put("skip", String.valueOf(fskip)); diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/CommonActivity.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/CommonActivity.java index cd346d14..dea5c61e 100755 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/CommonActivity.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/CommonActivity.java @@ -330,7 +330,7 @@ public class CommonActivity extends AppCompatActivity implements SharedPreferenc Log.d(TAG, "onSharedPreferenceChanged:" + key); String[] filter = new String[] { "theme", "enable_cats", "headline_mode", "widget_update_interval", - "headlines_swipe_to_dismiss", "headlines_mark_read_scroll" }; + "headlines_swipe_to_dismiss", "headlines_mark_read_scroll", "headlines_request_size" }; m_needRestart = Arrays.asList(filter).indexOf(key) != -1; } diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/HeadlinesFragment.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/HeadlinesFragment.java index 68b1f50d..18416873 100755 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/HeadlinesFragment.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/HeadlinesFragment.java @@ -99,7 +99,6 @@ public class HeadlinesFragment extends StateSavedFragment { public static final int FLAVOR_IMG_MIN_SIZE = 128; public static final int THUMB_IMG_MIN_SIZE = 32; - public static final int HEADLINES_REQUEST_SIZE = 30; public static final int HEADLINES_BUFFER_MAX = 1000; private final String TAG = this.getClass().getSimpleName(); @@ -631,7 +630,7 @@ public class HeadlinesFragment extends StateSavedFragment { } } - if (m_amountLoaded < HEADLINES_REQUEST_SIZE) { + if (m_amountLoaded < Integer.valueOf(m_prefs.getString("headlines_request_size", "30"))) { //Log.d(TAG, "amount loaded < request size, disabling lazy load"); m_lazyLoadDisabled = true; } @@ -709,7 +708,7 @@ public class HeadlinesFragment extends StateSavedFragment { put("show_content", "true"); put("include_attachments", "true"); put("view_mode", m_activity.getViewMode()); - put("limit", String.valueOf(HEADLINES_REQUEST_SIZE)); + put("limit", m_prefs.getString("headlines_request_size", "30")); put("offset", String.valueOf(0)); put("skip", String.valueOf(fskip)); put("include_nested", "true"); @@ -1240,7 +1239,7 @@ public class HeadlinesFragment extends StateSavedFragment { try { - Glide.with(HeadlinesFragment.this) + Glide.with(getContext()) .load(article.flavorImageUri) //.dontTransform() .diskCacheStrategy(DiskCacheStrategy.ALL) @@ -1530,7 +1529,7 @@ public class HeadlinesFragment extends StateSavedFragment { holder.textImage.setImageDrawable(textDrawable); } else { - Glide.with(HeadlinesFragment.this) + Glide.with(getContext()) .load(article.flavorImageUri) .placeholder(textDrawable) .thumbnail(0.5f) -- cgit v1.2.3