diff options
Diffstat (limited to 'org.fox.ttrss/src')
7 files changed, 26 insertions, 12 deletions
diff --git a/org.fox.ttrss/src/main/AndroidManifest.xml b/org.fox.ttrss/src/main/AndroidManifest.xml index 7373f2e1..dffce8ed 100755 --- a/org.fox.ttrss/src/main/AndroidManifest.xml +++ b/org.fox.ttrss/src/main/AndroidManifest.xml @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="org.fox.ttrss" - android:versionCode="499" - android:versionName="1.265"> + android:versionCode="500" + android:versionName="1.266"> <uses-permission android:name="android.permission.INTERNET" /> <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" /> 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) diff --git a/org.fox.ttrss/src/main/res/values/arrays.xml b/org.fox.ttrss/src/main/res/values/arrays.xml index 47cac770..25b2bd58 100644 --- a/org.fox.ttrss/src/main/res/values/arrays.xml +++ b/org.fox.ttrss/src/main/res/values/arrays.xml @@ -46,4 +46,10 @@ <item>@string/widget_background_dark</item> <item>@string/widget_background_transparent</item> </string-array> + <string-array name="pref_headlines_request_values" translatable="false"> + <item>10</item> + <item>15</item> + <item>30</item> + <item>45</item> + </string-array> </resources>
\ No newline at end of file diff --git a/org.fox.ttrss/src/main/res/values/strings.xml b/org.fox.ttrss/src/main/res/values/strings.xml index e9d38e70..2e21d19e 100755 --- a/org.fox.ttrss/src/main/res/values/strings.xml +++ b/org.fox.ttrss/src/main/res/values/strings.xml @@ -271,4 +271,6 @@ <string name="logcat_title">Log viewer</string> <string name="cat_labels">Labels</string> <string name="cat_uncategorized">Uncategorized</string> + <string name="prefs_headline_request_size">How many headlines to request</string> + <string name="prefs_headline_request_size_long">Use lower values on slow connections</string> </resources> diff --git a/org.fox.ttrss/src/main/res/xml/preferences.xml b/org.fox.ttrss/src/main/res/xml/preferences.xml index 7a05b18a..a167d01c 100755 --- a/org.fox.ttrss/src/main/res/xml/preferences.xml +++ b/org.fox.ttrss/src/main/res/xml/preferences.xml @@ -97,6 +97,14 @@ android:summary="@string/prefs_headline_display_mode_long" android:title="@string/prefs_headline_display_mode" /> + <ListPreference + android:defaultValue="30" + android:entries="@array/pref_headlines_request_values" + android:entryValues="@array/pref_headlines_request_values" + android:key="headlines_request_size" + android:summary="@string/prefs_headline_request_size_long" + android:title="@string/prefs_headline_request_size" /> + <org.fox.ttrss.util.LessBrokenSwitchPreference android:defaultValue="true" android:key="open_fresh_on_startup" @@ -107,7 +115,6 @@ android:key="inline_video_player" android:summary="Experimental: play videos inside headlines list. Long tap to open separate player" android:title="Inline video player" /> - </PreferenceCategory> <PreferenceCategory android:title="@string/reading" > <org.fox.ttrss.util.FontSizeDialogPreference |