From ad73a1f94857856082b9ec0019511db8b0f3f483 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@fakecake.org>
Date: Wed, 30 Oct 2019 14:16:31 +0300
Subject: add option to force downsampling images on all connections

---
 .../src/main/java/org/fox/ttrss/ArticlePager.java  | 11 ++++++-----
 .../main/java/org/fox/ttrss/HeadlinesFragment.java | 23 +++++++++++-----------
 2 files changed, 18 insertions(+), 16 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 c885b732..e08934bd 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
@@ -13,6 +13,11 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentManager;
+import androidx.fragment.app.FragmentStatePagerAdapter;
+import androidx.viewpager.widget.ViewPager;
+
 import com.google.android.material.snackbar.Snackbar;
 import com.google.gson.JsonElement;
 import com.viewpagerindicator.UnderlinePageIndicator;
@@ -24,10 +29,6 @@ import org.fox.ttrss.util.HeadlinesRequest;
 
 import java.util.HashMap;
 
-import androidx.fragment.app.Fragment;
-import androidx.fragment.app.FragmentManager;
-import androidx.fragment.app.FragmentStatePagerAdapter;
-import androidx.viewpager.widget.ViewPager;
 import icepick.State;
 
 public class ArticlePager extends StateSavedFragment {
@@ -339,7 +340,7 @@ public class ArticlePager extends StateSavedFragment {
 				}
 
 				if (m_prefs.getBoolean("enable_image_downsampling", false)) {
-					if (!m_activity.isWifiConnected()) {
+					if (m_prefs.getBoolean("always_downsample_images", false) || !m_activity.isWifiConnected()) {
 						put("resize_width", String.valueOf(m_activity.getResizeWidth()));
 					}
 				}
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 933c4b28..ac94d420 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
@@ -50,6 +50,17 @@ import android.widget.ProgressBar;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
 
+import androidx.appcompat.app.ActionBar;
+import androidx.core.app.ActivityCompat;
+import androidx.core.app.ActivityOptionsCompat;
+import androidx.core.view.ViewCompat;
+import androidx.recyclerview.widget.DefaultItemAnimator;
+import androidx.recyclerview.widget.DividerItemDecoration;
+import androidx.recyclerview.widget.ItemTouchHelper;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
+
 import com.amulyakhare.textdrawable.TextDrawable;
 import com.amulyakhare.textdrawable.util.ColorGenerator;
 import com.bumptech.glide.Glide;
@@ -81,16 +92,6 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.TimeZone;
 
-import androidx.appcompat.app.ActionBar;
-import androidx.core.app.ActivityCompat;
-import androidx.core.app.ActivityOptionsCompat;
-import androidx.core.view.ViewCompat;
-import androidx.recyclerview.widget.DefaultItemAnimator;
-import androidx.recyclerview.widget.DividerItemDecoration;
-import androidx.recyclerview.widget.ItemTouchHelper;
-import androidx.recyclerview.widget.LinearLayoutManager;
-import androidx.recyclerview.widget.RecyclerView;
-import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
 import icepick.State;
 import jp.wasabeef.glide.transformations.CropCircleTransformation;
 
@@ -718,7 +719,7 @@ public class HeadlinesFragment extends StateSavedFragment {
 					put("order_by", m_activity.getSortMode());
 
 					if (m_prefs.getBoolean("enable_image_downsampling", false)) {
-						if (!m_activity.isWifiConnected()) {
+						if (m_prefs.getBoolean("always_downsample_images", false) || !m_activity.isWifiConnected()) {
 							put("resize_width", String.valueOf(m_activity.getResizeWidth()));
 						}
 					}
-- 
cgit v1.2.3